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

Timestamp:

03/28/10 04:11:23 (15 years ago)

Author:

swagner

Message:

Implemented first version of algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (5 diffs)
• BatchRun.cs (added)
• EngineAlgorithm.cs (modified) (7 diffs)
• HeuristicLab.Optimization-3.3.csproj (modified) (3 diffs)
• Interfaces/IAlgorithm.cs (modified) (2 diffs)
• Interfaces/IResult.cs (added)
• Result.cs (added)
• ResultCollection.cs (added)
• ResultCollectionList.cs (added)

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

@@ -66 +66 @@
     }
 
-    public abstract IObservableKeyedCollection<string, IVariable> Results { get; }
+    public abstract ResultCollection Results { get; }
 
     public abstract TimeSpan ExecutionTime { get; }
@@ -73 +73 @@
     public bool Running {
       get { return running; }
+      protected set {
+        if (running != value) {
+          running = value;
+          OnRunningChanged();
+        }
+      }
     }
 
@@ -98 +104 @@
       clone.Problem = (IProblem)cloner.Clone(problem);
       clone.running = running;
-      clone.Canceled = canceled;
+      clone.canceled = canceled;
       return clone;
     }
 
     public void Prepare() {
-      running = false;
-      Canceled = false;
       OnPrepared();
     }
     public void Start() {
-      running = true;
+      Running = true;
       Canceled = false;
       OnStarted();
@@ -127 +131 @@
         ExecutionTimeChanged(this, EventArgs.Empty);
     }
+    public event EventHandler RunningChanged;
+    protected virtual void OnRunningChanged() {
+      if (RunningChanged != null)
+        RunningChanged(this, EventArgs.Empty);
+    }
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
@@ -141 +150 @@
       if (Stopped != null)
         Stopped(this, EventArgs.Empty);
+      Canceled = false;
+      Running = false;
     }
     protected virtual void OnCanceledChanged() { }

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

@@ -88 +88 @@
     }
 
-    private ReadOnlyObservableKeyedCollection<string, IVariable> readOnlyResults;
-    public override IObservableKeyedCollection<string, IVariable> Results {
+    public override ResultCollection Results {
       get {
-        if (readOnlyResults == null)
-          readOnlyResults = ((VariableCollection)globalScope.Variables["Results"].Value).AsReadOnly();
-        return readOnlyResults;
+        return (ResultCollection)globalScope.Variables["Results"].Value;
       }
     }
@@ -114 +111 @@
       : base() {
       globalScope = new Scope("Global Scope");
-      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
+      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
       OperatorGraph = new OperatorGraph();
       InitializeEngine();
@@ -121 +118 @@
       : base(name) {
       globalScope = new Scope("Global Scope");
-      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
+      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
       OperatorGraph = new OperatorGraph();
       InitializeEngine();
@@ -128 +125 @@
       : base(name, parameters) {
       globalScope = new Scope("Global Scope");
-      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
+      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
       OperatorGraph = new OperatorGraph();
       InitializeEngine();
@@ -135 +132 @@
       : base(name, description) {
       globalScope = new Scope("Global Scope");
-      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
+      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
       OperatorGraph = new OperatorGraph();
       InitializeEngine();
@@ -142 +139 @@
       : base(name, description, parameters) {
       globalScope = new Scope("Global Scope");
-      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
+      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
       OperatorGraph = new OperatorGraph();
       InitializeEngine();
@@ -181 +178 @@
     protected override void OnPrepared() {
       globalScope.Clear();
-      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
-      readOnlyResults = null;
+      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
 
       if (engine != null) {

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -86 +86 @@
     <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
     <Compile Include="Algorithm.cs" />
+    <Compile Include="BatchRun.cs" />
+    <Compile Include="ResultCollectionList.cs" />
     <Compile Include="Interfaces\IMultiObjectiveSolutionsVisualizer.cs" />
+    <Compile Include="Interfaces\IResult.cs" />
     <Compile Include="Interfaces\ISingleObjectiveSolutionsVisualizer.cs" />
     <Compile Include="Interfaces\ISolutionsVisualizer.cs" />
@@ -114 +117 @@
     <Compile Include="Interfaces\ITabuMoveEvaluator.cs" />
     <Compile Include="Interfaces\ITabuMoveMaker.cs" />
+    <Compile Include="Result.cs" />
     <Compile Include="TabuMoveMaker.cs" />
     <Compile Include="UserDefinedAlgorithm.cs" />
@@ -119 +123 @@
     <Compile Include="HeuristicLabOptimizationPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ResultCollection.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IAlgorithm.cs

@@ -32 +32 @@
     Type ProblemType { get; }
     IProblem Problem { get; set; }
-    IObservableKeyedCollection<string, IVariable> Results { get; }
+    ResultCollection Results { get; }
     TimeSpan ExecutionTime { get; }
     bool Running { get; }
@@ -43 +43 @@
     event EventHandler ProblemChanged;
     event EventHandler ExecutionTimeChanged;
+    event EventHandler RunningChanged;
     event EventHandler Prepared;
     event EventHandler Started;