Changeset 6421

Timestamp:

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

Author:

cneumuel

Message:

#1215

• small fixes

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.MetaOptimization.Test/Program.cs (modified) (4 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/AlgorithmExecutor.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/PMOEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Operators/Crossovers/DoubleValue/NormalDoubleValueCrossover.cs (modified) (1 diff)

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);

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/AlgorithmExecutor.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Threading;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.MetaOptimization {
-
   public static class AlgorithmExtensions {
     public static void StartSync(this IAlgorithm algorithm, CancellationToken cancellationToken) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs

@@ -230 +230 @@
       var problem = algorithm.Problem;
 
+      ProblemConfiguration.Parameterize(problem);
       AlgorithmConfiguration.Parameterize(algorithm);
-      ProblemConfiguration.Parameterize(problem);
 
       algorithm.CollectParameterValues(this.Parameters);

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs

@@ -364 +364 @@
     }
 
-    void ValueConfigurations_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
+    private void ValueConfigurations_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
       KeepActualValueConfigurationIndexConsistent();
     }
 
-    void ValueConfigurations_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
+    private void ValueConfigurations_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
       KeepActualValueConfigurationIndexConsistent();
     }
-    void ValueConfigurations_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
+    private void ValueConfigurations_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
       KeepActualValueConfigurationIndexConsistent();
@@ -497 +497 @@
       var clonedValue = this.ActualValue.Value != null ? (IItem)this.ActualValue.Value.Clone() : null;
       if (clonedValue != null) AdaptValidValues(parameter, clonedValue);
-      parameter.ActualValue = clonedValue;
+      parameter.Value = clonedValue;
     }
 

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/PMOEvaluator.cs

@@ -72 +72 @@
       var algorithmRunsAnalyzer = new AlgorithmRunsAnalyzer();
 
+      uniformSubScopesProcessor.Parallel.Value = true;
+      
       this.OperatorGraph.InitialOperator = algorithmSubScopesCreator;
       algorithmSubScopesCreator.Successor = uniformSubScopesProcessor;
@@ -77 +79 @@
       uniformSubScopesProcessor.Successor = algorithmRunsAnalyzer;
       algorithmRunsAnalyzer.Successor = null;
-
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      ///// only for debug reasons - remove later (set this in stored algs)
+      ((UniformSubScopesProcessor)((AlgorithmSubScopesCreator)this.OperatorGraph.InitialOperator).Successor).Parallel.Value = true;
+    }
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Crossovers/DoubleValue/NormalDoubleValueCrossover.cs

@@ -40 +40 @@
       } while (!range.IsInRange(offspring.Value));
 
-      if (offspring.Value < 0)
-        throw new Exception("WTF Exception");
-
       return offspring;
     }