Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3770 for trunk


Ignore:
Timestamp:
05/11/10 15:48:10 (14 years ago)
Author:
swagner
Message:

Implemented reviewers' comments (#893)

  • fixed bug in EngineAlgorithm and UserDefinedAlgorithmView
Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

    r3764 r3770  
    7070      //
    7171      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
     72      this.openOperatorGraphButton.Click += new System.EventHandler(openOperatorGraphButton_Click);
    7273      //
    7374      // newOperatorGraphButton
    7475      //
    7576      this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
     77      this.newOperatorGraphButton.Click += new System.EventHandler(newOperatorGraphButton_Click);
    7678      //
    7779      // tabControl
  • trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs

    r3551 r3770  
    159159      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
    160160
    161       if (engine != null) {
     161      if ((engine != null) && (operatorGraph.InitialOperator != null)) {
    162162        ExecutionContext context = null;
    163         if (operatorGraph.InitialOperator != null) {
    164           if (Problem != null) context = new ExecutionContext(context, Problem, globalScope);
    165           context = new ExecutionContext(context, this, globalScope);
    166           context = new ExecutionContext(context, operatorGraph.InitialOperator, globalScope);
    167         }
     163        if (Problem != null) context = new ExecutionContext(context, Problem, globalScope);
     164        context = new ExecutionContext(context, this, globalScope);
     165        context = new ExecutionContext(context, operatorGraph.InitialOperator, globalScope);
    168166        engine.Prepare(context);
    169167      }
Note: See TracChangeset for help on using the changeset viewer.