Changeset 1901

Timestamp:

12/15/06 23:42:04 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• SamplingStrategy.cpp (modified) (2 diffs)
• SamplingStrategy.h (modified) (10 diffs)

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

@@ -9 +9 @@
 namespace GtpVisibilityPreprocessor {
 
+
+//HaltonSequence SamplingStrategy::sHalton;
 
 HaltonSequence ObjectBasedDistribution::sHalton;
@@ -124 +126 @@
   sHalton.GetNext(4, r);
 
-  r[0] *= mPreprocessor.mObjects.size()-1;
+  r[0] *= (float)mPreprocessor.mObjects.size() - 1;
   const int i = (int)r[0];
   

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

@@ -55 +55 @@
         virtual int GenerateSamples(const int number, SimpleRayContainer &rays);
 
-
         virtual bool GenerateSample(SimpleRay &ray) = 0;
 
@@ -66 +65 @@
   virtual void Update(VssRayContainer &vssRays) {}
 
-
-
   friend bool LowerRatio(const SamplingStrategy *a, const SamplingStrategy *b) {
         return a->mRatio < b->mRatio;
@@ -87 +84 @@
 protected:
 
+        //static HaltonSequence sHalton;
         Preprocessor &mPreprocessor;
 };
@@ -102 +100 @@
 
 private:
-  virtual bool GenerateSample(SimpleRay &ray);
-
-   static HaltonSequence sHalton;
+  
+        virtual bool GenerateSample(SimpleRay &ray);
+    static HaltonSequence sHalton;
 };
 
@@ -118 +116 @@
 
 private:
-  virtual bool GenerateSample(SimpleRay &ray);
+        
+        virtual bool GenerateSample(SimpleRay &ray);
 };
 
@@ -173 +172 @@
   
 private:
-           virtual bool GenerateSample(SimpleRay &ray);
-
-           static HaltonSequence sHalton;
+        
+        virtual bool GenerateSample(SimpleRay &ray);
+        static HaltonSequence sHalton;
 };
 
@@ -188 +187 @@
          
 private:
+
          virtual bool GenerateSample(SimpleRay &ray);
 };
@@ -229 +229 @@
 private:
 
-  virtual bool GenerateSample(SimpleRay &ray);
-
-   static HaltonSequence sHalton;
+        virtual bool GenerateSample(SimpleRay &ray);
+        static HaltonSequence sHalton;
 };
 
@@ -273 +272 @@
   UpdateRatios();
 
-  // construct distribution mixyure from a string describing the required distributions
+  // construct distribution mixture from a string describing the required distributions
   bool
   Construct(char *str);
@@ -286 +285 @@
 private:
 
-   // Generate a new sample according to a mixture distribution
-  virtual bool GenerateSample(SimpleRay &ray);
-
-// halton sequence generator for deciding between distributions
-  static HaltonSequence sHalton;
-  
+        // Generate a new sample according to a mixture distribution
+        virtual bool GenerateSample(SimpleRay &ray);
+
+        // halton sequence generator for deciding between distributions
+        static HaltonSequence sHalton;
 };