Changeset 10115

Timestamp:

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

Author:

ascheibe

Message:

#1886 some improvements in the RunCollectionModifierExecutable

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.SolutionCaching.Views/3.3/HeuristicLab.Analysis.SolutionCaching.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.Designer.cs (modified) (4 diffs)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.cs (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierExecutable.cs (modified) (6 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching.Views/3.3/HeuristicLab.Analysis.SolutionCaching.Views-3.3.csproj

@@ -178 +178 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="RunCollectionModifierTasksConfigurator.resx">
-      <DependentUpon>RunCollectionModifierTasksConfigurator.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="SolutionCacheView.resx">
       <DependentUpon>SolutionCacheView.cs</DependentUpon>

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.Designer.cs

@@ -32 +32 @@
       // 
       this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.okButton.Location = new System.Drawing.Point(502, 325);
+      this.okButton.Location = new System.Drawing.Point(707, 437);
       this.okButton.Name = "okButton";
       this.okButton.Size = new System.Drawing.Size(75, 23);
@@ -43 +43 @@
       // 
       this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.cancelButton.Location = new System.Drawing.Point(583, 325);
+      this.cancelButton.Location = new System.Drawing.Point(788, 437);
       this.cancelButton.Name = "cancelButton";
       this.cancelButton.Size = new System.Drawing.Size(75, 23);
@@ -62 +62 @@
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(646, 307);
+      this.viewHost.Size = new System.Drawing.Size(851, 419);
       this.viewHost.TabIndex = 2;
       this.viewHost.ViewsLabelVisible = true;
@@ -71 +71 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(670, 360);
+      this.ClientSize = new System.Drawing.Size(875, 472);
       this.Controls.Add(this.viewHost);
       this.Controls.Add(this.cancelButton);

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.cs

@@ -55 +55 @@
 
     private void RunCollectionModifierTasksConfigurator_Load(object sender, EventArgs e) {
+      runCollectionModifierExecutable.RunCollection.AddRange(Content.Runs);
       viewHost.Content = runCollectionModifierExecutable;
     }
 
     private void CreateTask() {
-      runCollectionModifierExecutable.RunCollection.AddRange(Content.Runs);
+      runCollectionModifierExecutable.Prepare();
       MainFormManager.MainForm.ShowContent(runCollectionModifierExecutable);
     }

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);
         }
       }