Changeset 12466 for branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

Timestamp:

06/18/15 11:17:50 (9 years ago)

Author:

pfleck

Message:

#2366 Merged trunk to fix compile errors caused by changes of the DefineArithmeticProgressionDialog from r12293.

Location:

branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer

Files:

• . (modified) (1 prop)
• 3.3/CreateExperimentDialog.cs (modified) (3 diffs)

branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -286 +286 @@
       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) {
@@ -298 +298 @@
         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;
         }
       }
@@ -314 +314 @@
           } 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];