Changeset 1867 for GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.h

Timestamp:

12/08/06 17:10:14 (18 years ago)

Author:

bittner

Message:

merge, global lines, rss sampling updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.h (modified) (15 diffs)

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

@@ -2 +2 @@
 #define _SamplingStategy_H__
 
+#include "Halton.h"
 
 namespace GtpVisibilityPreprocessor {
@@ -46 +47 @@
         */
 
-        virtual int GenerateSamples(const int number, SimpleRayContainer &rays) const;
-
-private:
-
-        virtual bool GenerateSample(SimpleRay &ray) const = 0;
+        virtual int GenerateSamples(const int number, SimpleRayContainer &rays);
+
+private:
+
+        virtual bool GenerateSample(SimpleRay &ray) = 0;
 
 public:
@@ -77 +78 @@
 
 private:
-  virtual bool GenerateSample(SimpleRay &ray) const;
+  virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -91 +92 @@
 
 private:
-  virtual bool GenerateSample(SimpleRay &ray) const;
+  virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -103 +104 @@
          }
 private:
-        virtual bool GenerateSample(SimpleRay &ray) const;
+        virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -115 +116 @@
   }
 private:
-  virtual bool GenerateSample(SimpleRay &ray) const;
+  virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -128 +129 @@
            
 private:
-           virtual bool GenerateSample(SimpleRay &ray) const;
+           virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -135 +136 @@
 {
  public:
-         SpatialBoxBasedDistribution(const Preprocessor &preprocessor):
-           SamplingStrategy(preprocessor){
-           mType = DIRECTION_BOX_BASED_DISTRIBUTION;
-         }
-           
-private:
-           virtual bool GenerateSample(SimpleRay &ray) const;
+  Halton<6> halton;
+  SpatialBoxBasedDistribution(const Preprocessor &preprocessor):
+        SamplingStrategy(preprocessor){
+        mType = DIRECTION_BOX_BASED_DISTRIBUTION;
+  }
+  
+private:
+           virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -154 +156 @@
          
 private:
-         virtual bool GenerateSample(SimpleRay &ray) const;
+         virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -167 +169 @@
          
 private:
-         virtual bool GenerateSample(SimpleRay &ray) const;
+         virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -180 +182 @@
 
 
-  virtual int GenerateSamples(const int number, SimpleRayContainer &ray) const {
+  virtual int GenerateSamples(const int number, SimpleRayContainer &ray) {
         // TBD!!!
         return 0;
@@ -186 +188 @@
 
 private:
-  virtual bool GenerateSample(SimpleRay &ray) const;
+  virtual bool GenerateSample(SimpleRay &ray);
   
 };
@@ -197 +199 @@
         SamplingStrategy(preprocessor) {}
   
-  virtual bool GenerateSample(SimpleRay &ray) const;
+  virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -203 +205 @@
 {
 public:
+  Halton<4> halton;
+  //HaltonSequence mHalton;
+
   GlobalLinesDistribution(const Preprocessor &preprocessor):
-                SamplingStrategy(preprocessor) {
-                mType = GLOBAL_LINES_DISTRIBUTION;
-        }
-  
-  virtual bool GenerateSample(SimpleRay &ray) const;
+        SamplingStrategy(preprocessor) {
+        mType = GLOBAL_LINES_DISTRIBUTION;
+  }
+  
+  virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -221 +226 @@
          SamplingStrategy(preprocessor) {}
          
-         virtual bool GenerateSample(SimpleRay &ray) const;
+         virtual bool GenerateSample(SimpleRay &ray);
 };
 */