Changeset 10115 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching

Timestamp:

11/08/13 10:10:07 (11 years ago)

Author:

ascheibe

Message:

#1886 some improvements in the RunCollectionModifierExecutable

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierExecutable.cs (modified) (6 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierExecutable.cs

@@ -62 +62 @@
       get { return (ValueParameter<ItemList<IRunCollectionModifier>>)Parameters["RunCollectionModifiers"]; }
     }
+    public RunCollection RunCollection {
+      get { return RunCollectionParameter.Value; }
+      protected set { RunCollectionParameter.Value = value; }
+    }
+    public ValueParameter<RunCollection> RunCollectionParameter {
+      get { return (ValueParameter<RunCollection>)Parameters["RunCollection"]; }
+    }
     public ItemList<IRunCollectionModifier> RunCollectionModifiers {
       get { return RunCollectionModifiersParameter.Value; }
-    }
-
-    [Storable]
-    protected RunCollection runCollection;
-    public RunCollection RunCollection {
-      get { return runCollection; }
     }
 
@@ -90 +91 @@
     public RunCollectionModifierExecutable() {
       Parameters.Add(new ValueParameter<ItemList<IRunCollectionModifier>>("RunCollectionModifiers", "List of RunCollectionModifiers that are executed. ", new ItemList<IRunCollectionModifier>()));
+      Parameters.Add(new ValueParameter<RunCollection>("RunCollection", "RunCollection on which the modifiers are applied. ", new RunCollection()));
       executionStack = new Stack<IRunCollectionModifier>();
-      runCollection = new RunCollection();
       log = new Log();
     }
@@ -100 +101 @@
       executionTime = original.executionTime;
       executionState = original.executionState;
-      runCollection = (RunCollection)original.runCollection.Clone(cloner);
       executionStack = new Stack<IRunCollectionModifier>();
       foreach (var runCollectionModifier in original.executionStack) {
@@ -165 +165 @@
       CancellationToken ct = (CancellationToken)state;
       OnStarted();
+      var runs = RunCollection.ToList();
 
       IRunCollectionModifier next;
@@ -171 +172 @@
         try {
           ct.ThrowIfCancellationRequested();
-          next.Modify(runCollection.ToList());
+          next.Modify(runs);
         }
         catch (Exception ex) {
@@ -177 +178 @@
           if (ex is OperationCanceledException) throw ex;
           else throw new Exception("IRunCollectionModifier " + next + "threw an exception.", ex);
+        }
+        finally {
+          RunCollection = new RunCollection(runs);
         }
       }