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

Timestamp:

12/15/06 17:29:45 (18 years ago)

Author:

mattausch

Message:

removed bug in sampling strategy

File:

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

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

@@ -69 +69 @@
 
 public:
+
         /// variables usefull for mixed distribution sampling
         int mType;
@@ -74 +75 @@
         float mContribution;
 
-  int mTotalRays;
-  float mTotalContribution;
-
-  float mTime;
+        int mTotalRays;
+        float mTotalContribution;
+
+        float mTime;
         float mRatio;
 
 protected:
 
-  Preprocessor &mPreprocessor;
-
+        Preprocessor &mPreprocessor;
+        static HaltonSequence sHalton;
 };
 
@@ -90 +91 @@
 {
  public:
-  HaltonSequence mHalton;
+  //HaltonSequence mHalton;
   
   ObjectBasedDistribution(Preprocessor &preprocessor):
@@ -118 +119 @@
 class ObjectDirectionBasedDistribution: public SamplingStrategy
 {
-  HaltonSequence mHalton;
+  //HaltonSequence mHalton;
   
 public:
@@ -158 +159 @@
 {
  public:
-  HaltonSequence mHalton;
+  //HaltonSequence mHalton;
   SpatialBoxBasedDistribution(Preprocessor &preprocessor):
         SamplingStrategy(preprocessor){
@@ -213 +214 @@
 public:
   //Halton<4> halton;
-  HaltonSequence mHalton;
+  //HaltonSequence mHalton;
 
   GlobalLinesDistribution(Preprocessor &preprocessor):
@@ -237 +238 @@
 */
 
-class MixtureDistribution : public SamplingStrategy {
+class MixtureDistribution : public SamplingStrategy 
+{
 public:
   // halton sequence generator for deciding between distributions
-  HaltonSequence mHalton;
+  //HaltonSequence mHalton;
   
   // container for the distributions