Changeset 2011 for GTP

Timestamp:

01/22/07 15:31:08 (18 years ago)

Author:

bittner

Message:

mutation strategy updated, importance depending on rsuccess

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• Makefile (modified) (1 diff)
• Mutation.cpp (modified) (11 diffs)
• Mutation.h (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)
• default.env (modified) (2 diffs)
• run_test2 (modified) (3 diffs)

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

@@ -1613 +1613 @@
                 "false");
 
+        
         RegisterOption("ViewCells.useKdPvsAfterFiltering",
                                    optBool, 

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: ne 21. I 22:47:46 2007
+# Generated by qmake (2.00a) (Qt 4.1.2) on: po 22. I 08:54:12 2007
 # Project:  preprocessor.pro
 # Template: app

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

@@ -26 +26 @@
 
 #define Q_SEARCH_STEPS 3
+
+#define SORT_RAY_ENTRIES 1
+
+// use avg ray contribution as importance
+// if 0 the importance is evaluated from the succ of mutations
+#define USE_AVG_CONTRIBUTION 1
+
+MutationBasedDistribution::RayEntry &
+MutationBasedDistribution::GetEntry(const int index)
+{
+#if SORT_RAY_ENTRIES
+  return mRays[index];
+#else
+  return mRays[(mBufferStart+index)%mRays.size()];
+#endif
+}
 
 void
@@ -57 +73 @@
 
   int reverseCandidates = 0;
-  
+
+#if 0
+  sort(mRays.begin(), mRays.end());
+  // reset the start of the buffer
+  mBufferStart = 0;
+#endif
+
   for (int i=0; i < vssRays.size(); i++) {
         if (vssRays[i]->mPvsContribution) {
@@ -92 +114 @@
                 *mRays[mBufferStart].mRay = *vssRays[i];
                 mRays[mBufferStart].mMutations = 0;
+                mRays[mBufferStart].mUnsuccessfulMutations = 0;
                 mRays[mBufferStart].ResetReverseMutation();
                 //              mRays[mBufferStart] = RayEntry(newRay);
@@ -97 +120 @@
                 if (mBufferStart >= mMaxRays)
                   mBufferStart = 0;
-                
-
           }
         } else {
@@ -156 +177 @@
         cout<<"Reverse candidates:"<<reverseCandidates<<endl;
   }
-
+  
   float pContributingRays = contributingRays/(float)vssRays.size();
+  
+  cout<<"Percentage of contributing rays:"<<pContributingRays<<endl;
+  
+#if USE_AVG_CONTRIBUTION
   float importance = 1.0f/(pContributingRays + 1e-5);
-  // float importance = 1.0f;
+// float importance = 1.0f;
   // set this values for last contributingRays
   int index = mBufferStart - 1;
@@ -168 +193 @@
         mRays[index].mImportance = importance;
   }
-
+#else
+  // use unsucc mutation samples as feedback on importance
+  for (int i=0; i < mRays.size(); i++) {
+        const float  minImportance = 0.1f;
+        const int minImportanceSamples = 20;
+        mRays[i].mImportance = minImportance +
+          (1-minImportance)*exp(-3.0f*mRays[i].mUnsuccessfulMutations/minImportanceSamples);
+        
+        //mRays[i].mImportance = 1.0f/(mRays[i].mUnsuccessfulMutations+3);
+        //      mRays[i].mImportance = 1.0f;
+  }
+#endif
+  
+#if SORT_RAY_ENTRIES
+  long t1 = GetTime();
+  sort(mRays.begin(), mRays.end());
+  // reset the start of the buffer
+  mBufferStart = 0;
+  mLastIndex = mRays.size();
+  cout<<"Mutation candidates sorted in "<<TimeDiff(t1, GetTime())<<" ms."<<endl;
+#endif
+  
 #if MUTATION_USE_CDF
   // compute cdf
@@ -184 +230 @@
         GetEntry(0).mImportance<<" "<<
         GetEntry(mRays.size()-1).mImportance<<endl;
-  
+
+  cout<<"Sampling factor = "<<
+        GetEntry(0).GetSamplingFactor()<<" "<<
+        GetEntry(mRays.size()-1).GetSamplingFactor()<<endl;
+
   cerr<<"Mutation update done."<<endl;
 }
@@ -516 +566 @@
 
 #if !MUTATION_USE_CDF
+#if SORT_RAY_ENTRIES
+  index = mLastIndex - 1;
+  if (index < 0 || index >= mRays.size()-1) {
+        index = mRays.size() - 1;
+  } else
+        if (
+                mRays[index].GetSamplingFactor() >= mRays[mLastIndex].GetSamplingFactor()) {
+          // make another round
+
+          //      cout<<"R2"<<endl;
+          //      cout<<mLastIndex<<endl;
+          //      cout<<index<<endl;
+          index = mRays.size() - 1;
+        }
+#else
   // get tail of the buffer
   index = (mLastIndex+1)%mRays.size();
@@ -534 +599 @@
         index = (index+1)%mRays.size();
   }
+#endif
 #else
   static HaltonSequence iHalton;
@@ -558 +624 @@
 
   mLastIndex = index;
-
+  //  Debug<<index<<" "<<mRays[index].GetSamplingFactor()<<endl;
+  
   if (mRays[index].HasReverseMutation()) {
         //cout<<"R "<<mRays[index].mutatedOrigin<<" "<<mRays[index].mutatedTermination<<endl;
@@ -768 +835 @@
 
 
-}
+
+}

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

@@ -57 +57 @@
         
         float GetSamplingFactor() const { return mMutations/mImportance; }
+        
+        friend bool operator<(const RayEntry &a, const RayEntry &b) {
+          return a.GetSamplingFactor() > b.GetSamplingFactor();
+        }
+        
         RayEntry() {}
         RayEntry(VssRay *r):mRay(r),
@@ -118 +123 @@
                                                  );
 
-  RayEntry &GetEntry(const int index) {
-        return mRays[(mBufferStart+index)%mRays.size()];
-  }
+  RayEntry &GetEntry(const int index);
+
   
   vector<RayEntry> mRays;

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

@@ -1203 +1203 @@
 #if 1
   mRayCaster->SortRays(rays);
-  cout<<"Rays sorted in "<<TimeDiff(t1, GetTime())<<" s."<<endl;
+  cout<<"Rays sorted in "<<TimeDiff(t1, GetTime())<<" ms."<<endl;
 
   if (0) {

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -61 +61 @@
 #       type render
         detectEmptyViewSpace true
-#       pvsRenderErrorSamples 0
-        pvsRenderErrorSamples 10000
+        pvsRenderErrorSamples 0
+#       pvsRenderErrorSamples 10000
         quitOnFinish false
         computeVisibility true
@@ -111 +111 @@
 
         useImportanceSampling true
-
 
         Export {

GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

@@ -7 +7 @@
 #VIEWCELLS=../data/vienna/vienna-viewcells-5000.xml
 
-#SCENE=../data/soda/soda5.dat
+
+#SCENE=../data/soda/soda.obj
 #VIEWCELLS=../data/soda/soda5-viewcells-1000.xml
 #VIEWCELLS=../data/soda/soda5-viewcells-single.xml
@@ -49 +50 @@
 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
- -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4h.xml \
- -preprocessor_stats=$PREFIX-i-mixed-b1-n4h.log \
- -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4h.hlog
+ -view_cells_use_kd_pvs- -af_use_kd_pvs- \
+ -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4i.xml \
+ -preprocessor_stats=$PREFIX-i-mixed-b1-n4i.log \
+ -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4i.hlog
 
 
@@ -58 +60 @@
 # g - gaussian origin, q=2, reverse samples
 
+# g, h contain pvs error estimations...
 
 # $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \