Changeset 13569 for branches

Timestamp:

01/26/16 11:23:35 (8 years ago)

Author:

abeham

Message:

#2457: fixed bugs in iterated algorithm, fixed bug in expert system view

Location:

branches/PerformanceComparison

Files:

• HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs (modified) (3 diffs)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs

@@ -710 +710 @@
     private void HandleAlgorithmTargetQualityChanged() {
       IParameter param;
-      if (!Algorithm.Parameters.TryGetValue("TargetQuality", out param)) throw new InvalidOperationException("Cannot find TargetQuality parameter in Algorithm " + Algorithm.Name);
+      if (!Algorithm.Parameters.TryGetValue("TargetQuality", out param)) return;
       var doubleValueParam = (param as IValueParameter<DoubleValue>);
-
+      if (doubleValueParam == null) return;
       if (doubleValueParam.Value == null && TargetQualityParameter.Value != null) {
         doubleValueParam.Value = new DoubleValue(TargetQualityParameter.Value.Value);
@@ -724 +724 @@
     private void HandleAlgorithmMaximumEvaluationsChanged() {
       IParameter param;
-      if (!Algorithm.Parameters.TryGetValue("MaximumEvaluations", out param)) throw new InvalidOperationException("Cannot find MaximumEvaluations parameter in Algorithm " + Algorithm.Name);
+      if (!Algorithm.Parameters.TryGetValue("MaximumEvaluations", out param)) return;
       var intValueParam = (param as IValueParameter<IntValue>);
+      if (intValueParam == null) return;
       var value = intValueParam.Value;
       if (value.Value > MaximumEvaluationsParameter.Value.Value)
@@ -733 +734 @@
     private void SynchronizeMaximumEvaluationsParameter() {
       IParameter param;
-      if (Algorithm.Parameters.TryGetValue("MaximumEvaluations", out param)) {
-        var intValueParam = (param as IValueParameter<IntValue>);
-        if (intValueParam.Value == null) intValueParam.Value = new IntValue(MaximumEvaluationsParameter.Value.Value);
-        else intValueParam.Value.Value = MaximumEvaluationsParameter.Value.Value;
-      }
+      if (!Algorithm.Parameters.TryGetValue("MaximumEvaluations", out param)) return;
+      var intValueParam = (param as IValueParameter<IntValue>);
+      if (intValueParam == null) return;
+      if (intValueParam.Value == null) intValueParam.Value = new IntValue(MaximumEvaluationsParameter.Value.Value);
+      else intValueParam.Value.Value = MaximumEvaluationsParameter.Value.Value;
     }
   }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.cs

@@ -208 +208 @@
 
     private void OkbDownloadButtonOnClick(object sender, EventArgs e) {
-      if (Content.Problem.ProblemId != -1) {
+      if (Content.Problem.ProblemId == -1) {
         MessageBox.Show("Please select a problem instance first.");
         return;