Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs (modified) (4 diffs)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

@@ -44 +44 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Classification;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
+using HeuristicLab.Problems.Instances;
 using HeuristicLab.Problems.Instances.DataAnalysis;
 using HeuristicLab.Problems.Instances.TSPLIB;
+using HeuristicLab.Problems.Instances.VehicleRouting;
 using HeuristicLab.Problems.Knapsack;
 using HeuristicLab.Problems.TestFunctions;
@@ -51 +53 @@
 using HeuristicLab.Problems.VehicleRouting;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
-using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Selection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using HeuristicLab.Problems.Instances.VehicleRouting;
-using HeuristicLab.Problems.Instances;
 
 
@@ -133 +132 @@
 
       SolomonFormatInstanceProvider instanceProvider = new SolomonInstanceProvider();
-      IVRPData data = instanceProvider.LoadData("C101.txt", "C101.opt.txt");
+      IVRPData data = instanceProvider.Import("C101.txt", "C101.opt.txt");
       vrpProblem.Load(data);
       vrpProblem.Name = "C101 VRP (imported from Solomon)";
@@ -439 +438 @@
     }
     #endregion
+    #region LawnMower
+    [TestMethod]
+    public void RunGpLawnMowerSampleTest() {
+      var ga = CreateGpLawnMowerSample();
+      ga.SetSeedRandomly.Value = false;
+      RunAlgorithm(ga);
+    }
+
+    public GeneticAlgorithm CreateGpLawnMowerSample() {
+      GeneticAlgorithm ga = new GeneticAlgorithm();
+      #region Problem Configuration
+      var problem = new HeuristicLab.Problems.LawnMower.Problem();
+      #endregion
+      #region Algorithm Configuration
+      ga.Name = "Genetic Programming - Lawn Mower";
+      ga.Description = "A standard genetic programming algorithm to solve the lawn mower problem";
+      ga.Problem = problem;
+      ConfigureGeneticAlgorithmParameters<TournamentSelector, SubtreeCrossover, MultiSymbolicExpressionTreeArchitectureManipulator>(
+        ga, 1000, 1, 50, 0.25, 5);
+      var mutator = (MultiSymbolicExpressionTreeArchitectureManipulator)ga.Mutator;
+      mutator.Operators.SetItemCheckedState(mutator.Operators
+        .OfType<OnePointShaker>()
+        .Single(), false);
+      #endregion
+      return ga;
+    }
+    #endregion
     #endregion
 

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll