Changeset 10113 for branches

Timestamp:

11/07/13 12:57:40 (11 years ago)

Author:

ascheibe

Message:

#1886 added basic dialog for configuring a RunCollectionModifierTask

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.SolutionCaching.Views/3.3/CreateRunCollectionModifierTasksMenuItem.cs (added)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/HeuristicLab.Analysis.SolutionCaching.Views-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.Designer.cs (added)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/RunCollectionModifierTasksConfigurator.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierTask.cs (modified) (6 diffs)

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

@@ -79 +79 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Hive-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <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">
       <Private>False</Private>
@@ -130 +135 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CreateRunCollectionModifierTasksMenuItem.cs" />
     <Compile Include="PermutationSolutionCacheView.cs">
       <SubType>UserControl</SubType>
@@ -135 +141 @@
     <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">
@@ -166 +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/3.3/RunCollectionModifiers/RunCollectionModifierTask.cs

@@ -30 +30 @@
 using HeuristicLab.Hive;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -35 +36 @@
   [Item("RunCollectionModifierTask", "An item that runs RunCollectionModifiers on RunCollections with Hive support.")]
   [StorableClass]
-  public class RunCollectionModifierTask : NamedItem, ITask {
+  public class RunCollectionModifierTask : ParameterizedNamedItem, ITask {
     public virtual bool IsParallelizable {
       get { return false; }
@@ -71 +72 @@
     }
 
-    [Storable]
-    protected ItemList<IRunCollectionModifier> runCollectionModifiers;
+    public ValueParameter<ItemList<IRunCollectionModifier>> RunCollectionModifiersParameter {
+      get { return (ValueParameter<ItemList<IRunCollectionModifier>>)Parameters["RunCollectionModifiers"]; }
+    }
     public ItemList<IRunCollectionModifier> RunCollectionModifiers {
-      get { return runCollectionModifiers; }
+      get { return RunCollectionModifiersParameter.Value; }
     }
 
@@ -100 +102 @@
     #region Constructors and Cloning
     public RunCollectionModifierTask() {
-      runCollectionModifiers = new ItemList<IRunCollectionModifier>();
+      Parameters.Add(new ValueParameter<ItemList<IRunCollectionModifier>>("RunCollectionModifiers", "List of RunCollectionModifiers that are executed. ", new ItemList<IRunCollectionModifier>()));
       executionStack = new Stack<IRunCollectionModifier>();
+      runCollection = new RunCollection();
       log = new Log();
     }
@@ -110 +113 @@
       executionTime = original.executionTime;
       executionState = original.executionState;
-      runCollectionModifiers = (ItemList<IRunCollectionModifier>)original.RunCollectionModifiers.Clone(cloner);
       runCollection = (RunCollection)original.runCollection.Clone(cloner);
       executionStack = new Stack<IRunCollectionModifier>();
@@ -172 +174 @@
 
     public virtual void AddRunCollectionModifiers(IRunCollectionModifier modifier) {
-      runCollectionModifiers.Add(modifier);
+      RunCollectionModifiers.Add(modifier);
     }