Changeset 12414

Timestamp:

06/02/15 16:21:17 (9 years ago)

Author:

pfleck

Message:

#2027 Changed Terminator base class to SingleSuccessorOperator and omit some values while collecting parameter values to reduce the amount of collected values for all terminators.

Location:

branches/TerminationCriteria/HeuristicLab.Termination/3.3

Files:

• MultiTerminator.cs (modified) (2 diffs)
• Terminator.cs (modified) (3 diffs)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -66 +67 @@
       return next;
     }
+
+    public override void CollectParameterValues(IDictionary<string, IItem> values) {
+      foreach (var opParam in OperatorParameters) {
+        var op = opParam.Value;
+        var @checked = Operators.ItemChecked(op);
+        if (!@checked) continue;
+        var children = GetCollectedValues(opParam);
+        foreach (var c in children) {
+          if (String.IsNullOrEmpty(c.Key))
+            values.Add(opParam.Name, new StringValue(opParam.Value.ToString()));
+          else values.Add(opParam.Name + "." + c.Key, c.Value);
+        }
+      }
+    }
   }
 }

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

@@ -32 +32 @@
   [Item("Terminator", "A base class for all termination criteria.")]
   [StorableClass]
-  public abstract class Terminator : InstrumentedOperator, ITerminator {
+  public abstract class Terminator : SingleSuccessorOperator, ITerminator {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.FlagRed; }
@@ -50 +50 @@
     }
 
-    public sealed override IOperation InstrumentedApply() {
+    public sealed override IOperation Apply() {
       if (!TerminateParameter.ActualValue.Value) { // If terminate flag is already set, no need to check further termination criteria.
         bool terminate = !CheckContinueCriterion();
         TerminateParameter.ActualValue = new BoolValue(terminate);
       }
-      return base.InstrumentedApply();
+      return base.Apply();
     }
 
@@ -62 +62 @@
     public override void CollectParameterValues(IDictionary<string, IItem> values) {
       base.CollectParameterValues(values);
-      values["Description"] = new StringValue(ToString());
       values["Type"] = new StringValue(GetType().GetPrettyName(false));
     }