Changeset 10121

Timestamp:

11/11/13 15:51:16 (11 years ago)

Author:

ascheibe

Message:

#1886 improved RunCollectionModifierExecutable and added a new view for it

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.SolutionCaching.Views/3.3/CreateRunCollectionModifierTasksMenuItem.cs (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/HeuristicLab.Analysis.SolutionCaching.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierExecutableView.Designer.cs (added)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierExecutableView.cs (added)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.Designer.cs (deleted)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.cs (deleted)
• HeuristicLab.Analysis.SolutionCaching/3.3/HeuristicLab.Analysis.SolutionCaching-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierExecutable.cs (modified) (9 diffs)
• HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierHiveTask.cs (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierTask.cs (modified) (2 diffs)

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

@@ -45 +45 @@
     public override void Execute() {
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      using (RunCollectionModifierTasksConfigurator configurator = new RunCollectionModifierTasksConfigurator()) {
-        configurator.Content = activeView.Content as IOptimizer;
-        configurator.ShowDialog();
-      }
+      IOptimizer opt = activeView.Content as IOptimizer;
+      RunCollectionModifierExecutable runCollectionModifierExecutable = new RunCollectionModifierExecutable();
+      runCollectionModifierExecutable.RunCollection.AddRange(opt.Runs);
+      MainFormManager.MainForm.ShowContent(runCollectionModifierExecutable);
     }
   }

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

@@ -136 +136 @@
   <ItemGroup>
     <Compile Include="CreateRunCollectionModifierTasksMenuItem.cs" />
+    <Compile Include="RunCollectionModifierExecutableView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionModifierExecutableView.Designer.cs">
+      <DependentUpon>RunCollectionModifierExecutableView.cs</DependentUpon>
+    </Compile>
     <Compile Include="PermutationSolutionCacheView.cs">
       <SubType>UserControl</SubType>
@@ -141 +147 @@
     <Compile Include="RealVectorSolutionCacheView.cs">
       <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RunCollectionModifierTasksConfigurator.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="RunCollectionModifierTasksConfigurator.Designer.cs">
-      <DependentUpon>RunCollectionModifierTasksConfigurator.cs</DependentUpon>
     </Compile>
     <Compile Include="SolutionCacheView.cs">

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

@@ -69 +69 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Hive-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [PluginDependency("HeuristicLab.Hive", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]

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

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -59 +60 @@
     }
 
+    [Storable]
+    protected Stack<IRunCollectionModifier> executionStack;
+    protected Stack<IRunCollectionModifier> ExecutionStack {
+      get { return executionStack; }
+    }
+
+    [Storable]
+    protected ILog log;
+    public ILog Log {
+      get { return log; }
+    }
+
+    protected CancellationTokenSource cancellationTokenSource;
+    protected bool stopPending;
+    public IProgress Progress { get; set; }
+
     public ValueParameter<ItemList<IRunCollectionModifier>> RunCollectionModifiersParameter {
       get { return (ValueParameter<ItemList<IRunCollectionModifier>>)Parameters["RunCollectionModifiers"]; }
@@ -72 +89 @@
       get { return RunCollectionModifiersParameter.Value; }
     }
-
-    [Storable]
-    protected Stack<IRunCollectionModifier> executionStack;
-    protected Stack<IRunCollectionModifier> ExecutionStack {
-      get { return executionStack; }
-    }
-
-    [Storable]
-    protected ILog log;
-    public ILog Log {
-      get { return log; }
-    }
-
-    protected CancellationTokenSource cancellationTokenSource;
-    protected bool stopPending;
 
     #region Constructors and Cloning
@@ -94 +96 @@
       executionStack = new Stack<IRunCollectionModifier>();
       log = new Log();
+      executionState = ExecutionState.Stopped;
     }
     [StorableConstructor]
@@ -112 +115 @@
     #endregion
 
+    protected virtual void ReportProgress(double progress) {
+      if (Progress != null) {
+        Progress.ProgressValue = progress;
+      }
+    }
+
+    protected virtual void FinishProgress() {
+      if (Progress != null) {
+        Progress.Finish();
+      }
+    }
+
     public void Pause() {
       cancellationTokenSource.Cancel();
@@ -121 +136 @@
         executionStack.Push(RunCollectionModifiers[i]);
       }
+      OnPrepared();
     }
 
@@ -140 +156 @@
           }
         }
+        FinishProgress();
         cancellationTokenSource.Dispose();
         cancellationTokenSource = null;
@@ -150 +167 @@
     public void Stop() {
       if (ExecutionState == ExecutionState.Paused) {
-        executionStack.Clear();
         OnStopped();
       } else {
@@ -173 +189 @@
           ct.ThrowIfCancellationRequested();
           next.Modify(runs);
+          if (executionStack.Count > 0) {
+            ReportProgress(((double)RunCollectionModifiers.Count) / executionStack.Count());
+          } else {
+            ReportProgress(1.0);
+          }
         }
         catch (Exception ex) {

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

@@ -97 +97 @@
               var rcmHiveTask = new RunCollectionModifierHiveTask(exec);
               rcmHiveTask.Task.Priority = Task.Priority;
+              rcmHiveTask.ItemTask.IsParallelizable = false;
               childHiveTasks.Add(rcmHiveTask);
             }

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

@@ -35 +35 @@
     }
 
+    [Storable]
+    private bool isParallelizable;
+    public override bool IsParallelizable {
+      get { return isParallelizable; }
+      set { isParallelizable = value; }
+    }
+
     #region Constructors and Cloning
     public RunCollectionModifierTask(RunCollectionModifierExecutable executable)
       : base() {
       Item = executable;
+      isParallelizable = true;
     }
     [StorableConstructor]
@@ -44 +52 @@
     protected RunCollectionModifierTask(RunCollectionModifierTask original, Cloner cloner)
       : base(original, cloner) {
+      isParallelizable = original.isParallelizable;
     }
     public override IDeepCloneable Clone(Cloner cloner) {