Changeset 5902 for branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

Timestamp:

03/31/11 03:24:02 (13 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3

Files:

• . (modified) (1 prop)
• RunCreation/OKBAlgorithm.cs (modified) (13 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3

@@ -3 +3 @@
 *.user
 HeuristicLabClientsOKBPlugin.cs
+*.vs10x

@@ -3 +3 @@
 *.user
 HeuristicLabClientsOKBPlugin.cs
+*.vs10x

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -125 +125 @@
     }
 
-    private int runsCounter;
     private RunCollection runs;
     public RunCollection Runs {
       get { return runs; }
+    }
+    private bool storeRunsAutomatically;
+    public bool StoreRunsAutomatically {
+      get { return storeRunsAutomatically; }
+      set {
+        if (value != storeRunsAutomatically) {
+          storeRunsAutomatically = value;
+          OnStoreRunsAutomaticallyChanged();
+        }
+      }
     }
     public bool StoreAlgorithmInEachRun {
@@ -149 +158 @@
       }
     }
-    [Storable(Name = "RunsCounter")]
-    private int StorableRunsCounter {
-      get { return runsCounter; }
-      set { runsCounter = value; }
-    }
     [Storable(Name = "Runs")]
     private RunCollection StorableRuns {
@@ -161 +165 @@
         RegisterRunsEvents();
       }
+    }
+    [Storable(Name = "StoreRunsAutomatically")]
+    private bool StorableStoreRunsAutomatically {
+      get { return storeRunsAutomatically; }
+      set { storeRunsAutomatically = value; }
     }
     #endregion
@@ -171 +180 @@
       algorithm = cloner.Clone(original.algorithm);
       RegisterAlgorithmEvents();
-      runsCounter = original.runsCounter;
       runs = cloner.Clone(original.runs);
+      storeRunsAutomatically = original.storeRunsAutomatically;
       RegisterRunsEvents();
     }
@@ -180 +189 @@
       algorithm = new EmptyAlgorithm("No algorithm selected. Please choose an algorithm from the OKB.");
       RegisterAlgorithmEvents();
-      runsCounter = 0;
       runs = new RunCollection();
+      storeRunsAutomatically = true;
       RegisterRunsEvents();
     }
@@ -213 +222 @@
 
     public void Prepare() {
-      Algorithm.Prepare(true);
+      Algorithm.Prepare();
     }
     public void Prepare(bool clearRuns) {
       if (clearRuns) runs.Clear();
-      Algorithm.Prepare(true);
+      Algorithm.Prepare(clearRuns);
     }
     public void Start() {
@@ -265 +274 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+    public event EventHandler StoreRunsAutomaticallyChanged;
+    private void OnStoreRunsAutomaticallyChanged() {
+      var handler = StoreRunsAutomaticallyChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler StoreAlgorithmInEachRunChanged;
     private void OnStoreAlgorithmInEachRunChanged() {
@@ -287 +301 @@
     public event EventHandler Stopped;
     private void OnStopped() {
-      runsCounter++;
-      if (Problem is OKBProblem) {
-        OKBProblem problem = (OKBProblem)Problem;
-        OKBRun run = new OKBRun(AlgorithmId, problem.ProblemId, new HeuristicLab.Optimization.Run(string.Format("{0} Run {1}", Name, runsCounter), this));
-        runs.Add(run);
-        run.Store();
-      } else {
-        runs.Add(new HeuristicLab.Optimization.Run(string.Format("{0} Run {1}", Name, runsCounter), this));
-      }
       var handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -315 +320 @@
         Algorithm.ExecutionTimeChanged += new EventHandler(Algorithm_ExecutionTimeChanged);
         Algorithm.ProblemChanged += new EventHandler(Algorithm_ProblemChanged);
+        Algorithm.Runs.ItemsAdded += new CollectionItemsChangedEventHandler<IRun>(Algorithm_Runs_ItemsAdded);
         Algorithm.StoreAlgorithmInEachRunChanged += new EventHandler(Algorithm_StoreAlgorithmInEachRunChanged);
         Algorithm.Prepared += new EventHandler(Algorithm_Prepared);
@@ -333 +339 @@
         Algorithm.ExecutionTimeChanged -= new EventHandler(Algorithm_ExecutionTimeChanged);
         Algorithm.ProblemChanged -= new EventHandler(Algorithm_ProblemChanged);
+        Algorithm.Runs.ItemsAdded -= new CollectionItemsChangedEventHandler<IRun>(Algorithm_Runs_ItemsAdded);
         Algorithm.StoreAlgorithmInEachRunChanged -= new EventHandler(Algorithm_StoreAlgorithmInEachRunChanged);
         Algorithm.Prepared -= new EventHandler(Algorithm_Prepared);
@@ -366 +373 @@
       OnProblemChanged();
     }
+    private void Algorithm_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      OKBProblem problem = Problem as OKBProblem;
+      foreach (IRun run in e.Items) {
+        if (problem != null) {
+          OKBRun okbRun = new OKBRun(AlgorithmId, problem.ProblemId, run);
+          runs.Add(okbRun);
+          if (StoreRunsAutomatically) {
+            try { okbRun.Store(); }
+            catch (Exception) { }
+          }
+        } else {
+          runs.Add(run);
+        }
+      }
+    }
     private void Algorithm_StoreAlgorithmInEachRunChanged(object sender, EventArgs e) {
       OnStoreAlgorithmInEachRunChanged();
@@ -386 +408 @@
 
     private void RegisterRunsEvents() {
+      runs.ItemsRemoved += new CollectionItemsChangedEventHandler<IRun>(runs_ItemsRemoved);
       runs.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Runs_CollectionReset);
     }
+    private void runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      foreach (IRun run in e.Items) {
+        OKBRun okbRun = run as OKBRun;
+        if (okbRun != null)
+          Algorithm.Runs.Remove(okbRun.WrappedRun);
+        else
+          Algorithm.Runs.Remove(run);
+      }
+    }
     private void Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      runsCounter = runs.Count;
+      foreach (IRun run in e.OldItems) {
+        OKBRun okbRun = run as OKBRun;
+        if (okbRun != null)
+          Algorithm.Runs.Remove(okbRun.WrappedRun);
+        else
+          Algorithm.Runs.Remove(run);
+      }
     }
     #endregion

@@ -3 +3 @@
 *.user
 HeuristicLabClientsOKBPlugin.cs
+*.vs10x