Changeset 3265 for trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Timestamp:

04/05/10 03:17:25 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• GeneticAlgorithm.cs (modified) (1 diff)
• Tests/GA_TSP.hl (added)
• Tests/GeneticAlgorithm.hl (deleted)
• Tests/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.Tests.csproj (modified) (1 diff)
• Tests/UnitTest.cs (modified) (1 diff)

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

@@ -180 +180 @@
 
     public override void Prepare() {
-      base.Prepare();
-      if (Engine != null) {
-        if (Problem == null) Engine.Prepare(null);
-      }
+      if (Problem != null) base.Prepare();
     }
 

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Tests/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.Tests.csproj

@@ -156 +156 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="GeneticAlgorithm.hl">
+    <None Include="GA_TSP.hl">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Tests/UnitTest.cs

@@ -80 +80 @@
 
     [TestMethod]
-    [DeploymentItem(@"GeneticAlgorithm.hl")]
+    [DeploymentItem(@"GA_TSP.hl")]
     public void GeneticAlgorithmPerformanceTest() {
       ex = null;
-      IAlgorithm ga = (IAlgorithm)XmlParser.Deserialize("GeneticAlgorithm.hl");
+      IAlgorithm ga = (IAlgorithm)XmlParser.Deserialize("GA_TSP.hl");
       ga.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(ga_ExceptionOccurred);
       ga.Stopped += new EventHandler(ga_Stopped);