Changeset 14336 for branches/HeuristicLab.GoalSeekingProblem

Timestamp:

10/17/16 11:04:19 (8 years ago)

Author:

bburlacu

Message:

#2679: Do not update inputs/goals in constructor. Fix bug in InputParameterView.cs, fix bug in Configure method (use all variables not just the AllowedInputVariables).

Location:

branches/HeuristicLab.GoalSeekingProblem

Files:

• HeuristicLab.GoalSeekingProblem.Views/3.4/InputParameterView.cs (modified) (3 diffs)
• HeuristicLab.GoalSeekingProblem/3.4/GoalSeekingUtil.cs (modified) (2 diffs)
• HeuristicLab.GoalSeekingProblem/3.4/MultiObjectiveGoalSeekingProblem.cs (modified) (1 diff)
• HeuristicLab.GoalSeekingProblem/3.4/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.GoalSeekingProblem/3.4/SingleObjectiveGoalSeekingProblem.cs (modified) (1 diff)

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem.Views/3.4/InputParameterView.cs

@@ -92 +92 @@
     private void maxTextBox_TextChanged(object sender, EventArgs e) {
       double max;
-      if (double.TryParse(minTextBox.Text, out max))
+      if (double.TryParse(maxTextBox.Text, out max))
         Content.Max = max;
     }
@@ -98 +98 @@
     private void stepTextBox_TextChanged(object sender, EventArgs e) {
       double step;
-      if (double.TryParse(minTextBox.Text, out step))
+      if (double.TryParse(stepTextBox.Text, out step))
         Content.Step = step;
     }
@@ -104 +104 @@
     private void valueTextBox_TextChanged(object sender, EventArgs e) {
       double value;
-      if (double.TryParse(minTextBox.Text, out value))
+      if (double.TryParse(valueTextBox.Text, out value))
         Content.Value = value;
     }

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/GoalSeekingUtil.cs

@@ -90 +90 @@
       var goalMap = goals.ToDictionary(x => x.Name, x => x);
 
-      foreach (var variable in problemData.AllowedInputVariables) {
+      foreach (var variable in problemData.Dataset.DoubleVariables) {
         if (inputMap.ContainsKey(variable)) {
           var values = problemData.Dataset.GetReadOnlyDoubleValues(variable);
@@ -101 +101 @@
           }
           input.Min = min;
-          input.Min = max;
+          input.Max = max;
         } else if (goalMap.ContainsKey(variable)) {
           var values = problemData.Dataset.GetReadOnlyDoubleValues(variable);

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/MultiObjectiveGoalSeekingProblem.cs

@@ -161 +161 @@
       SolutionCreatorParameter.Hidden = true;
       MaximizationParameter.Hidden = true;
-      GoalSeekingUtil.UpdateInputs(InputsParameter.Value, Models, InputParameterChanged);
-      Encoding = GoalSeekingUtil.CreateEncoding(ActiveInputs);
-      dataset = new ModifiableDataset(Inputs.Select(x => x.Name), Inputs.Select(x => new List<double> { x.Value }));
-      GoalSeekingUtil.UpdateTargets(GoalsParameter.Value, Models, GoalParameterChanged);
       RegisterEvents();
     }

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.11.14325")]
+[assembly: AssemblyFileVersion("3.3.11.14334")]

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/SingleObjectiveGoalSeekingProblem.cs

@@ -143 +143 @@
       EvaluatorParameter.Hidden = true;
       SolutionCreatorParameter.Hidden = true;
-      GoalSeekingUtil.UpdateInputs(InputsParameter.Value, Models, InputParameterChanged);
-      Encoding = GoalSeekingUtil.CreateEncoding(ActiveInputs);
-      dataset = new ModifiableDataset(Inputs.Select(x => x.Name), Inputs.Select(x => new List<double> { x.Value }));
-      GoalSeekingUtil.UpdateTargets(GoalsParameter.Value, Models, GoalParameterChanged);
       RegisterEvents();
     }