Changeset 3189 for trunk/sources

Timestamp:

03/23/10 00:07:29 (15 years ago)

Author:

abeham

Message:

Prevent starting of algorithm when problem or vital operators are null #933

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategy.cs (modified) (previous)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs (modified) (1 diff)
• HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs (modified) (1 diff)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs

@@ -153 +153 @@
     }
 
+    protected override void OnPrepared() {
+      base.OnPrepared();
+      if (Engine != null) {
+        if (Problem == null || MoveGenerator == null || MoveMaker == null || MoveEvaluator == null)
+          Engine.Prepare(null);
+      }
+    }
+
     #region Events
     protected override void OnProblemChanged() {

trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs

@@ -181 +181 @@
     }
 
+    protected override void OnPrepared() {
+      base.OnPrepared();
+      if (Engine != null) {
+        if (Problem == null || MoveGenerator == null || MoveMaker == null || MoveEvaluator == null)
+          Engine.Prepare(null);
+      }
+    }
+
     #region Events
     protected override void OnProblemChanged() {

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

@@ -175 +175 @@
     }
 
+    protected override void OnPrepared() {
+      base.OnPrepared();
+      if (Engine != null) {
+        if (Problem == null || MoveGenerator == null || MoveMaker == null || MoveEvaluator == null
+          || TabuMoveEvaluator == null || TabuMoveMaker == null)
+          Engine.Prepare(null);
+      }
+    }
+
     #region Events
     protected override void OnProblemChanged() {