Changeset 1910

Timestamp:

12/18/06 18:55:25 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (2 diffs)

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

@@ -147 +147 @@
 
         // mix of sampling strategies
-        if (1)
-        {
-                mStrategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-                //mStrategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-                mStrategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-                mStrategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-        }
-        
-        
+        mStrategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+        mStrategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+        mStrategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+        
+        //mStrategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+                
     Debug << "casting strategies: ";
         for (int i = 0; i < (int)mStrategies.size(); ++ i)
@@ -6045 +6042 @@
 
         // mix of sampling strategies
-        if (1)
-        {
-                evalStrats.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-                //evalStrats.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-                evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-                evalStrats.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-        }
-                
+        evalStrats.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+        evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+        evalStrats.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+
+        //evalStrats.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+                        
     Debug << "casting eval strategies: ";
         for (int i = 0; i < (int)evalStrats.size(); ++ i)