Changeset 705 for GTP/trunk

Timestamp:

03/16/06 15:31:20 (19 years ago)

Author:

mattausch

Message:

fixed bug in filtering

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Pvs.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

@@ -146 +146 @@
                                                                            float &pvsEnlargement)
 {
+        pvsReduction = 0.0f;
+        pvsEnlargement = 0.0f;
   // Uses sum of log differences, which corresponds to entropy
   std::map<T, PvsData<T>, LtSample<T> >::iterator it;

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -553 +553 @@
 int GetBestViewCellIdx(ViewCell *root, const ViewCellContainer &neighborhood)
 {
-        int bestViewCellIdx = -1;;
+        int bestViewCellIdx = 0;
 
         float mergeCost = Limits::Infinity;
@@ -563 +563 @@
         {
                 const float mc = EvalMergeCost(root, *it);
-
-                if (mc > mergeCost)
+                
+                if (mc < mergeCost)
                 {
                         mergeCost = mc;
@@ -586 +586 @@
         //-- use priority queue to merge leaf pairs
 
-
+        //cout << "neighborhood: " << neighborhood.size() << endl;
         //const float maxAvgCost = 350;
         for (int nMergedViewCells = 0; nMergedViewCells < n; ++ nMergedViewCells)
@@ -593 +593 @@
                 
                 ViewCell *bestViewCell = neighborhood[bestViewCellIdx];
-                
+                cout << "here2" << endl;
                 // remove from vector
                 swap(neighborhood[bestViewCellIdx], neighborhood.back());
                 neighborhood.pop_back();
-                
+        
+                cout << "vc idx: " << bestViewCellIdx << endl;
                 if (!bestViewCell || !root)
                         cout << "warning!!" << endl;
+                
+                cout << "here4" << endl;
+
                 // create new root of the hierarchy
                 root = MergeViewCells(root, bestViewCell);
+                cout << "here5" << endl;
         }
 
@@ -939 +944 @@
         // generate parent view cell
         ViewCellInterior *vc = new ViewCellInterior();//GenerateViewCell();
-
+                cout << "here66" << endl;
         vc->GetPvs() = left->GetPvs();
+                cout << "here44" << endl;
         // merge pvs
         vc->GetPvs().Merge(right->GetPvs());
@@ -955 +961 @@
         }
 
-
+        cout << "here77" << endl;
         vc->SetupChildLink(left);
+        cout << "here88" << endl;
         vc->SetupChildLink(right);
-
+        cout << "here99" << endl;
 
         return vc;
@@ -4020 +4027 @@
                 
                 exporter->SetFilled();
-                exporter->ResetForcedMaterial();
-
+
+                exporter->SetForcedMaterial(RgbColor(0,1,0));
+                ExportViewCellGeometry(exporter,  GetViewCell(viewPoint));
+
+                //exporter->ResetForcedMaterial();
+                exporter->SetForcedMaterial(RgbColor(0,0,1));
                 ExportViewCellGeometry(exporter, testPrVs.mViewCell);