Changeset 6421 for branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test/Program.cs

Timestamp:

06/16/11 00:13:30 (13 years ago)

Author:

cneumuel

Message:

#1215

• small fixes

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test/Program.cs (modified) (4 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test/Program.cs

@@ -24 +24 @@
 using HeuristicLab.Problems.MetaOptimization;
 using HeuristicLab.Problems.TestFunctions;
+using HeuristicLab.Problems.TravelingSalesman;
 using HeuristicLab.Random;
 using HeuristicLab.Selection;
@@ -48 +49 @@
     //private static double mutationProbability = 0.10;
 
-    private static int metaAlgorithmPopulationSize = 4;
+    private static int metaAlgorithmPopulationSize = 30;
     private static int metaAlgorithmMaxGenerations = 10;
     private static double metaAlgorithmMutationProbability = 0.10;
     private static int metaProblemRepetitions = 3;
     private static int baseAlgorithmMaxGenerations = 20;
-    private static int baseAlgorithmPopulationSize = 10;
+    private static int baseAlgorithmPopulationSize = 100;
 
     public override void Run() {
@@ -781 +782 @@
       metaOptimizationProblem.AlgorithmType.Value = baseLevelAlgorithmType;
 
-      metaOptimizationProblem.ProblemType.Value = typeof(SingleObjectiveTestFunctionProblem);
+      //metaOptimizationProblem.ProblemType.Value = typeof(SingleObjectiveTestFunctionProblem);
       //metaOptimizationProblem.Problems.Clear();
       //metaOptimizationProblem.Problems.Add(new HeuristicLab.Problems.TestFunctions.SingleObjectiveTestFunctionProblem() {
@@ -803 +804 @@
       //metaOptimizationProblem.Maximization.Value = true;
 
+      // tsp
+      metaOptimizationProblem.ProblemType.Value = typeof(TravelingSalesmanProblem);
+
       ParameterConfigurationTree algorithmVc = metaOptimizationProblem.ParameterConfigurationTree;
       ((IntValue)algorithmVc.AlgorithmConfiguration.ParameterConfigurations.Single(x => x.Name == "MaximumGenerations").ActualValue.Value).Value = baseAlgorithmMaxGenerations;
       ((IntValue)algorithmVc.AlgorithmConfiguration.ParameterConfigurations.Single(x => x.Name == "PopulationSize").ActualValue.Value).Value = baseAlgorithmPopulationSize;
 
-      //ConfigurePopulationSize(algorithmVc, 10, 100, 1);
+      ConfigurePopulationSize(algorithmVc, 10, 100, 1);
       ConfigureMutationRate(algorithmVc, 0.0, 1.0, 0.01);
       ConfigureMutationOperator(algorithmVc);
-      //ConfigureElites(algorithmVc, 0, 10, 1);
-      //ConfigureSelectionOperator(algorithmVc, true);
+      ConfigureElites(algorithmVc, 0, 10, 1);
+      ConfigureSelectionOperator(algorithmVc, true);
 
       //ConfigureSymbolicExpressionGrammar(algorithmVc);