Changeset 403 for trunk/VUT

Timestamp:

11/10/05 13:59:18 (19 years ago)

Author:

bittner

Message:

vvs preprocessor update

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Environment.cpp (modified) (3 diffs)
• KdTree.cpp (modified) (1 diff)
• VssPreprocessor.cpp (modified) (4 diffs)
• VssPreprocessor.h (modified) (1 diff)
• VssTree.cpp (modified) (4 diffs)
• VssTree.h (modified) (4 diffs)
• default.env (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1150 +1150 @@
                  "10");
 
-        RegisterOption("VssPreprocessor.totalSamples",
+        RegisterOption("VssPreprocessor.initialSamples",
                                                                  optInt,
-                                                                 "-total_samples=",
+                                                                 "-initial_samples=",
+                                                                 "100000");
+
+        RegisterOption("VssPreprocessor.vssSamples",
+                                                                 optInt,
+                                                                 "-vss_samples=",
                                                                  "1000000");
         
@@ -1160 +1165 @@
                                                                  "100000");
 
+  RegisterOption("VssPreprocessor.useImportanceSampling",
+                                                                 optBool,
+                                                                 "-vss_use_importance=",
+                                                                 "true");
+
   RegisterOption("ViewCells.hierarchy",
                  optString,
@@ -1303 +1313 @@
 
         RegisterOption("VssTree.maxDepth", optInt, "kd_depth=", "12");
-  RegisterOption("VssTree.minPvs", optInt, "kd_minpvs=", "32");
-        RegisterOption("VssTree.maxCostRatio", optFloat, "maxcost=", "0.9");
+  RegisterOption("VssTree.minPvs", optInt, "kd_minpvs=", "1");
+  RegisterOption("VssTree.minRays", optInt, "kd_minrays=", "10");
+        RegisterOption("VssTree.maxCostRatio", optFloat, "maxcost=", "0.95");
         RegisterOption("VssTree.maxRayContribution", optFloat, "maxraycontrib=", "0.5");
 

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

@@ -292 +292 @@
   app << "===== KdTree statistics ===============\n";
 
-  app << "#N_RAYS Number of rays )\n"
-      << rays <<endl;
-  app << "#N_DOMAINS  ( Number of query domains )\n"
-      << queryDomains <<endl;
-  
   app << "#N_NODES ( Number of nodes )\n" << nodes << "\n";
 

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -16 +16 @@
   // this should increase coherence of the samples
   environment->GetIntValue("VssPreprocessor.samplesPerPass", mSamplesPerPass);
-  environment->GetIntValue("VssPreprocessor.totalSamples", mTotalSamples);
+  environment->GetIntValue("VssPreprocessor.initialSamples", mInitialSamples);
+  environment->GetIntValue("VssPreprocessor.vssSamples", mVssSamples);
+        environment->GetBoolValue("VssPreprocessor.useImportanceSampling", mUseImportanceSampling);
+        
   mStats.open("stats.log");
 }
@@ -212 +215 @@
         VssTree *vssTree = NULL;
 
-  while (totalSamples < mTotalSamples) {
+  while (totalSamples < mInitialSamples) {
                 int passContributingSamples = 0;
                 int passSampleContributions = 0;
@@ -305 +308 @@
         
         int samples = 0;
-        for (int i=0; i < 50; i++) {
-                int num = 100000;
-                if (0) {
+        while (1) {
+                int num = mSamplesPerPass;
+                if (!mUseImportanceSampling) {
                         VssRayContainer vssRays;
                         for (int j=0; j < num; j++) {
@@ -321 +324 @@
                 float pvs = vssTree->GetAvgPvsSize();
                 cout<<samples<<" avgPVS ="<<pvs<<endl;
+                if (samples >= mVssSamples)
+                        break;
         }
 

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.h

@@ -15 +15 @@
         int mPass;
   int mSamplesPerPass;
-  int mTotalSamples;
-  ofstream mStats;
+  int mInitialSamples;
+  int mVssSamples;
+        bool mUseImportanceSampling;
+
+        ofstream mStats;
         
   ObjectContainer mObjects;

trunk/VUT/GtpVisibilityPreprocessor/src/VssTree.cpp

@@ -71 +71 @@
   environment->GetIntValue("VssTree.maxDepth", termMaxDepth);
         environment->GetIntValue("VssTree.minPvs", termMinPvs);
+        environment->GetIntValue("VssTree.minRays", termMinRays);
         environment->GetFloatValue("VssTree.maxRayContribution", termMaxRayContribution);
   environment->GetFloatValue("VssTree.maxCostRatio", termMaxCostRatio);
@@ -172 +173 @@
     maxDepthNodes*100/(double)Leaves()<<endl;
 
-  app << "#N_PMINCOSTLEAVES  ( Percentage of leaves with minCost )\n"<<
-    minCostNodes*100/(double)Leaves()<<endl;
+  app << "#N_PMINPVSLEAVES  ( Percentage of leaves with minCost )\n"<<
+    minPvsNodes*100/(double)Leaves()<<endl;
+
+  app << "#N_PMINRAYSLEAVES  ( Percentage of leaves with minCost )\n"<<
+    minRaysNodes*100/(double)Leaves()<<endl;
         
         app << "#N_PMINSIZELEAVES  ( Percentage of leaves with minSize )\n"<<
@@ -744 +748 @@
         //    stat.minCostNodes++;
         if ( leaf->GetPvsSize() < termMinPvs)
-                stat.minCostNodes++;
-  
-        if (leaf->GetAvgRayContribution() > termMaxRayContribution )
+                stat.minPvsNodes++;
+
+        if ( leaf->GetPvsSize() < termMinRays)
+                stat.minRaysNodes++;
+
+        if (0 && leaf->GetAvgRayContribution() > termMaxRayContribution )
                 stat.maxRayContribNodes++;
         
@@ -770 +777 @@
   
   if ( (leaf->GetPvsSize() < termMinPvs) ||
-                         (leaf->GetAvgRayContribution() > termMaxRayContribution ) ||
+                         (leaf->rays.size() < termMinRays) ||
+                         //                      (leaf->GetAvgRayContribution() > termMaxRayContribution ) ||
        (leaf->depth >= termMaxDepth) ||
                          SqrMagnitude(box.Size()) <= termMinSize ) {

trunk/VUT/GtpVisibilityPreprocessor/src/VssTree.h

@@ -54 +54 @@
   int maxDepthNodes;
   // max depth nodes
-  int minCostNodes;
+  int minPvsNodes;
+  int minRaysNodes;
         // max ray contribution nodes
   int maxRayContribNodes;
@@ -83 +84 @@
     rayRefs = 0;
     maxDepthNodes = 0;
-    minCostNodes = 0;
+    minPvsNodes = 0;
+    minRaysNodes = 0;
     maxRayRefs = 0;
     addedRayRefs = removedRayRefs = 0;
@@ -426 +428 @@
                 return GetPvsSize()/((float)rays.size() + Limits::Small);
         }
+
+        float GetSqrRayContribution() const {
+                return sqr(GetPvsSize()/((float)rays.size() + Limits::Small));
+        }
+
 };
 
@@ -555 +562 @@
   int termMinPvs;
 
+        // minimal ray number per node to still get subdivided
+  int termMinRays;
+        
   // maximal cost ration to subdivide a node
   float termMaxCostRatio;

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -24 +24 @@
 
 VssPreprocessor {
-        totalSamples 200000
-        samplesPerPass  50000
+        samplesPerPass  100000
+        initialSamples 200000
+        vssSamples 1000000
+        useImportanceSampling true
 }
 
@@ -32 +34 @@
 
         maxDepth        40
-        minPvs          5
+        minPvs          1
+        minRays         50
         minSize         0.00001
         maxCostRatio    0.95
-        maxRayContribution 0.3
+        maxRayContribution 0.05
         
         maxTotalMemory  400