Changeset 1771 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.h

Timestamp:

11/20/06 14:02:29 (18 years ago)

Author:

bittner

Message:

merge, preparing sampling strategy support for mixed distributions, filter changes, histogram output for preprocessor

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.h (modified) (3 diffs)

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

@@ -121 +121 @@
         bool ExportKdTree(const string filename);
 
-        virtual int GenerateRays(const int number,
-                                                         const int raysType,
-                                                         SimpleRayContainer &rays);
-
-        bool GenerateRayBundle(SimpleRayContainer &rayBundle,
-                                                   const SimpleRay &mainRay,
-                                                   const int number,
-                                                   const int shuffleType) const;
-
-        virtual void CastRays(SimpleRayContainer &rays,
-                                                  VssRayContainer &vssRays,
-                                                  const bool castDoubleRays,
-                                                  const bool pruneInvalidRays = true);
-
+  virtual int
+  GenerateRays(const int number,
+                           const SamplingStrategy &strategy,
+                           SimpleRayContainer &rays);
+  
+  virtual int GenerateRays(const int number,
+                                                   const int raysType,
+                                                   SimpleRayContainer &rays);
+  
+  bool GenerateRayBundle(SimpleRayContainer &rayBundle,
+                                                 const SimpleRay &mainRay,
+                                                 const int number,
+                                                 const int shuffleType) const;
+  
+  virtual void CastRays(SimpleRayContainer &rays,
+                                                VssRayContainer &vssRays,
+                                                const bool castDoubleRays,
+                                                const bool pruneInvalidRays = true);
+  
         /** Returns a view cells manager of the given name.
         */
@@ -197 +202 @@
         bool mExportObj;
 
+  ofstream mStats;
+
 protected:
 
@@ -209 +216 @@
 
         void EvalPvsStat();
+
+  virtual void
+  EvalViewCellHistogram();
 
         /////////////////////////