Changeset 2932 for trunk/sources/HeuristicLab.Optimization

Timestamp:

03/05/10 03:07:12 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• replaced Changed in IItem by ToStringChanged

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (6 diffs)
• EngineAlgorithm.cs (modified) (4 diffs)

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

@@ -112 +112 @@
       if (ProblemChanged != null)
         ProblemChanged(this, EventArgs.Empty);
-      OnChanged();
     }
     public event EventHandler ExecutionTimeChanged;
@@ -118 +117 @@
       if (ExecutionTimeChanged != null)
         ExecutionTimeChanged(this, EventArgs.Empty);
-      OnChanged();
     }
     public event EventHandler Prepared;
@@ -124 +122 @@
       if (Prepared != null)
         Prepared(this, EventArgs.Empty);
-      OnChanged();
     }
     public event EventHandler Started;
@@ -130 +127 @@
       if (Started != null)
         Started(this, EventArgs.Empty);
-      OnChanged();
     }
     public event EventHandler Stopped;
@@ -136 +132 @@
       if (Stopped != null)
         Stopped(this, EventArgs.Empty);
-      OnChanged();
     }
     protected virtual void OnCanceledChanged() { }
@@ -147 +142 @@
       problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
       problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
-      problem.Changed -= new ChangedEventHandler(Problem_Changed);
     }
     protected virtual void RegisterProblemEvents() {
       problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
       problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);
-      problem.Changed += new ChangedEventHandler(Problem_Changed);
     }
 
     protected virtual void Problem_SolutionCreatorChanged(object sender, EventArgs e) { }
     protected virtual void Problem_EvaluatorChanged(object sender, EventArgs e) { }
-    private void Problem_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
-    }
     #endregion
   }

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

@@ -195 +195 @@
       if (EngineChanged != null)
         EngineChanged(this, EventArgs.Empty);
-      OnChanged();
     }
 
@@ -202 +201 @@
     }
     private void RegisterEngineEvents() {
-      Engine.Changed += new ChangedEventHandler(Engine_Changed);
       Engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       Engine.ExecutionTimeChanged += new EventHandler(Engine_ExecutionTimeChanged);
@@ -208 +206 @@
     }
     private void DeregisterEngineEvents() {
-      Engine.Changed -= new ChangedEventHandler(Engine_Changed);
       Engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       Engine.ExecutionTimeChanged -= new EventHandler(Engine_ExecutionTimeChanged);
@@ -223 +220 @@
       OnStopped();
     }
-    private void Engine_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
-    }
   }
 }