Changeset 2559 for GTP

Timestamp:

11/02/07 09:00:20 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/mypreprocess_visibility.sh (modified) (1 diff)
• scripts/preprocess_visibility.env (modified) (1 diff)
• scripts/preprocess_visibility_internal.sh (modified) (1 diff)
• src/DifferenceSampling.cpp (modified) (6 diffs)
• src/FlexibleHeap.h (modified) (3 diffs)
• src/Preprocessor.cpp (modified) (1 diff)
• src/RayCaster.h (modified) (4 diffs)
• src/TestPreprocessor.vcproj (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/mypreprocess_visibility.sh

@@ -1 +1 @@
 #!/bin/sh
 
-./preprocess_visibility_internal.sh ../data/vienna/vienna_cropped.obj ../data/vienna/vienna_cropped-seq-3000-false-20-viewcells.xml.gz vienna-visibility2.bn
+./preprocess_visibility_internal.sh ../data/vienna/vienna_cropped.obj ../data/vienna/vienna_cropped-seq-3000-false-20-viewcells.xml.gz vienna-visibility3.bn

GTP/trunk/Lib/Vis/Preprocessing/scripts/preprocess_visibility.env

@@ -63 +63 @@
 RssPreprocessor {
 
-        distributions mutation+spatial+object_direction
-#       distributions rss+object_direction
+#       distributions mutation+spatial+object_direction
+#       distributions mutation+spatial+object_direction+difference
+        distributions difference+object_direction+spatial
 #       distributions object_direction
 

GTP/trunk/Lib/Vis/Preprocessing/scripts/preprocess_visibility_internal.sh

@@ -14 +14 @@
 
 #NUM_SAMPLE_RAYS=200000000
-NUM_SAMPLE_RAYS=30000000
-#NUM_SAMPLE_RAYS=10000
+#NUM_SAMPLE_RAYS=30000000
+NUM_SAMPLE_RAYS=5000000
 
 $PREPROCESSOR -total_samples=$NUM_SAMPLE_RAYS \
 -scene_filename=$1 -view_cells_filename=$2 -preprocessor_visibility_file=$3 \
 -preprocessor_ray_cast_method=1 \
--samples_per_pass=1000000 \
+-samples_per_pass=500000 \
 -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
 -mutation_silhouette_prob=0.5 \

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

@@ -5 +5 @@
 #include "ViewCellsManager.h"
 #include "Preprocessor.h"
+#include "Timer/PerfTimer.h"
 
 
@@ -10 +11 @@
 #include "ArchModeler2MLRT.hxx"
 #endif
+
+PerfTimer sFilterTimer;
 
 
@@ -60 +63 @@
         ObjectPvs filteredPvs;
 
-    PvsFilterStatistics pvsStats = mPreprocessor.
+        sFilterTimer.Entry();
+    
+        PvsFilterStatistics pvsStats = mPreprocessor.
                 mViewCellsManager->ApplyFilter2(vc, 
                                                 false, 
                                                                                 filterSize, 
                                                                                 filteredPvs);
+
+        sFilterTimer.Exit();
 
         //mDifferencePvs.Clear(false);
@@ -72 +79 @@
 
         GetPvsDifference(filteredPvs, pvs, mPvsDifference);
+
+        cerr << "found " << mPvsDifference.size() << " different objects" << endl;
 }
 
@@ -77 +86 @@
 bool DifferenceSampling::GenerateSample(SimpleRay &ray)
 {
-        if (mNumSamples -- <= 0)
+        if (mNumSamples <= 0)
         {
+                // choose random view cell
                 ViewCellContainer &viewCells = mPreprocessor.mViewCellsManager->GetViewCells();
                 const int vcIdx = (int)RandomValue(0, (float)viewCells.size() - 0.5f);
 
                 mCurrentViewCell = viewCells[vcIdx];
+
+                if (mCurrentViewCell->GetPvs().Empty())
+                        return false;
+
+                cout << "computing new  difference set" << endl;
 
                 ComputeDifferenceSet(mCurrentViewCell, mPvsDifference);
@@ -91 +106 @@
         }
 
+        if (mPvsDifference.empty())
+                return false;
+
+        -- mNumSamples;
+
+        cout << "x";
         Vector3 origin, direction; 
         Vector3 point;

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

@@ -61 +61 @@
         T Erase(T);
 
+        void Reserve(const size_t n);
+
 protected:
 
-        void Place(T x, const unsigned int i);
-        void Swap(const unsigned int i, const unsigned int j);
-
-        unsigned int Parent(const unsigned int i) const { return (i - 1) / 2; }
-        unsigned int Left(const unsigned int i) const { return 2 * i + 1; }
-        unsigned int Right(const unsigned int i) const { return 2 * i + 2; }
+        inline void Place(T x, const unsigned int i);
+        inline void Swap(const unsigned int i, const unsigned int j);
+
+        inline unsigned int Parent(const unsigned int i) const { return (i - 1) / 2; }
+        inline unsigned int Left(const unsigned int i) const { return 2 * i + 1; }
+        inline unsigned int Right(const unsigned int i) const { return 2 * i + 2; }
 
         void UpHeap(const unsigned int i);
         void DownHeap(const unsigned int i);
 
+
+        ///////
+        
         std::vector<T> mBuffer;
 };
@@ -104 +109 @@
 }
 
+template <typename T>
+void FlexibleHeap<T>::Reserve(const size_t n) 
+{ 
+        mBuffer.reserve(n); 
+}
 
 template <typename T>
@@ -273 +283 @@
         t->NotInHeap();
 
+        if (i < (int)mBuffer.size())
+        {
         if (mBuffer[i]->GetPriority() < t->GetPriority())
                 DownHeap(i);
         else
                 UpHeap(i);
+        }
 
         return t;

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

@@ -1129 +1129 @@
         }
         
-        /////
+        /////////////////
         //-- reserve constant block of rays
         

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

@@ -78 +78 @@
 
         // pool of vss rays to be used in one pass of the sampling
-        struct VssRayPool {
+        struct VssRayPool 
+        {
                 VssRayPool(): mRays(NULL), mIndex(0), mNumber(0) 
                 {}
@@ -87 +88 @@
                 }
 
-                void Reserve(const int number) {
+                void Reserve(const int number) 
+                {
                         DEL_PTR(mRays);
                         mRays = new VssRay[number];
@@ -93 +95 @@
                 }
 
-                void Clear() {
+                void Clear() 
+                {
                         mIndex = 0;
                 }
-                VssRay *Alloc() {
+                
+                VssRay *Alloc() 
+                {
                         // reset pool
                         if (mIndex == mNumber)
@@ -110 +115 @@
         VssRayPool mVssRayPool;
 
-        void ReserveVssRayPool(const int n) {
+        void ReserveVssRayPool(const int n) 
+        {
                 mVssRayPool.Reserve(n);
         }
 
-        void InitPass() {
+        void InitPass() 
+        {
                 mVssRayPool.Clear();
         }

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -164 +164 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;"$(QTDIR)\lib";.\QtInterface\Release;"$(CG_LIB_PATH)""
-                                GenerateDebugInformation="TRUE"
+                                GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 LargeAddressAware="2"