Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

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

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

@@ +1 @@
+
 #include "SamplingStrategy.h"
 #include "Ray.h"
@@ -7 +8 @@
 #include "RssTree.h"
 #include "Mutation.h"
+#include "FilterBasedDistribution.h"
+#include "DifferenceSampling.h"
+
+
+#ifdef PERFTIMER
 #include "Timer/PerfTimer.h"
-#include "DifferenceSampling.h"
-
-
+#endif
 
 namespace GtpVisibilityPreprocessor {
 
+
+#ifdef PERFTIMER
 extern PerfTimer haltonTimer;
 extern PerfTimer pvsTimer;
 extern PerfTimer viewCellCastTimer;
-
+#endif
+  
 //HaltonSequence SamplingStrategy::sHalton;
 
@@ -221 +228 @@
                                                                                                                                            r[4],
                                                                                                                                            r[5])
-                                                                                                                                           ) - origin;
+                                                                                                                           ) - origin;
         
         const float c = Magnitude(direction);
@@ -591 +598 @@
   if (1)
   {
+#ifdef PERFTIMER
           const float vcTime = viewCellCastTimer.TotalTime();
           const float pvsTime = pvsTimer.TotalTime();
           const float haltonTime = haltonTimer.TotalTime();
-
+          
           cout << "view cell cast time: " << vcTime << " s" << endl;
           cout << "pvs time: " << pvsTime << " s" << endl;
@@ -602 +610 @@
           Debug << "pvs time: " << pvsTime << " s" << endl;
           Debug << "halton time: "<< haltonTime << " s" << endl;
+#else
+          cout << "Timers not supported" << endl;
+          Debug << "Timers for PVS,Halton,Viewcell not supported" << endl;
+#endif
   }
 }
@@ -712 +724 @@
                                         if (strcmp(curr, "mutation")==0) {
                                          mDistributions.push_back(new MutationBasedDistribution(mPreprocessor));
-                                        }
+                                        } else
+                                          if (strcmp(curr, "filter_based")==0) {
+                                                mDistributions.push_back(new FilterBasedDistribution(mPreprocessor));
+                                          }
                                         else if (strcmp(curr, "difference")==0) {
                                          mDistributions.push_back(new DifferenceSampling(mPreprocessor));
                                         }
+