manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

aggiornamento di alcuni path

This commit is contained in:
ganovelli 2005-07-06 15:28:11 +00:00
parent 000b01a4ed
commit 21bac43cd8
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vcg/container/container_allocation_table.h
View File

@ -24,6 +24,10 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2004/04/05 18:20:50 ganovelli
Aggiunto typename
Eliminata bug di ricorsione nell'istanzazione dei template
Revision 1.3 2004/03/31 22:36:44 ganovelli Revision 1.3 2004/03/31 22:36:44 ganovelli
First Working Release (with this comment) First Working Release (with this comment)
@ -45,7 +49,7 @@ namespace vcg {
template <typename STL_CONT> template <typename STL_CONT>
class CATBase{ class CATBase{
public: public:
typedef typename STL_CONT::value_type ValueType; typedef typename typename STL_CONT::value_type ValueType;
virtual void Resort(ValueType*,ValueType*) =0; virtual void Resort(ValueType*,ValueType*) =0;
virtual void Remove(const STL_CONT&) = 0; virtual void Remove(const STL_CONT&) = 0;
@ -64,7 +68,7 @@ static int & Id(){
template <typename STL_CONT, class ENTRY_TYPE> template <typename STL_CONT, class ENTRY_TYPE>
class CATEntry: public CATBase<STL_CONT>{ class CATEntry: public CATBase<STL_CONT>{
public: public:
typedef typename STL_CONT::value_type ValueType; typedef typename typename STL_CONT::value_type ValueType;
typedef typename ENTRY_TYPE EntryType; typedef typename ENTRY_TYPE EntryType;
CATEntry(){if(Id()==0){ CATEntry(){if(Id()==0){
@ -75,12 +79,12 @@ CATEntry(){if(Id()==0){
static unsigned int Ord(ValueType *); static unsigned int Ord(ValueType *);
static ENTRY_TYPE & GetEntry(STL_CONT::value_type*pt); static ENTRY_TYPE & GetEntry(typename STL_CONT::value_type*pt);
static void Insert( STL_CONT & c,bool cond=false ); // insert a vector to trace static void Insert( STL_CONT & c,bool cond=false ); // insert a vector to trace
virtual void Remove( const STL_CONT & c); // remove the container c virtual void Remove( const STL_CONT & c); // remove the container c
static void RemoveIfEmpty( const STL_CONT & c); // remove the container c static void RemoveIfEmpty( const STL_CONT & c); // remove the container c
static void Remove( ValueType * v); // remove the container that contains v static void Remove( ValueType * v); // remove the container that contains v
virtual void Resort( ValueType* old_start, // resort the allocation table virtual void Resort( ValueType* old_start, // resort the allocation table
ValueType* new_start); // after a container was moved ValueType* new_start); // after a container was moved
@ -105,7 +109,7 @@ static ValueType *& Upper() {
return upper; // if the container next to the last accessed return upper; // if the container next to the last accessed
} }
static std::list<ENTRY_TYPE>::iterator & Curr(){ // container that was last accessed static typename std::list<ENTRY_TYPE>::iterator & Curr(){ // container that was last accessed
static std::list<ENTRY_TYPE>::iterator currEntry; static std::list<ENTRY_TYPE>::iterator currEntry;
return currEntry; return currEntry;
} }
@ -114,9 +118,9 @@ static std::list<ENTRY_TYPE>::iterator & Curr(){ // container that was last ac
static bool IsTheSameAsLast(ValueType *pt); // true if pt is in the container static bool IsTheSameAsLast(ValueType *pt); // true if pt is in the container
// that was accessed last // that was accessed last
static void Update(ValueType*); // set Upper() e Lower() static void Update(ValueType*); // set Upper() e Lower()
static std::list<ENTRY_TYPE>::iterator FindBase(const ValueType * pt); static typename std::list<ENTRY_TYPE>::iterator FindBase(const ValueType * pt);
// find the container that contains pt (naive) // find the container that contains pt (naive)
virtual void AddDataElem(STL_CONT::value_type * pt,int n);// add n element to the auxiliary data virtual void AddDataElem(typename STL_CONT::value_type * pt,int n);// add n element to the auxiliary data
public: public:
static int & Id(){ // unique identifier of the istance static int & Id(){ // unique identifier of the istance
@ -138,7 +142,7 @@ Ord(ValueType * pt)
template <typename STL_CONT, class ENTRY_TYPE> template <typename STL_CONT, class ENTRY_TYPE>
std::list<ENTRY_TYPE>::iterator CATEntry<STL_CONT,ENTRY_TYPE>:: typename std::list<ENTRY_TYPE>::iterator CATEntry<STL_CONT,ENTRY_TYPE>::
FindBase(const ValueType * pt) FindBase(const ValueType * pt)
{ {
@ -260,7 +264,7 @@ UTD() = false;
template <typename STL_CONT, class ENTRY_TYPE> template <typename STL_CONT, class ENTRY_TYPE>
ENTRY_TYPE & CATEntry<STL_CONT, ENTRY_TYPE>:: ENTRY_TYPE & CATEntry<STL_CONT, ENTRY_TYPE>::
GetEntry(STL_CONT::value_type*pt){ GetEntry(typename STL_CONT::value_type*pt){
Update(pt); Update(pt);
return *Curr(); return *Curr();
} }
@ -268,7 +272,7 @@ return *Curr();
template <typename STL_CONT, class ENTRY_TYPE> template <typename STL_CONT, class ENTRY_TYPE>
void CATEntry<STL_CONT, ENTRY_TYPE>:: void CATEntry<STL_CONT, ENTRY_TYPE>::
AddDataElem(STL_CONT::value_type * pt,int n) AddDataElem(typename STL_CONT::value_type * pt,int n)
{ {
Update(pt); Update(pt);
Curr()->Push_back(n); Curr()->Push_back(n);
@ -280,7 +284,7 @@ Curr()->Push_back(n);
// This class is used to implement optional core data (NormalOpt, CoordOpt etc...) // This class is used to implement optional core data (NormalOpt, CoordOpt etc...)
template <typename STL_CONT,class ATTR_TYPE> template <typename STL_CONT,class ATTR_TYPE>
class CAT:public CATEntry<STL_CONT, EntryCAT<STL_CONT,ATTR_TYPE> >{ class CAT:public CATEntry<STL_CONT, EntryCAT<STL_CONT,ATTR_TYPE> >{
typedef typename STL_CONT::value_type ValueType; typedef typename typename STL_CONT::value_type ValueType;
public: public:
static ATTR_TYPE & Get(ValueType * pt); static ATTR_TYPE & Get(ValueType * pt);
}; };

11
vcg/container/entries_allocation_table.h
View File

@ -25,6 +25,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2004/04/05 13:53:37 ganovelli
Aggiunto typename
Revision 1.3 2004/03/31 22:36:44 ganovelli Revision 1.3 2004/03/31 22:36:44 ganovelli
First Working Release (with this comment) First Working Release (with this comment)
@ -41,8 +44,8 @@ template <class STL_CONT>
struct EntryCATBase{ struct EntryCATBase{
EntryCATBase(STL_CONT & _c):c(_c){}; EntryCATBase(STL_CONT & _c):c(_c){};
typename STL_CONT::value_type * Start() const; typename typename typename STL_CONT::value_type * Start() const;
virtual bool Empty(){}; virtual bool Empty(){return true;};
const STL_CONT * C(); const STL_CONT * C();
virtual void Push_back(const int &){}; virtual void Push_back(const int &){};
@ -77,7 +80,7 @@ const bool EntryCATBase<STL_CONT>:: operator < (const EntryCATBase<STL_CONT> & o
} }
template <class STL_CONT> template <class STL_CONT>
STL_CONT::value_type * EntryCATBase<STL_CONT>::Start()const { typename typename STL_CONT::value_type * EntryCATBase<STL_CONT>::Start()const {
return &(*(c.begin())); return &(*(c.begin()));
} }
@ -146,7 +149,7 @@ public:
std::vector<ATTR_TYPE> * Item(){return item;}; std::vector<ATTR_TYPE> * Item(){return item;};
std::vector<ATTR_TYPE> * item; std::vector<ATTR_TYPE> * item;
ATTR_TYPE & operator [](STL_CONT::value_type * v) ATTR_TYPE & operator [](typename typename STL_CONT::value_type * v)
{ {
int pos = CATEntry<STL_CONT, EntryCATMulti<STL_CONT> >::Ord(v); int pos = CATEntry<STL_CONT, EntryCATMulti<STL_CONT> >::Ord(v);
return (*item)[pos]; return (*item)[pos];