Changeset 472 for trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

Timestamp:

12/19/05 18:57:00 (18 years ago)

Author:

mattausch

Message:

added priority queue to vspbsptree

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -139 +139 @@
     return;
 
-  numParams = strlen(optParams) + 1;
+  numParams = (int)strlen(optParams) + 1;
   optionalParams = new char[numParams];
   strcpy(optionalParams, optParams);
@@ -390 +390 @@
   if (options[i].value != NULL) {
     // option was explicitly specified
-    value = strtod(options[i].value, NULL);
+    value = (Real)strtod(options[i].value, NULL);
   } else {
     // option was not read, so use the default
-    value = strtod(options[i].defaultValue, NULL);
+    value = (Real)strtod(options[i].defaultValue, NULL);
   }
   return true;
@@ -1315 +1315 @@
                  "100");
 
-  RegisterOption("BspTree.Termination.AxisAligned.maxCostRatio",
+  RegisterOption("BspTree.Termination.maxCostRatio",
                  optFloat,
                  "-bsp_term_axis_aligned_max_cost_ratio=",
@@ -1512 +1512 @@
                 "false");
 
+        RegisterOption("VspKdTree.Termination.maxCostRatio",
+                optFloat,
+                "-vsp_kd_term_max_cost_ratio=",
+                "1.5");
+
+        RegisterOption("VspKdTree.Termination.missTolerance",
+                 optInt,
+                 "-vsp_kd_term_miss_tolerance=",
+                 "4");
 
         /************************************************************************************/
@@ -1663 +1672 @@
                         "1.5");
 
+        RegisterOption("VspBspTree.Termination.maxCostRatio",
+                optFloat,
+                "-vsp_bsp_term_max_cost_ratio=",
+                "1.5");
+
+        RegisterOption("VspBspTree.Termination.missTolerance",
+                 optInt,
+                 "-vsp_bsp_term_miss_tolerance=",
+                 "4");
 
         RegisterOption("VspBspTree.Termination.AxisAligned.ct_div_ci",