Changeset 2882 for trunk/sources/HeuristicLab.Optimization

Timestamp:

02/27/10 03:35:11 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (2 diffs)
• EngineAlgorithm.cs (modified) (8 diffs)
• HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• Interfaces/IAlgorithm.cs (modified) (2 diffs)
• Interfaces/IMultiObjectiveSelector.cs (added)
• Interfaces/IReducer.cs (added)
• Interfaces/ISelector.cs (added)
• Interfaces/ISingleObjectiveSelector.cs (added)

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

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -55 +56 @@
       }
     }
+
+    public abstract IObservableKeyedCollection<string, IVariable> Results { get; }
 
     public abstract TimeSpan ExecutionTime { get; }

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

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -68 +69 @@
     }
 
+    private ReadOnlyObservableKeyedCollection<string, IVariable> readOnlyResults;
+    public override IObservableKeyedCollection<string, IVariable> Results {
+      get {
+        if (readOnlyResults == null)
+          readOnlyResults = ((VariableCollection)globalScope.Variables["Results"].Value).AsReadOnly();
+        return readOnlyResults;
+      }
+    }
+
     public override TimeSpan ExecutionTime {
       get {
@@ -85 +95 @@
       : base() {
       globalScope = new Scope();
+      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
     }
@@ -90 +101 @@
       : base(name) {
       globalScope = new Scope();
+      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
     }
@@ -95 +107 @@
       : base(name, parameters) {
       globalScope = new Scope();
+      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
     }
@@ -100 +113 @@
       : base(name, description) {
       globalScope = new Scope();
+      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
     }
@@ -105 +119 @@
       : base(name, description, parameters) {
       globalScope = new Scope();
+      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
       OperatorGraph = new OperatorGraph();
     }
@@ -133 +148 @@
     protected override void OnPrepared() {
       globalScope.Clear();
+      globalScope.Variables.Add(new Variable("Results", new VariableCollection()));
+      readOnlyResults = null;
+
       if (engine != null) {
         ExecutionContext context = null;

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

@@ -52 +52 @@
     <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
     <Compile Include="Algorithm.cs" />
+    <Compile Include="Interfaces\IMultiObjectiveSelector.cs" />
+    <Compile Include="Interfaces\ISingleObjectiveSelector.cs" />
+    <Compile Include="Interfaces\IReducer.cs" />
+    <Compile Include="Interfaces\ISelector.cs" />
     <Compile Include="Interfaces\IMultiObjectiveProblem.cs" />
     <Compile Include="Interfaces\IMultiObjectiveEvaluator.cs" />

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

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +32 @@
     Type ProblemType { get; }
     IProblem Problem { get; set; }
+    IObservableKeyedCollection<string, IVariable> Results { get; }
     TimeSpan ExecutionTime { get; }
     bool Running { get; }