Changeset 8357 for trunk/sources/HeuristicLab.Operators/3.3

Timestamp:

07/30/12 13:36:29 (12 years ago)

Author:

jkarder

Message:

#1906:

• added parameter
• adapted logic

File:

• trunk/sources/HeuristicLab.Operators/3.3/SubScopesCounter.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Operators/3.3/SubScopesCounter.cs

@@ -34 +34 @@
       get { return (ILookupParameter<IntValue>)Parameters["Value"]; }
     }
+    public IValueParameter<BoolValue> AccumulateParameter {
+      get { return (IValueParameter<BoolValue>)Parameters["Accumulate"]; }
+    }
 
     [StorableConstructor]
@@ -42 +45 @@
     public SubScopesCounter() {
       Parameters.Add(new LookupParameter<IntValue>("Value", "The value that should be incremented by the number of direct sub-scopes. It will be created in the current scope if the value is not found."));
+      Parameters.Add(new ValueParameter<BoolValue>("Accumulate", ".", new BoolValue(true)));
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (!Parameters.ContainsKey("Accumulate"))
+        Parameters.Add(new ValueParameter<BoolValue>("Accumulate", ".", new BoolValue(true)));
     }
 
@@ -49 +59 @@
 
     public override IOperation Apply() {
-      int increment = ExecutionContext.Scope.SubScopes.Count;
+      int count = ExecutionContext.Scope.SubScopes.Count;
       if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new IntValue();
-      ValueParameter.ActualValue.Value += increment;
+      if (AccumulateParameter.Value.Value) ValueParameter.ActualValue.Value += count;
+      else ValueParameter.ActualValue.Value = count;
       return base.Apply();
     }