Changeset 5609 for branches/VNS/HeuristicLab.Operators/3.3/ScopeCleaner.cs

Timestamp:

03/04/11 17:23:40 (13 years ago)

Author:

svonolfe

Message:

Worked on VNS main loop (#1425)

File:

• branches/VNS/HeuristicLab.Operators/3.3/ScopeCleaner.cs (modified) (4 diffs)

branches/VNS/HeuristicLab.Operators/3.3/ScopeCleaner.cs

@@ -24 +24 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Operators {
@@ -38 +39 @@
       get { return CurrentScopeParameter.ActualValue; }
     }
+    public ValueParameter<BoolValue> ClearSubScopesParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["ClearSubScopes"]; }
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      #region Backwards Compatibility
+      if (!Parameters.ContainsKey("ClearSubScopes")) {
+        Parameters.Add(new ValueParameter<BoolValue>("ClearSubScopes", "Indicates, if the subscopes should be cleared.", new BoolValue(false)));
+      }
+      #endregion
+    }
 
     [StorableConstructor]
@@ -47 +60 @@
       : base() {
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose variables and sub-scopes should be removed."));
+      Parameters.Add(new ValueParameter<BoolValue>("ClearSubScopes", "Indicates, if the subscopes should be cleared.", new BoolValue(false)));
     }
 
@@ -55 +69 @@
     public override IOperation Apply() {
       CurrentScope.Variables.Clear();
-      CurrentScope.SubScopes.Clear();
+      if(ClearSubScopesParameter.Value.Value)
+        CurrentScope.SubScopes.Clear();
       return base.Apply();
     }