Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Optimization

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Calculator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Calculator.cs)
• HeuristicLab.Optimization/3.3/Experiment.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/IRunCollectionModifier.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/IRunCollectionModifier.cs)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Result.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/ResultCollection.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/IRunCollectionConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionContentConstraint.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionContentConstraint.cs)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollectionDiscretizer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionDiscretizer.cs)
• HeuristicLab.Optimization/3.3/RunCollectionFormulaModifer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionFormulaModifer.cs)
• HeuristicLab.Optimization/3.3/RunCollectionGroupCreater.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionGroupCreater.cs)
• HeuristicLab.Optimization/3.3/RunCollectionSorter.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionSorter.cs)
• HeuristicLab.Optimization/3.3/RunCollectionValueRemover.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionValueRemover.cs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -41 +41 @@
     public override Image ItemImage {
       get {
-        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
-        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunPrepared;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunStarted;
+        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunPaused;
+        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunStopped;
         else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
       }
@@ -220 +220 @@
         if (clearRuns) runs.Clear();
         Optimizer.Prepare(clearRuns);
+      } else {
+        ExecutionState = ExecutionState.Stopped;
       }
     }

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -41 +41 @@
     public override Image ItemImage {
       get {
-        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
-        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPrepared;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStarted;
+        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPaused;
+        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStopped;
         else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
       }

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -111 +111 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="RunCollectionDiscretizer.cs" />
+    <Compile Include="RunCollectionGroupCreater.cs" />
+    <Compile Include="RunCollectionSorter.cs" />
+    <Compile Include="RunCollectionValueRemover.cs" />
+    <Compile Include="IRunCollectionModifier.cs" />
     <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
     <Compile Include="Algorithms\Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
+    <Compile Include="Calculator.cs" />
     <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
     <Compile Include="Algorithms\HeuristicOptimizationEngineAlgorithm.cs" />
@@ -136 +142 @@
     <Compile Include="Interfaces\ISingleObjectiveHeuristicOptimizationProblem.cs" />
     <Compile Include="Problems\Problem.cs" />
+    <Compile Include="RunCollectionFormulaModifer.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionComparisonConstraint.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionConstraintCollection.cs" />
+    <Compile Include="RunCollectionConstraints\RunCollectionContentConstraint.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionTypeCompatiblityConstraint.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionEqualityConstraint.cs" />
@@ -244 +252 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/Result.cs

@@ -39 +39 @@
         if (value != null) return value.ItemImage;
         else return base.ItemImage;
+      }
+    }
+
+    public override string ItemDescription {
+      get {
+        if (Description != String.Empty) return Description;
+        else return base.ItemDescription;
       }
     }

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/ResultCollection.cs

@@ -40 +40 @@
       return new ResultCollection(this, cloner);
     }
+
+    public override System.Drawing.Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
+    }
   }
 }

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -51 +51 @@
 
       constraints = new RunCollectionConstraintCollection(original.constraints.Select(x => cloner.Clone(x)));
+      modifiers = new CheckedItemList<IRunCollectionModifier>(original.modifiers.Select(cloner.Clone));
       foreach (IRunCollectionConstraint constraint in constraints)
         constraint.ConstrainedValue = this;
@@ -67 +68 @@
       dataTypes = new Dictionary<string, HashSet<Type>>();
       constraints = new RunCollectionConstraintCollection();
+      modifiers = new CheckedItemList<IRunCollectionModifier>();
       RegisterConstraintsEvents();
     }
@@ -83 +85 @@
       get { return constraints; }
     }
+
+    [Storable]
+    private CheckedItemList<IRunCollectionModifier> modifiers;
+    public CheckedItemList<IRunCollectionModifier> Modifiers {
+      get { return modifiers; }
+    }
+
 
     private bool updateOfRunsInProgress;
@@ -98 +107 @@
     private void AfterDeserialization() {
       if (constraints == null) constraints = new RunCollectionConstraintCollection();
+      if (modifiers == null) modifiers = new CheckedItemList<IRunCollectionModifier>();
       RegisterConstraintsEvents();
       RegisterConstraintEvents(constraints);
@@ -393 +403 @@
     }
     #endregion
+
+    #region Modification
+    public void Modify() {
+      UpdateOfRunsInProgress = true;
+      var runs = this.ToList();
+      var selectedRuns = runs.Where(r => r.Visible).ToList();
+      int nSelected = selectedRuns.Count;
+      if (nSelected > 0) {
+        foreach (var modifier in Modifiers.CheckedItems)
+          modifier.Value.Modify(selectedRuns);
+        if (nSelected != selectedRuns.Count || HaveDifferentOrder(selectedRuns, runs.Where(r => r.Visible))) {
+          Clear();
+          AddRange(ReplaceVisibleRuns(runs, selectedRuns));
+        } else if (runs.Count > 0) {
+          OnCollectionReset(this, runs);
+        }
+      }
+      UpdateOfRunsInProgress = false;
+    }
+
+    private static IEnumerable<IRun> ReplaceVisibleRuns(IEnumerable<IRun> runs, IEnumerable<IRun> visibleRuns) {
+      var newRuns = new List<IRun>();
+      var runIt = runs.GetEnumerator();
+      var visibleRunIt = visibleRuns.GetEnumerator();
+      while (runIt.MoveNext()) {
+        if (runIt.Current != null && !runIt.Current.Visible)
+          newRuns.Add(runIt.Current);
+        else if (visibleRunIt.MoveNext())
+          newRuns.Add(visibleRunIt.Current);
+      }
+      while (visibleRunIt.MoveNext())
+        newRuns.Add(visibleRunIt.Current);
+      return newRuns;
+    }
+
+    private static bool HaveDifferentOrder(IEnumerable<IRun> l1, IEnumerable<IRun> l2) {
+      return l1.Zip(l2, (r1, r2) => r1 != r2).Any();
+    }
+    #endregion
   }
 }

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/RunCollectionConstraints/IRunCollectionConstraint.cs

@@ -26 +26 @@
   public interface IRunCollectionConstraint : IConstraint {
     new RunCollection ConstrainedValue { get; set; }
+  }
+
+  public interface IRunCollectionColumnConstraint : IRunCollectionConstraint {
     string ConstraintColumn { get; set; }
     event EventHandler ConstraintColumnChanged;

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

@@ -30 +30 @@
   [StorableClass]
   [Item("RunCollectionComparisonConstraint", "A constraint which compares the members of the contained runs with the constraint data.")]
-  public class RunCollectionComparisonConstraint : ComparisonConstraint, IRunCollectionConstraint {
+  public class RunCollectionComparisonConstraint : ComparisonConstraint, IRunCollectionColumnConstraint {
     [StorableConstructor]
     protected RunCollectionComparisonConstraint(bool deserializing) : base(deserializing) { }

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs

@@ -30 +30 @@
   [StorableClass]
   [Item("RunCollectionEqualityConstraint", "A constraint which checks the members of the contained runs for equality to the constraint data.")]
-  public class RunCollectionEqualityConstraint : EqualityConstraint, IRunCollectionConstraint {
+  public class RunCollectionEqualityConstraint : EqualityConstraint, IRunCollectionColumnConstraint {
     [StorableConstructor]
     protected RunCollectionEqualityConstraint(bool deserializing) : base(deserializing) { }
@@ -100 +100 @@
       foreach (IRun run in ConstrainedValue.Where(r => r.Visible)) {
         IItem item = ConstrainedValue.GetValue(run, constraintColumn);
-        if (!base.Check(item.ToString()))
+        if (item != null && !base.Check(item.ToString()))
           run.Visible = false;
       }

branches/PersistenceSpeedUp/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs

@@ -30 +30 @@
   [StorableClass]
   [Item("RunCollectionTypeCompatibilityConstraint", "A constraint which checks the members of the contained runs for type compabitiliby to the constraint data.")]
-  public class RunCollectionTypeCompatibilityConstraint : TypeCompatibilityConstraint, IRunCollectionConstraint {
+  public class RunCollectionTypeCompatibilityConstraint : TypeCompatibilityConstraint, IRunCollectionColumnConstraint {
     [StorableConstructor]
     protected RunCollectionTypeCompatibilityConstraint(bool deserializing) {

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates