Changeset 12447

Timestamp:

06/15/15 15:47:47 (9 years ago)

Author:

pfleck

Message:

#2027

• Renamed TerminatonParameter to TerminatorParameter.
• Renamed Comparison to ComparisonType.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (3 diffs)
• HeuristicLab.Termination/3.3/ComparisonTerminator.cs (modified) (4 diffs)
• HeuristicLab.Termination/3.3/SingleObjectiveQualityTerminator.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/TerminationOperator.cs (modified) (3 diffs)

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

@@ -114 +114 @@
       get { return (IFixedValueParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
     }
-    private IValueParameter<MultiTerminator> TerminationParameter {
-      get { return (IValueParameter<MultiTerminator>)Parameters["Termination"]; }
+    private IValueParameter<MultiTerminator> TerminatorParameter {
+      get { return (IValueParameter<MultiTerminator>)Parameters["Terminator"]; }
     }
     #endregion
@@ -197 +197 @@
     }
     private MultiTerminator Terminators {
-      get { return TerminationParameter.Value; }
+      get { return TerminatorParameter.Value; }
     }
     private RandomCreator RandomCreator {
@@ -279 +279 @@
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
       Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individual or false if worse children should be used when the maximum selection pressure is exceeded.", new BoolValue(false)) { Hidden = true });
-      Parameters.Add(new ValueParameter<MultiTerminator>("Termination", "The termination criteria which sould be checked.", new MultiTerminator()));
+      Parameters.Add(new ValueParameter<MultiTerminator>("Terminator", "The termination criteria which sould be checked.", new MultiTerminator()));
 
       RandomCreator randomCreator = new RandomCreator();

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

@@ -40 +40 @@
     }
 
-    public ComparisonType Comparison {
+    public ComparisonType ComparisonType {
       get { return ComparisonParameter.Value.Value; }
       set { ComparisonParameter.Value.Value = value; }
@@ -67 +67 @@
       Initialize();
     }
-    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison, T threshold)
+    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparisonType, T threshold)
       : this(threshold) {
       ComparisonValueParameter.ActualName = comparisonValueActualName;
-      Comparison = comparison;
+      ComparisonType = comparisonType;
     }
-    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison, IFixedValueParameter<T> thresholdParameter)
+    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparisonType, IFixedValueParameter<T> thresholdParameter)
       : this() {
       ComparisonValueParameter.ActualName = comparisonValueActualName;
-      Comparison = comparison;
+      ComparisonType = comparisonType;
       ThresholdParameter = thresholdParameter;
     }
@@ -83 +83 @@
       IComparable rhs = ThresholdParameter.Value;
 
-      return Comparison.Compare(lhs, rhs);
+      return ComparisonType.Compare(lhs, rhs);
     }
 
     private void Initialize() {
-      ComparisonParameter.Value.ValueChanged += new EventHandler(Comparison_ValueChanged);
+      ComparisonParameter.Value.ValueChanged += new EventHandler(ComparisonType_ValueChanged);
     }
-    private void Comparison_ValueChanged(object sender, EventArgs e) {
-      OnComparisonChanged();
+    private void ComparisonType_ValueChanged(object sender, EventArgs e) {
+      OnComparisonTypeChanged();
     }
-    protected virtual void OnComparisonChanged() {
+    protected virtual void OnComparisonTypeChanged() {
       OnToStringChanged();
     }
@@ -103 +103 @@
     public override string ToString() {
       if (Threshold == null) return Name;
-      else return string.Format("{0} {1} {2}", Name, Comparison.ToSymbol(), ThresholdParameter.Value);
+      else return string.Format("{0} {1} {2}", Name, ComparisonType.ToSymbol(), ThresholdParameter.Value);
     }
   }

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

@@ -43 +43 @@
       if (maximizationParameter != null) {
         bool maximization = maximizationParameter.Value.Value;
-        Comparison = maximization ? ComparisonType.Less : ComparisonType.Greater;
+        ComparisonType = maximization ? ComparisonType.Less : ComparisonType.Greater;
         Threshold.Value = maximization ? double.MaxValue : double.MinValue;
       }

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

@@ -31 +31 @@
   [StorableClass]
   public sealed class TerminationOperator : InstrumentedOperator, ITerminationBasedOperator {
-    public ILookupParameter<ITerminator> TerminationParameter {
-      get { return (ILookupParameter<ITerminator>)Parameters["Termination"]; }
+    public ILookupParameter<ITerminator> TerminatorParameter {
+      get { return (ILookupParameter<ITerminator>)Parameters["Terminator"]; }
     }
     public ILookupParameter<BoolValue> TerminateParameter {
@@ -64 +64 @@
     public TerminationOperator()
       : base() {
-      Parameters.Add(new LookupParameter<ITerminator>("Termination", "The termination criteria which sould be checked."));
+      Parameters.Add(new LookupParameter<ITerminator>("Terminator", "The termination criteria which sould be checked."));
       Parameters.Add(new LookupParameter<BoolValue>("Terminate", "The parameter which will be set to determine if execution should be terminated or schould continue."));
       Parameters.Add(new OperatorParameter("ContinueBranch", "The operator which is executed if no termination criteria has met."));
@@ -74 +74 @@
 
       var placeholder = new Placeholder() { Name = "Check termination criteria (Placeholder)" };
-      placeholder.OperatorParameter.ActualName = TerminationParameter.Name;
+      placeholder.OperatorParameter.ActualName = TerminatorParameter.Name;
 
       BeforeExecutionOperators.Add(assigner);