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

Timestamp:

05/11/10 15:48:10 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

• fixed bug in EngineAlgorithm and UserDefinedAlgorithmView

File:

• trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs (modified) (1 diff)

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

@@ -159 +159 @@
       globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
 
-      if (engine != null) {
+      if ((engine != null) && (operatorGraph.InitialOperator != null)) {
         ExecutionContext context = null;
-        if (operatorGraph.InitialOperator != null) {
-          if (Problem != null) context = new ExecutionContext(context, Problem, globalScope);
-          context = new ExecutionContext(context, this, globalScope);
-          context = new ExecutionContext(context, operatorGraph.InitialOperator, globalScope);
-        }
+        if (Problem != null) context = new ExecutionContext(context, Problem, globalScope);
+        context = new ExecutionContext(context, this, globalScope);
+        context = new ExecutionContext(context, operatorGraph.InitialOperator, globalScope);
         engine.Prepare(context);
       }