Changeset 1867 for GTP/trunk/Lib/Vis/Preprocessing/src/Halton.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/Halton.h (modified) (4 diffs)

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

@@ -7 +7 @@
 namespace GtpVisibilityPreprocessor {
 
-class Halton2 {
-  static float _invBases[2];
-  float _prev[2];
-  
-  float halton(float baseRec, float prev) const {
-        float r = 1 - prev - 1e-10f;
-        if (baseRec < r)
-          return prev + baseRec;
+inline float halton(float baseRec, float prev) {
+  float r = 1 - prev - 1e-10f;
+  if (baseRec < r)
+        return prev + baseRec;
         float h = baseRec;
         float hh;
@@ -22 +18 @@
         } while (h >= r);
         return prev + hh + h - 1;
+}
+
+template<int T>
+class Halton {
+  float _invBases[T];
+  float _prev[T];
+  
+public:
+  
+  void Reset() {
+        for (int i=0; i < T; i++) 
+          _prev[i] = 0;
   }
+  
+  Halton() {
+        for (int i=0; i < T; i++) {
+          int base = FindPrime(i+1);
+          if (base == 1)
+                base++;
+          _invBases[i] = 1.0f/base;
+        }
+        Reset();
+  }
+  
+  void
+  GetNext(float *a) {
+        for (int i=0; i < T; i++) {
+          a[i] = halton(_invBases[i], _prev[i]);
+          _prev[i] = a[i];
+        }
+  }
+  
+};
+
+class Halton2 {
+  static float _invBases[2];
+  float _prev[2];
   
 public:
@@ -69 +101 @@
  */
 inline int FindPrime(const int index) {
-  if(index < 1) {
-        cerr<<"FindPrime: The argument must be non-negative."<<endl;
-        return -1;
-  }
+  //  if (index < 1) {
+  //    cerr<<"FindPrime: The argument must be non-negative."<<endl;
+  //    return -1;
+  //  }
+
+  const int primes[] = {-1, 1, 3, 5, 7, 11, 13};
+  if (index <= 6)
+        return primes[index];
+
   int prime = 1;
   int found = 1;
@@ -115 +152 @@
         int copyOfIndex = index;
         if((base >= 2) && (index >= 1)) {
-        // changed by matt
-        //if(base >= 2 & index >= 1) {
           while(copyOfIndex > 0) {
                 N1 = (copyOfIndex / base);