Changeset 12364

Timestamp:

04/29/15 16:34:33 (9 years ago)

Author:

pfleck

Message:

#2027 Changed a few things to better show single value criteria.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs (modified) (4 diffs)
• HeuristicLab.Termination/3.3/Views/ComparisonTerminationCriterionView.cs (modified) (1 diff)

branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

@@ -351 +351 @@
       UpdateAnalyzers();
 
-      maximumGenerationsTerminationCriterion = new ComparisonTerminationCriterion<IntValue>("Generations", "MaximumGenerations", ComparisonType.GreaterOrEqual) { Name = "Maximum Generations" };
+      maximumGenerationsTerminationCriterion = new ComparisonTerminationCriterion<IntValue>("Generations", new IntValue(50), ComparisonType.GreaterOrEqual) { Name = "Maximum Generations" };
       maximumEvaluatedSolutionsTerminationCriterion = new ComparisonTerminationCriterion<IntValue>("EvaluatedSolutions", "MaximumEvaluatedSolutions", ComparisonType.GreaterOrEqual) { Name = "Maximum Evaluations" };
       maximumSelectionPressureTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>("SelectionPressure", "MaximumSelectionPressure", ComparisonType.GreaterOrEqual) { Name = "Maximum Selection Pressure" };

branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs

@@ -48 +48 @@
     [StorableConstructor]
     protected ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
     protected ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
       : base(original, cloner) {
+      Initialize();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -59 +64 @@
       Parameters.Add(new ValueLookupParameter<T>("RightSide", "The right side of the comparison."));
       Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.GreaterOrEqual)) { Hidden = true });
+
+      Initialize();
     }
     public ComparisonTerminationCriterion(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)
@@ -71 +78 @@
       RightSideParameter.Value = rightSideValue;
       Comparison.Value = comparison;
+    }
+
+    private void Initialize() {
+      RightSideParameter.ToStringChanged += (s, a) => OnToStringChanged();
     }
 
@@ -95 +106 @@
       }
     }
+
+    public override string ToString() {
+      if (RightSideParameter.Value == null) return Name;
+      else return Name + ": " + RightSideParameter.Value;
+    }
   }
 }

branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ComparisonTerminationCriterionView.cs

@@ -44 +44 @@
       viewHost.Content = null;
       if (Content != null) {
-        viewHost.Content = Content.RightSideParameter;
+        if (Content.RightSideParameter.Value != null)
+          viewHost.Content = Content.RightSideParameter.Value;
+        else
+          viewHost.Content = Content.RightSideParameter;
       }
     }