Changeset 12740 for stable/HeuristicLab.Optimizer

Timestamp:

07/11/15 19:44:35 (9 years ago)

Author:

abeham

Message:

#2301: merged 12292,12293 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (3 diffs)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Classification_Script.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Regression_Script.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Classification_Script.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Regression_Script.hl (modified) (previous)

stable/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -264 +264 @@
       var parameter = (IValueParameter)generateButton.Tag;
       bool integerOnly = intParameters.ContainsKey(parameter);
-      double min = 0, max = 1, step = 1;
+      decimal min = 0, max = 1, step = 1;
       #region Try to calculate some meaningful values
       if (integerOnly) {
@@ -276 +276 @@
         int len = doubleParameters[parameter].Length;
         if (len > 0) {
-          min = doubleParameters[parameter].Min();
-          max = doubleParameters[parameter].Max();
-          step = len >= 2 ? Math.Abs((doubleParameters[parameter][len - 1] - doubleParameters[parameter][len - 2])) : 1;
+          min = (decimal)doubleParameters[parameter].Min();
+          max = (decimal)doubleParameters[parameter].Max();
+          step = len >= 2 ? Math.Abs(((decimal)doubleParameters[parameter][len - 1] - (decimal)doubleParameters[parameter][len - 2])) : 1m;
         }
       }
@@ -292 +292 @@
           } else {
             doubleParameters[parameter].Reset -= new EventHandler(ValuesArray_Reset);
-            doubleParameters[parameter] = new DoubleArray(values.ToArray());
+            doubleParameters[parameter] = new DoubleArray(values.Select(x => (double)x).ToArray());
             doubleParameters[parameter].Reset += new EventHandler(ValuesArray_Reset);
             stringConvertibleArrayView.Content = doubleParameters[parameter];