Changeset 6693 for trunk/sources/HeuristicLab.Optimization/3.3

Timestamp:

09/01/11 15:51:30 (13 years ago)

Author:

epitzer

Message:

Integrate functionality of RunCollectionModificationEvaluator directly into RunCollection and its view. (#1622)

This update includes a modified RunCollectionModificationEvaluator that automatic migrates all modifies into the RunCollection.

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• RunCollection.cs (modified) (5 diffs)
• RunCollectionModificationEvaluator.cs (modified) (2 diffs)

trunk/sources/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
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionModificationEvaluator.cs

@@ -48 +48 @@
     #endregion
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (RunCollection != null && RunCollection.Modifiers != null) {
+        RunCollection.Modifiers.AddRange(Modifiers);
+        foreach (var modifier in RunCollection.Modifiers) {
+          RunCollection.Modifiers.SetItemCheckedState(modifier, Modifiers.ItemChecked(modifier));
+        }
+        Modifiers.Clear();
+      }
+    }
+
     public void Evaluate() {
       RunCollection.UpdateOfRunsInProgress = true;
-      var runs = RunCollection.Select((r, i) => new {Run = r, r.Visible, Index = i}).ToList();
+      var runs = RunCollection.Select((r, i) => new { Run = r, r.Visible, Index = i }).ToList();
       var visibleRuns = runs.Where(r => r.Visible).Select(r => r.Run).ToList();
       int n = visibleRuns.Count;
@@ -73 +84 @@
         RunCollection.AddRange(newRuns);
       } else if (runs.Count > 0) { // force update
-        var run = (IRun) runs[0].Run.Clone();
+        var run = (IRun)runs[0].Run.Clone();
         RunCollection.Add(run);
         RunCollection.Remove(run);