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

Timestamp:

11/07/13 16:30:39 (11 years ago)

Author:

ascheibe

Message:

#1886 added tasks and hive tasks for RunCollectionModifiers

Location:

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

Files:

• HeuristicLab.Analysis.SolutionCaching-3.3.csproj (modified) (5 diffs)
• Plugin.cs.frame (modified) (2 diffs)
• RunCollectionModifiers/RunCollectionModifierExecutable.cs (copied) (copied from branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierTask.cs) (12 diffs)
• RunCollectionModifiers/RunCollectionModifierHiveTask.cs (added)
• RunCollectionModifiers/RunCollectionModifierTask.cs (added)

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

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+    <Reference Include="HeuristicLab.Clients.Hive-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.Hive-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -57 +49 @@
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
     </Reference>
@@ -90 +79 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Optimization.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -107 +90 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -154 +121 @@
     <Compile Include="RealVectorEncoding\RealVectorSolutionCacheCollector.cs" />
     <Compile Include="RealVectorEncoding\RealVectorSolutionInformation.cs" />
+    <Compile Include="RunCollectionModifiers\RunCollectionModifierExecutable.cs" />
+    <Compile Include="RunCollectionModifiers\RunCollectionModifierHiveTask.cs" />
     <Compile Include="RunCollectionModifiers\RunCollectionModifierTask.cs" />
     <Compile Include="SolutionCache.cs" />

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

@@ -26 +26 @@
   [PluginFile("HeuristicLab.Analysis.SolutionCaching-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
+  [PluginDependency("HeuristicLab.Hive", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
-  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
@@ -34 +35 @@
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
-  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Hive;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Analysis.SolutionCaching.RunCollectionModifiers {
-  [Item("RunCollectionModifierTask", "An item that runs RunCollectionModifiers on RunCollections with Hive support.")]
+namespace HeuristicLab.Analysis.SolutionCaching {
+  [Item("RunCollectionModifierExecutable", "An executable that runs RunCollectionModifiers on RunCollections.")]
   [StorableClass]
-  public class RunCollectionModifierTask : ParameterizedNamedItem, ITask {
-    public virtual bool IsParallelizable {
-      get { return false; }
-    }
-
-    public virtual bool ComputeInParallel {
-      get { return false; }
-      set {
-        throw new NotSupportedException("Parallelization is not supported for RunCollectionModifierTasks.");
-      }
-    }
-
+  public class RunCollectionModifierExecutable : ParameterizedNamedItem, IExecutable {
     [Storable]
     protected ExecutionState executionState;
@@ -101 +88 @@
 
     #region Constructors and Cloning
-    public RunCollectionModifierTask() {
+    public RunCollectionModifierExecutable() {
       Parameters.Add(new ValueParameter<ItemList<IRunCollectionModifier>>("RunCollectionModifiers", "List of RunCollectionModifiers that are executed. ", new ItemList<IRunCollectionModifier>()));
       executionStack = new Stack<IRunCollectionModifier>();
@@ -108 +95 @@
     }
     [StorableConstructor]
-    protected RunCollectionModifierTask(bool deserializing) : base(deserializing) { }
-    protected RunCollectionModifierTask(RunCollectionModifierTask original, Cloner cloner)
+    protected RunCollectionModifierExecutable(bool deserializing) : base(deserializing) { }
+    protected RunCollectionModifierExecutable(RunCollectionModifierExecutable original, Cloner cloner)
       : base(original, cloner) {
       executionTime = original.executionTime;
@@ -121 +108 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new RunCollectionModifierTask(this, cloner);
+      return new RunCollectionModifierExecutable(this, cloner);
     }
     #endregion
@@ -134 +121 @@
         executionStack.Push(runCollectionModifier);
       }
-
-      executionState = ExecutionState.Prepared;
     }
 
@@ -151 +136 @@
           }
           catch (AggregateException remaining) {
-            if (remaining.InnerExceptions.Count == 1) OnTaskFailed(remaining.InnerExceptions[0]);
-            else OnTaskFailed(remaining);
+            if (remaining.InnerExceptions.Count == 1) OnExceptionOccuted(remaining.InnerExceptions[0]);
+            else OnExceptionOccuted(remaining);
           }
         }
@@ -158 +143 @@
         cancellationTokenSource = null;
         if (stopPending) executionStack.Clear();
-        if (executionStack.Count == 0) OnTaskStopped();
-        else OnTaskPaused();
+        if (executionStack.Count == 0) OnStopped();
+        else OnPaused();
       });
     }
@@ -166 +151 @@
       if (ExecutionState == ExecutionState.Paused) {
         executionStack.Clear();
-        OnTaskStopped();
+        OnStopped();
       } else {
         stopPending = true;
@@ -179 +164 @@
     protected virtual void RunModifiers(object state) {
       CancellationToken ct = (CancellationToken)state;
-      OnTaskStarted();
+      OnStarted();
 
       IRunCollectionModifier next;
@@ -197 +182 @@
 
     #region Events
-    public event EventHandler TaskStarted;
-    protected virtual void OnTaskStarted() {
+    public event EventHandler Prepared;
+    protected virtual void OnPrepared() {
+      ExecutionState = ExecutionState.Prepared;
+      EventHandler handler = Prepared;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Started;
+    protected virtual void OnStarted() {
       executionState = ExecutionState.Started;
-      EventHandler handler = TaskStarted;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler TaskStopped;
-    protected virtual void OnTaskStopped() {
+      EventHandler handler = Started;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Stopped;
+    protected virtual void OnStopped() {
       executionState = ExecutionState.Stopped;
-      EventHandler handler = TaskStopped;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler TaskPaused;
-    protected virtual void OnTaskPaused() {
+      EventHandler handler = Stopped;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Paused;
+    protected virtual void OnPaused() {
       executionState = ExecutionState.Paused;
-      EventHandler handler = TaskPaused;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler TaskFailed;
-    protected virtual void OnTaskFailed(Exception e) {
+      EventHandler handler = Paused;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
+    protected virtual void OnExceptionOccuted(Exception e) {
       var eventArgs = new EventArgs<Exception>(e);
       Log.LogException(e);
-      EventHandler handler = TaskFailed;
+      EventHandler<EventArgs<Exception>> handler = ExceptionOccurred;
       if (handler != null) handler(this, eventArgs);
     }
-
     public event EventHandler ExecutionTimeChanged;
     protected virtual void OnExecutionTimeChanged() {
@@ -231 +218 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-
     public event EventHandler ExecutionStateChanged;
     protected virtual void OnExecutionStateChanged() {
@@ -237 +223 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-
-    public event EventHandler ComputeInParallelChanged; //not needed
     #endregion
   }