Changeset 2662 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

04/28/08 18:59:58 (16 years ago)

Author:

mattausch

Message:

working on gvs pixel error evaluation bugfixing

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (2 diffs)

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

@@ -846 +846 @@
                 {
                         mViewCells.push_back((*vit)->first);
+
+                        if (mViewCells.size() >= mMaxViewCells)
+                                break;
                 }
-
-                return;
-        }
-
-        while ((int)mViewCells.size() < mMaxViewCells)
-    {
-                if (0)
+        }
+        else
+        {
+                while ((int)mViewCells.size() < mMaxViewCells)
                 {
-                        mViewCells.push_back(mViewCellsManager->GetViewCell((int)mViewCells.size()));
-                        continue;
-                }
-                
-                // HACK
-                const int tries = 10000;
-                int i = 0;
-
-                for (i = 0; i < tries; ++ i)
-                {
-                        const int idx = (int)RandomValue(0.0f, (float)mViewCellsManager->GetNumViewCells() - 0.5f);
-        
-                        ViewCell *viewCell = mViewCellsManager->GetViewCell(idx);
-
-                        if (!viewCell->Mailed())
+                        if (0)
                         {
-                                viewCell->Mail();
+                                mViewCells.push_back(mViewCellsManager->GetViewCell((int)mViewCells.size()));
+                                continue;
+                        }
+
+                        // HACK
+                        const int tries = 10000;
+                        int i = 0;
+
+                        for (i = 0; i < tries; ++ i)
+                        {
+                                const int idx = (int)RandomValue(0.0f, (float)mViewCellsManager->GetNumViewCells() - 0.5f);
+
+                                ViewCell *viewCell = mViewCellsManager->GetViewCell(idx);
+
+                                if (!viewCell->Mailed())
+                                {
+                                        viewCell->Mail();
+                                        break;
+                                }
+
+                                mViewCells.push_back(viewCell);
+                        }
+
+                        if (i == tries)
+                        {
+                                cerr << "big error! no view cell found" << endl;
                                 break;
                         }
-
-                        mViewCells.push_back(viewCell);
                 }
-
-                if (i == tries)
-                {
-                        cerr << "big error! no view cell found" << endl;
-                        return;
-                }
-        }
+        }
+
+        cout << "\ncomputing list of " << mViewCells.size() << " view cells" << endl;
 }
 
@@ -1114 +1119 @@
                 cout << "finished view cell construction" << endl;
         }
-#if 0
-        else
-        {       
-                //-- test successful view cells loading by exporting them again
-                VssRayContainer dummies;
-                mViewCellsManager->Visualize(mObjects, dummies);
-                mViewCellsManager->ExportViewCells("test.xml.gz", mViewCellsManager->GetExportPvs(), mObjects);
-        }
-#endif
 
         if (mPerViewCell)