Changeset 5355 for branches/OKB (trunk integration)

Timestamp:

01/22/11 02:38:40 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

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

Files:

• HeuristicLab.Clients.OKB-3.3.csproj (modified) (1 diff)
• ItemWrapper.cs (added)
• MultiObjectiveOKBProblem.cs (modified) (1 diff)
• NamedItemWrapper.cs (added)
• OKBAlgorithm.cs (modified) (11 diffs)
• OKBRun.cs (added)
• SingleObjectiveOKBProblem.cs (modified) (1 diff)

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

@@ -100 +100 @@
   <ItemGroup>
     <Compile Include="AdministratorMenuItem.cs" />
+    <Compile Include="ItemWrapper.cs" />
+    <Compile Include="NamedItemWrapper.cs" />
+    <Compile Include="OKBRun.cs" />
     <Compile Include="EmptyAlgorithm.cs" />
     <Compile Include="OKBAlgorithm.cs" />

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

@@ -30 +30 @@
   [Creatable("Optimization Knowledge Base (OKB)")]
   [StorableClass]
-  public sealed class MultiObjectiveOKBProblem : OKBProblem, IMultiObjectiveProblem {
+  public sealed class MultiObjectiveOKBProblem : OKBProblem, IMultiObjectiveProblem, IStorableContent {
+    public string Filename { get; set; }
+
     public override Type ProblemType {
       get { return typeof(IMultiObjectiveProblem); }

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

@@ -24 +24 @@
 using System.Drawing;
 using System.IO;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +35 @@
   [Creatable("Optimization Knowledge Base (OKB)")]
   [StorableClass]
-  public sealed class OKBAlgorithm : Item, IAlgorithm {
+  public sealed class OKBAlgorithm : Item, IAlgorithm, IStorableContent {
+    public string Filename { get; set; }
+
     private long algorithmId;
     public long AlgorithmId {
@@ -48 +51 @@
           OnNameChanging(e);
           if (!e.Cancel) {
+            IProblem problem = algorithm.Problem;
             DeregisterAlgorithmEvents();
             algorithm = value;
@@ -57 +61 @@
             OnDescriptionChanged();
             OnAlgorithmChanged();
+            OnStoreAlgorithmInEachRunChanged();
+
+            try {
+              algorithm.Problem = problem;
+            }
+            catch (ArgumentException) {
+              algorithm.Problem = null;
+            }
+            algorithm.Prepare(true);
           }
         }
@@ -104 +117 @@
     }
 
+    private int runsCounter;
+    private RunCollection runs;
     public RunCollection Runs {
-      get { return Algorithm.Runs; }
+      get { return runs; }
     }
     public bool StoreAlgorithmInEachRun {
@@ -124 +139 @@
         algorithm = value;
         RegisterAlgorithmEvents();
+      }
+    }
+    [Storable(Name = "RunsCounter")]
+    private int StorableRunsCounter {
+      get { return runsCounter; }
+      set { runsCounter = value; }
+    }
+    [Storable(Name = "Runs")]
+    private RunCollection StorableRuns {
+      get { return runs; }
+      set {
+        runs = value;
+        RegisterRunsEvents();
       }
     }
@@ -135 +163 @@
       algorithm = cloner.Clone(original.algorithm);
       RegisterAlgorithmEvents();
+      runsCounter = original.runsCounter;
+      runs = cloner.Clone(original.runs);
+      RegisterRunsEvents();
     }
     public OKBAlgorithm()
@@ -141 +172 @@
       algorithm = new EmptyAlgorithm("No algorithm selected. Please choose an algorithm from the OKB.");
       RegisterAlgorithmEvents();
+      runsCounter = 0;
+      runs = new RunCollection();
+      RegisterRunsEvents();
     }
 
@@ -167 +201 @@
 
     public void Prepare() {
-      Algorithm.Prepare();
+      Algorithm.Prepare(true);
     }
     public void Prepare(bool clearRuns) {
-      Algorithm.Prepare(clearRuns);
+      if (clearRuns) runs.Clear();
+      Algorithm.Prepare(true);
     }
     public void Start() {
@@ -240 +275 @@
     public event EventHandler Stopped;
     private void OnStopped() {
+      runsCounter++;
+      runs.Add(new HeuristicLab.Optimization.Run(string.Format("{0} Run {1}", Name, runsCounter), this));
       var handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -328 +365 @@
       OnExceptionOccurred(e.Value);
     }
+
+    private void RegisterRunsEvents() {
+      runs.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Runs_CollectionReset);
+    }
+    private void Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      runsCounter = runs.Count;
+    }
     #endregion
   }

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

@@ -30 +30 @@
   [Creatable("Optimization Knowledge Base (OKB)")]
   [StorableClass]
-  public sealed class SingleObjectiveOKBProblem : OKBProblem, ISingleObjectiveProblem {
+  public sealed class SingleObjectiveOKBProblem : OKBProblem, ISingleObjectiveProblem, IStorableContent {
+    public string Filename { get; set; }
+
     public override Type ProblemType {
       get { return typeof(ISingleObjectiveProblem); }