Changeset 3770

Timestamp:

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

Author:

swagner

Message:

Implemented reviewers' comments (#893)

• fixed bug in EngineAlgorithm and UserDefinedAlgorithmView

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/EngineAlgorithm.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

@@ -70 +70 @@
       // 
       this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
+      this.openOperatorGraphButton.Click += new System.EventHandler(openOperatorGraphButton_Click);
       // 
       // newOperatorGraphButton
       // 
       this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
+      this.newOperatorGraphButton.Click += new System.EventHandler(newOperatorGraphButton_Click);
       // 
       // tabControl

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);
       }