Changeset 47


Ignore:
Timestamp:
03/05/08 23:52:30 (13 years ago)
Author:
swagner
Message:

Fixed ticket #49

  • removed operator reset mechanism
Location:
trunk/sources
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Core/EngineBase.cs

    r2 r47  
    103103      myCanceled = false;
    104104      myRunning = false;
    105       OperatorGraph.Reset();
    106105      GlobalScope.Clear();
    107106      ExecutionTime = new TimeSpan();
  • trunk/sources/HeuristicLab.Core/Interfaces/IOperator.cs

    r2 r47  
    6868    IOperation Execute(IScope scope);
    6969    void Abort();
    70     void Reset();
    7170
    7271    event EventHandler NameChanged;
     
    7877    event EventHandler<VariableEventArgs> VariableAdded;
    7978    event EventHandler<VariableEventArgs> VariableRemoved;
    80     event EventHandler Initialized;
    8179    event EventHandler Executed;
    8280  }
  • trunk/sources/HeuristicLab.Core/Interfaces/IOperatorGraph.cs

    r2 r47  
    3333    void RemoveOperator(Guid guid);
    3434    IOperator GetOperator(Guid guid);
    35     void Reset();
    3635    void Clear();
    3736
  • trunk/sources/HeuristicLab.Core/OperatorBase.cs

    r2 r47  
    374374      myCanceled = true;
    375375    }
    376     public virtual void Reset() {
    377       OnInitialized();
    378     }
    379376
    380377    public virtual IOperation Apply(IScope scope) {
     
    423420      if (VariableRemoved != null)
    424421        VariableRemoved(this, new VariableEventArgs(variable));
    425     }
    426     public event EventHandler Initialized;
    427     protected virtual void OnInitialized() {
    428       if (Initialized != null) {
    429         Initialized(this, new EventArgs());
    430       }
    431422    }
    432423    public event EventHandler Executed;
  • trunk/sources/HeuristicLab.Core/OperatorGraph.cs

    r2 r47  
    9494        return null;
    9595    }
    96     public void Reset() {
    97       foreach (IOperator op in Operators)
    98         op.Reset();
    99     }
    10096    public void Clear() {
    10197      Guid[] guids = new Guid[Operators.Count];
  • trunk/sources/HeuristicLab.Operators/CombinedOperator.cs

    r40 r47  
    8686      }
    8787    }
    88     public override void Reset() {
    89       OperatorGraph.Reset();
    90       base.Reset();
    91     }
    9288
    9389    public override IView CreateView() {
Note: See TracChangeset for help on using the changeset viewer.