Changeset 5951 for trunk

Timestamp:

04/05/11 10:00:04 (14 years ago)

Author:

abeham

Message:

#1462

• Fixed wiring code, some intermediate algorithm classes were missing the base call so that several events did not get registered

Location:

trunk/sources

Files:

• HeuristicLab.Optimization/3.3/HeuristicOptimizationAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/HeuristicOptimizationEngineAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (2 diffs)

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

@@ -51 +51 @@
       Problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
       Problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
+      base.DeregisterProblemEvents();
     }
     protected override void RegisterProblemEvents() {
+      base.RegisterProblemEvents();
       Problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
       Problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);

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

@@ -51 +51 @@
       Problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
       Problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
+      base.DeregisterProblemEvents();
     }
     protected override void RegisterProblemEvents() {
+      base.RegisterProblemEvents();
       Problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
       Problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -240 +240 @@
         ProblemSize.Value = Evaluator.MaximumProblemSize;
       BestKnownQuality = new DoubleValue(Evaluator.BestKnownQuality);
+      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       Evaluator_QualityParameter_ActualNameChanged(null, EventArgs.Empty);
       OnEvaluatorChanged();
@@ -406 +407 @@
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.BoundsParameter.ActualName = BoundsParameter.Name;
-        op.ProblemSizeParameter.ActualName = ProblemSizeParameter.Name; 
+        op.ProblemSizeParameter.ActualName = ProblemSizeParameter.Name;
       }
       foreach (IRealVectorParticleUpdater op in Operators.OfType<IRealVectorParticleUpdater>()) {
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-        op.BoundsParameter.ActualName = BoundsParameter.Name; 
+        op.BoundsParameter.ActualName = BoundsParameter.Name;
       }
       foreach (IRealVectorSwarmUpdater op in Operators.OfType<IRealVectorSwarmUpdater>()) {
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-        op.MaximizationParameter.ActualName = MaximizationParameter.Name; 
+        op.MaximizationParameter.ActualName = MaximizationParameter.Name;
       }
     }