Changeset 1898 for GTP/trunk/Lib/Vis

Timestamp:

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

Author:

mattausch

Message:

removed bug in sampling strategy

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Preprocessor.cpp (modified) (1 diff)
• SamplingStrategy.cpp (modified) (7 diffs)
• SamplingStrategy.h (modified) (7 diffs)

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

@@ -993 +993 @@
 int
 Preprocessor::GenerateRays(const int number,
-                                                                                                         const int sampleType,
-                                                                                                         SimpleRayContainer &rays)
+                                                   const int sampleType,
+                                                   SimpleRayContainer &rays)
 {
         const int startSize = (int)rays.size();

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

@@ -9 +9 @@
 namespace GtpVisibilityPreprocessor {
 
+HaltonSequence SamplingStrategy::sHalton;
 
 SamplingStrategy::SamplingStrategy(Preprocessor &preprocessor): 
@@ -73 +74 @@
   
   float r[5];
-  mHalton.GetNext(5, r);
+  sHalton.GetNext(5, r);
   
   mPreprocessor.mViewCellsManager->GetViewPoint(origin,
@@ -81 +82 @@
   Vector3 point, normal;
   
-  r[0] *= mPreprocessor.mObjects.size()-1;
+  r[0] *= (float)mPreprocessor.mObjects.size() - 1;
   const int i = (int)r[0];
   
@@ -115 +116 @@
 
   float r[4];
-  mHalton.GetNext(4, r);
+  sHalton.GetNext(4, r);
 
   r[0] *= mPreprocessor.mObjects.size()-1;
@@ -191 +192 @@
 
   float r[6];
-  mHalton.GetNext(6, r);
+  sHalton.GetNext(6, r);
   mPreprocessor.mViewCellsManager->GetViewPoint(origin, Vector3(r[0],r[1],r[2]));
   
@@ -415 +416 @@
   for (i=0; i < tries; i++) {
         float r[4];
-        mHalton.GetNext(4, r);
+        sHalton.GetNext(4, r);
         
         origin = center + (radius*UniformRandomVector(r[0], r[1]));
@@ -487 +488 @@
 {
   float r;
-  mHalton.GetNext(1, &r);
+  sHalton.GetNext(1, &r);
 
   // pickup a distribution

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