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

Timestamp:

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

Author:

swagner

Message:

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

File:

• trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs (modified) (7 diffs)

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) {