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

changed > to < in heapelem comparison

This commit is contained in:
ganovelli 2004-09-29 17:08:39 +00:00
parent 215aaa2e84
commit 41a67b6db7
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vcg/complex/local_optimization.h
View File

@ -22,6 +22,9 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.6 2004/09/28 09:57:08 cignoni
Better Doxygen docs
Revision 1.5 2004/09/15 10:40:20 ponchio Revision 1.5 2004/09/15 10:40:20 ponchio
typedef LocalOptimization HeapType -> public: typedef LocalOptimization HeapType -> public:
@ -108,7 +111,7 @@ template<class MeshType>
class LocalOptimization class LocalOptimization
{ {
public: public:
LocalOptimization(MeshType &mm): m(mm){ ClearTermination();} LocalOptimization(MeshType &mm): m(mm){ ClearTermination();e=0.0;}
struct HeapElem; struct HeapElem;
// scalar type // scalar type
@ -124,11 +127,11 @@ public:
/// termination conditions /// termination conditions
enum LOTermination { enum LOTermination {
LOnSimplices = 0x00, // test number of simplicies LOnSimplices = 0x01, // test number of simplicies
LOnVertices = 0x01, // test number of verticies LOnVertices = 0x02, // test number of verticies
LOnOps = 0x02, // test number of operations LOnOps = 0x04, // test number of operations
LOMetric = 0x04, // test Metric (error, quality...instance dependent) LOMetric = 0x08, // test Metric (error, quality...instance dependent)
LOTime = 0x08 // test how much time is passed since the start LOTime = 0x10 // test how much time is passed since the start
} ; } ;
int tf; int tf;
@ -194,7 +197,7 @@ public:
/// usually we mean priority as an error so we should invert the comparison /// usually we mean priority as an error so we should invert the comparison
const bool operator <(const HeapElem & h) const const bool operator <(const HeapElem & h) const
{ {
return (locModPtr->Priority() > h.locModPtr->Priority()); return (locModPtr->Priority() < h.locModPtr->Priority());
} }
bool IsUpToDate() bool IsUpToDate()
@ -209,13 +212,15 @@ public:
LocalOptimization(MeshType *_m):m(_m){}; LocalOptimization(MeshType *_m):m(_m){};
/// Default distructor /// Default distructor
~LocalOptimization(){}; ~LocalOptimization(){};
double e;
/// main cycle of optimization /// main cycle of optimization
bool DoOptimization() bool DoOptimization()
{ {
start=clock(); start=clock();
nPerfmormedOps =0; nPerfmormedOps =0;
FILE * fo=fopen("log.txt","w");
while( !GoalReached() && !h.empty()) while( !GoalReached() && !h.empty())
{ {
@ -229,6 +234,10 @@ public:
// check if it is feasible // check if it is feasible
if (locMod->IsFeasible()) if (locMod->IsFeasible())
{ {
//assert(e>locMod->Priority());
//e = locMod->Priority();
fprintf(fo,"%.22f\n",locMod->Priority());
// printf("ops: %d heap: %d \n",nPerfmormedOps,h.size());
nPerfmormedOps++; nPerfmormedOps++;
locMod->Execute(m); locMod->Execute(m);
locMod->UpdateHeap(h); locMod->UpdateHeap(h);
@ -237,6 +246,7 @@ public:
//else printf("popped out unfeasible\n"); //else printf("popped out unfeasible\n");
delete locMod; delete locMod;
} }
fclose(fo);
return !(h.empty()); return !(h.empty());
} }