Changeset 1004 for GTP/trunk/Lib/Vis/Preprocessing/src/VssTree.cpp

Timestamp:

06/07/06 18:38:29 (18 years ago)

Author:

mattausch

Message:

environment as a singleton

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VssTree.cpp (modified) (4 diffs)

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

@@ -67 +67 @@
 VssTree::VssTree()
 {
-  environment->GetIntValue("VssTree.maxDepth", termMaxDepth);
-  environment->GetIntValue("VssTree.minPvs", termMinPvs);
-  environment->GetIntValue("VssTree.minRays", termMinRays);
-  environment->GetFloatValue("VssTree.maxRayContribution", termMaxRayContribution);
-  environment->GetFloatValue("VssTree.maxCostRatio", termMaxCostRatio);
-
-  environment->GetFloatValue("VssTree.minSize", termMinSize);
+  Environment::GetSingleton()->GetIntValue("VssTree.maxDepth", termMaxDepth);
+  Environment::GetSingleton()->GetIntValue("VssTree.minPvs", termMinPvs);
+  Environment::GetSingleton()->GetIntValue("VssTree.minRays", termMinRays);
+  Environment::GetSingleton()->GetFloatValue("VssTree.maxRayContribution", termMaxRayContribution);
+  Environment::GetSingleton()->GetFloatValue("VssTree.maxCostRatio", termMaxCostRatio);
+
+  Environment::GetSingleton()->GetFloatValue("VssTree.minSize", termMinSize);
   termMinSize = sqr(termMinSize);
         
-  environment->GetFloatValue("VssTree.refDirBoxMaxSize", refDirBoxMaxSize);
+  Environment::GetSingleton()->GetFloatValue("VssTree.refDirBoxMaxSize", refDirBoxMaxSize);
   refDirBoxMaxSize = sqr(refDirBoxMaxSize);
   
-  environment->GetFloatValue("VssTree.epsilon", epsilon);
-  environment->GetFloatValue("VssTree.ct_div_ci", ct_div_ci);
-        
-  environment->GetFloatValue("VssTree.maxTotalMemory", maxTotalMemory);
-  environment->GetFloatValue("VssTree.maxStaticMemory", maxStaticMemory);
+  Environment::GetSingleton()->GetFloatValue("VssTree.epsilon", epsilon);
+  Environment::GetSingleton()->GetFloatValue("VssTree.ct_div_ci", ct_div_ci);
+        
+  Environment::GetSingleton()->GetFloatValue("VssTree.maxTotalMemory", maxTotalMemory);
+  Environment::GetSingleton()->GetFloatValue("VssTree.maxStaticMemory", maxStaticMemory);
   
   
@@ -89 +89 @@
 
   float refDirAngle;
-  environment->GetFloatValue("VssTree.refDirAngle", refDirAngle);
-  
-  environment->GetIntValue("VssTree.accessTimeThreshold", accessTimeThreshold);
+  Environment::GetSingleton()->GetFloatValue("VssTree.refDirAngle", refDirAngle);
+  
+  Environment::GetSingleton()->GetIntValue("VssTree.accessTimeThreshold", accessTimeThreshold);
   //= 1000;
-  environment->GetIntValue("VssTree.minCollapseDepth", minCollapseDepth);
+  Environment::GetSingleton()->GetIntValue("VssTree.minCollapseDepth", minCollapseDepth);
   //  int minCollapseDepth = 4;
 
@@ -103 +103 @@
   // split type
   char sname[128];
-  environment->GetStringValue("VssTree.splitType", sname);
+  Environment::GetSingleton()->GetStringValue("VssTree.splitType", sname);
   string name(sname);
         
@@ -119 +119 @@
           }
         
-  environment->GetBoolValue("VssTree.randomize", randomize);
-  environment->GetBoolValue("VssTree.splitUseOnlyDrivingAxis", mSplitUseOnlyDrivingAxis);
-  environment->GetBoolValue("VssTree.useRss", mUseRss);
-
-  environment->GetBoolValue("VssTree.interleaveDirSplits", mInterleaveDirSplits);
-  environment->GetIntValue("VssTree.dirSplitDepth", mDirSplitDepth);
+  Environment::GetSingleton()->GetBoolValue("VssTree.randomize", randomize);
+  Environment::GetSingleton()->GetBoolValue("VssTree.splitUseOnlyDrivingAxis", mSplitUseOnlyDrivingAxis);
+  Environment::GetSingleton()->GetBoolValue("VssTree.useRss", mUseRss);
+
+  Environment::GetSingleton()->GetBoolValue("VssTree.interleaveDirSplits", mInterleaveDirSplits);
+  Environment::GetSingleton()->GetIntValue("VssTree.dirSplitDepth", mDirSplitDepth);
 
   root = NULL;