Changeset 1842 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

12/03/06 20:55:53 (18 years ago)

Author:

mattausch

Message:

fixed compress

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (6 diffs)

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

@@ -1488 +1488 @@
                 }
 
+                /*cout << "***************\nbefore pulling up:\n";
+                for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                {
+                        cout << "vc:\n" << (*it)->GetPvs() << endl;
+                }*/
+
                 // compress root node
                 PullUpVisibility(interior);
+
+                /*cout << "after pulling up:\n";
+                cout << "interior:\n" << interior->GetPvs() << endl;
+
+                for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                {
+                        cout << "vc:\n" << (*it)->GetPvs() << endl;
+                }*/
         }
 }
@@ -1650 +1664 @@
 void ViewCellsTree::PullUpVisibility(ViewCellInterior *interior)
 {
-        Intersectable::NewMail((int)interior->mChildren.size());
+        const int mail = (int)interior->mChildren.size();
+        Intersectable::NewMail(mail);
 
         ViewCellContainer::const_iterator cit, cit_end = interior->mChildren.end();
 
-        // mail all objects in the leaf sets
+    // mail all objects in the leaf sets
         // we are interested in the objects which are present in all leaves
         // => count how often an object is part of a child set
@@ -1660 +1675 @@
         {
                 ViewCell *vc = *cit;
-
                 ObjectPvsIterator pit = vc->GetPvs().GetIterator();
 
                 while (pit.HasMoreEntries())
                 {               
-                        ObjectPvsEntry entry = pit.Next();
+                        const ObjectPvsEntry &entry = pit.Next();
                         Intersectable *obj = entry.mObject;
-
-                        if ((cit == interior->mChildren.begin()) && !obj->Mailed())
-                        {
-                                obj->Mail();
-                        }
-
-                        int incm = obj->IncMail();
-                }
-        }
-
-        interior->GetPvs().Clear();
+                        obj->Mail();
+                }
+        }
+
+        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
+        {
+                ViewCell *vc = *cit;
+
+                ObjectPvsIterator pit = vc->GetPvs().GetIterator();
+
+                while (pit.HasMoreEntries())
+                {               
+                        const ObjectPvsEntry &entry = pit.Next();
+                        Intersectable *obj = entry.mObject;
+
+                        obj->IncMail();
+                }
+        }
+
+        // reset pvs
+    interior->GetPvs().Clear(false);
                 
         // only the objects which are present in all leaf pvs 
@@ -1692 +1716 @@
                         ObjectPvsEntry entry = pit.Next();
 
-                        if (entry.mObject->Mailed((int)interior->mChildren.size()))
+                        if (entry.mObject->Mailed(mail))
                         {       
                                 interior->GetPvs().AddSample(entry.mObject, entry.mData.mSumPdf);
@@ -1699 +1723 @@
         }
 
-        // delete all the objects from the leaf sets which were moved to parent pvs
-        ObjectPvsIterator pit = interior->GetPvs().GetIterator();
-
-        while (pit.HasMoreEntries())
-        {               
-                ObjectPvsEntry entry = pit.Next();
-
-                for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
-                {
-                        if (!(*cit)->GetPvs().RemoveSample(entry.mObject, Limits::Infinity))
+        // delete entries which are pulled up
+        // note: could be inefficent, rather gather unmailed pvs and reassign
+        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
+        {
+                ViewCell *vc = *cit;
+                ObjectPvsIterator pit = vc->GetPvs().GetIterator();
+
+                ObjectPvs newPvs;
+
+                while (pit.HasMoreEntries())
+                {               
+                        const ObjectPvsEntry &entry = pit.Next();
+                        Intersectable *obj = entry.mObject;
+
+                        /*if (obj->Mailed(mail))
                         {
-                                Debug << "should not come here!" << endl;
+                                vc->GetPvs().RemoveSample(entry.mObject, Limits::Infinity))
+                        }*/
+                        if (!obj->Mailed(mail))
+                        {
+                                newPvs.AddSampleDirty(obj, entry.mData.mSumPdf);
                         }
                 }
+
+                vc->SetPvs(newPvs);
         }
 }
@@ -2465 +2500 @@
 
 
+
 /**************************************************************************/
 /*                     MergeCandidate implementation                      */