Changeset 5653

Timestamp:

03/10/11 10:44:42 (14 years ago)

Author:

cneumuel

Message:

#1215

• evaluation operator returns operatorgraph which creates a scope and an operation for each algorithm execution (each repetition and problem)
• split ValueConfiguration into ParameterizedValueConfiguration and RangeValueConfiguration

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.MetaOptimization.Test (modified) (1 prop)
• HeuristicLab.MetaOptimization.Test/Program.cs (modified) (21 diffs)
• HeuristicLab.MetaOptimization.sln (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization.Views/3.3 (modified) (1 prop)
• HeuristicLab.Problems.MetaOptimization.Views/3.3/OptimizableView.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemList.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3 (modified) (1 prop)
• HeuristicLab.Problems.MetaOptimization/3.3/AlgorithmExecutor.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Analyzers/ReferenceQualityAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Crossovers/ParameterConfigurationCrossover.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Manipulators/ParameterConfigurationManipulator.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterCombinationsEnumerator.cs (modified) (4 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (11 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/NullValueConfiguration.cs (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ParameterizedValueConfiguration.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/RangeValueConfiguration.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ValueConfiguration.cs (modified) (8 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/AlgorithmEvaluator.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/AlgorithmExecutor.cs (deleted)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/AlgorithmRunsAnalyzer.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/AlgorithmSubScopesCreator.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/PMOEvaluator.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/ParameterConfigurationEvaluator.cs (deleted)
• HeuristicLab.Problems.MetaOptimization/3.3/HeuristicLab.Problems.MetaOptimization-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IOptimizable.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IValueConfiguration.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Operators/Crossovers/MultiIntValueCrossover.cs (added)

branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test

@@ -2 +2 @@
 obj
 HeuristicLab.MetaOptimization.Test.csproj.user
+*.vs10x

@@ -2 +2 @@
 obj
 HeuristicLab.MetaOptimization.Test.csproj.user
+*.vs10x

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

@@ -2 +2 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Algorithms.EvolutionStrategy;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
@@ -11 +14 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Hive.ExperimentManager;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.PluginInfrastructure.Manager;
 using HeuristicLab.Problems.MetaOptimization;
 using HeuristicLab.Problems.TestFunctions;
 using HeuristicLab.Random;
 using HeuristicLab.Selection;
-using HeuristicLab.Parameters;
-using HeuristicLab.Operators;
-using System.Diagnostics;
-using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Hive.ExperimentManager;
-using System.Threading.Tasks;
-using HeuristicLab.PluginInfrastructure.Manager;
-using System.Reflection;
 
 namespace HeuristicLab.MetaOptimization.Test {
@@ -70 +68 @@
       //TestEnumeratorCollectionEnumerator();
       //TestCombinations4(); return;
-      //TestAlgorithmPerformanceIssue();
+      //TestAlgorithmPerformanceIssue(); return;
       //TestWaitAny();
       //TestExecutionTimeUpdateInvervalPerformance();
@@ -76 +74 @@
       //TestNormalCrossover();
       //TestItemDictionary();
-
-
-
+      
       MetaOptimizationProblem metaOptimizationProblem = new MetaOptimizationProblem();
       metaOptimizationProblem.Repetitions = new IntValue(metaProblemRepetitions);
@@ -87 +83 @@
       //EvolutionStrategy metaLevelAlgorithm = GetMetaES(metaOptimizationProblem);
 
-      IValueConfiguration algorithmVc = SetupGAAlgorithm(typeof(GeneticAlgorithm), metaOptimizationProblem);
+      var algorithmVc = SetupGAAlgorithm(typeof(GeneticAlgorithm), metaOptimizationProblem);
 
       //TestToString(algorithmVc);
@@ -94 +90 @@
       //Console.WriteLine("Press enter to start");
       //Console.ReadLine();
-      //TestConfiguration(algorithmVc, baseLevelAlgorithm);
+      //TestConfiguration(algorithmVc, new GeneticAlgorithm());
 
       //Console.WriteLine("Press enter to start");
@@ -140 +136 @@
       vc1.ParameterConfigurations.Single(x => x.Name == "Selector").Optimize = true;
 
-      var vc2 = (IValueConfiguration)vc1.Clone();
+      var vc2 = (ParameterConfigurationTree)vc1.Clone();
       Console.WriteLine("Assert(1): {0}", vc1.CalculateSimilarity(vc2));
 
@@ -289 +285 @@
           swx.Start();
           ((EngineAlgorithm)alg).ExecutionTimeChanged += new EventHandler(Program_ExecutionTimeChanged);
-          var executor = new AlgorithmExecutor((EngineAlgorithm)alg);
-          executor.StartSync();
+          ((EngineAlgorithm)alg).StartSync();
           ((EngineAlgorithm)alg).ExecutionTimeChanged -= new EventHandler(Program_ExecutionTimeChanged);
           swx.Stop();
@@ -369 +364 @@
       Queue<TimeSpan> latestExecutionTimes = new Queue<TimeSpan>();
       int size = 10;
+      var random = new Random.MersenneTwister(0);
 
       GeneticAlgorithm ga = new GeneticAlgorithm();
@@ -374 +370 @@
       ga.MaximumGenerations.Value = 1;
       ga.Engine = new SequentialEngine.SequentialEngine();
-      throw new NotImplementedException("TODO: Set ga parameters correctly");
+      ga.Problem = new SingleObjectiveTestFunctionProblem();
 
       MetaOptimizationProblem metaOptimizationProblem = new MetaOptimizationProblem();
-      metaOptimizationProblem.Repetitions = new IntValue(metaProblemRepetitions);
+      //metaOptimizationProblem.Repetitions = new IntValue(metaProblemRepetitions);
       GeneticAlgorithm metaLevelAlgorithm = GetMetaGA(metaOptimizationProblem);
       ParameterConfigurationTree algorithmVc = SetupGAAlgorithm(typeof(GeneticAlgorithm), metaOptimizationProblem);
+      algorithmVc.Randomize(random);
       Stopwatch sw = new Stopwatch();
 
+      var algs = new Queue<IAlgorithm>(); // keep them in memory 
+      // -> BINGO! -> .NET cannot hold more than 16 algorithms with their ThreadLocal<T> objects efficiently, 
+      // so if they are kept in memory, runtime at the 17. execution drops significantly
+      // because creating ThreadLocal<T> takes all the runtime.
+      // when the algs are not stored in a list however this effect does not occur.
+      
+
       for (int i = 0; i < 1000; i++) {
-        sw.Start();
         GeneticAlgorithm clonedGa = (GeneticAlgorithm)ga.Clone();
         clonedGa.Name = "CLONED GA";
-        algorithmVc.Parameterize(clonedGa);
+        //algorithmVc.Randomize(random);
+        //algorithmVc.Parameterize(clonedGa);
         clonedGa.Prepare(true);
-        var executor = new AlgorithmExecutor(clonedGa);
-        executor.StartSync();
+        sw.Start();
+        algs.Enqueue(clonedGa);
+
+        if (algs.Count > 24)
+          algs.Dequeue();
+        clonedGa.StartSync();
         sw.Stop();
         latestExecutionTimes.Enqueue(sw.Elapsed);
@@ -549 +557 @@
     private static void TestTypeDiscovery() {
       PluginLoader.pluginAssemblies.Any();
-
+      
       var items = ApplicationManager.Manager.GetInstances(typeof(DoubleArray)).ToArray();
 
@@ -634 +642 @@
       ((IntValue)algorithmVc.ParameterConfigurations.Single(x => x.Name == "MaximumGenerations").ActualValue.Value).Value = baseAlgorithmMaxGenerations;
 
+      metaOptimizationProblem.Problems.Clear();
       metaOptimizationProblem.Problems.Add(new HeuristicLab.Problems.TestFunctions.SingleObjectiveTestFunctionProblem() {
         Evaluator = new GriewankEvaluator(),
         ProblemSize = new IntValue(2)
       });
-      metaOptimizationProblem.Problems.Add(new HeuristicLab.Problems.TestFunctions.SingleObjectiveTestFunctionProblem() {
-        Evaluator = new GriewankEvaluator(),
-        ProblemSize = new IntValue(20)
-      });
-      metaOptimizationProblem.Problems.Add(new HeuristicLab.Problems.TestFunctions.SingleObjectiveTestFunctionProblem() {
-        Evaluator = new GriewankEvaluator(),
-        ProblemSize = new IntValue(500)
-      });
-
-      ConfigurePopulationSize(algorithmVc, 5, 20, 1);
-      ConfigureMutationRate(algorithmVc, 0.0, 1.0, 0.01);
+      //metaOptimizationProblem.Problems.Add(new HeuristicLab.Problems.TestFunctions.SingleObjectiveTestFunctionProblem() {
+      //  Evaluator = new GriewankEvaluator(),
+      //  ProblemSize = new IntValue(20)
+      //});
+      //metaOptimizationProblem.Problems.Add(new HeuristicLab.Problems.TestFunctions.SingleObjectiveTestFunctionProblem() {
+      //  Evaluator = new GriewankEvaluator(),
+      //  ProblemSize = new IntValue(500)
+      //});
+
+      //ConfigurePopulationSize(algorithmVc, 15, 20, 1);
+      //ConfigureMutationRate(algorithmVc, 0.0, 1.0, 0.01);
       ConfigureMutationOperator(algorithmVc);
-      //ConfigureElites(algorithmVc, 0, 30, 1);
-      ConfigureSelectionOperator(algorithmVc, true);
+      //ConfigureElites(algorithmVc, 0, 8, 1);
+      //ConfigureSelectionOperator(algorithmVc, true);
       return algorithmVc;
     }
 
-    private static void TestConfiguration(IValueConfiguration algorithmVc, GeneticAlgorithm baseLevelAlgorithm) {
+    private static void TestConfiguration(ParameterConfigurationTree algorithmVc, GeneticAlgorithm baseLevelAlgorithm) {
       IRandom rand = new FastRandom(0);
       // set random values
       for (int i = 0; i < 10; i++) {
-        IValueConfiguration clonedVc = (IValueConfiguration)algorithmVc.Clone();
+        var clonedVc = (ParameterConfigurationTree)algorithmVc.Clone();
         GeneticAlgorithm newAlg = (GeneticAlgorithm)baseLevelAlgorithm.Clone();
         clonedVc.Randomize(rand);
@@ -676 +685 @@
       // mutate
       for (int i = 0; i < 10; i++) {
-        IValueConfiguration clonedVc = (IValueConfiguration)algorithmVc.Clone();
+        var clonedVc = (ParameterConfigurationTree)algorithmVc.Clone();
         GeneticAlgorithm newAlg = (GeneticAlgorithm)baseLevelAlgorithm.Clone();
         ParameterConfigurationManipulator.Apply(rand, clonedVc, new UniformIntValueManipulator(), new NormalDoubleValueManipulator());
@@ -692 +701 @@
       // cross
       for (int i = 0; i < 10; i++) {
-        IValueConfiguration clonedVc1 = (IValueConfiguration)algorithmVc.Clone();
-        IValueConfiguration clonedVc2 = (IValueConfiguration)algorithmVc.Clone();
+        var clonedVc1 = (ParameterConfigurationTree)algorithmVc.Clone();
+        var clonedVc2 = (ParameterConfigurationTree)algorithmVc.Clone();
 
         GeneticAlgorithm first = (GeneticAlgorithm)baseLevelAlgorithm.Clone();
@@ -725 +734 @@
     }
 
-    private static void ConfigureMutationOperator(IValueConfiguration algorithmVc) {
+    private static void ConfigureMutationOperator(ParameterConfigurationTree algorithmVc) {
       var mutationOperator = algorithmVc.ParameterConfigurations.Where(x => x.Name == "Mutator").SingleOrDefault();
       mutationOperator.Optimize = true;
@@ -735 +744 @@
       }
 
-      // add another normal
-      mutationOperator.ValueConfigurations.Add(new ValueConfiguration(new NormalAllPositionsManipulator(), typeof(NormalAllPositionsManipulator)), true);
-    }
-
-    private static void ConfigureSelectionOperator(IValueConfiguration algorithmVc, bool configureTournamenSize) {
+      // add another normal - don't do this with 'new', because ActualNames will not be set correctly. It should be copied from an existing one
+      // mutationOperator.ValueConfigurations.Add(new ParameterizedValueConfiguration(new NormalAllPositionsManipulator(), typeof(NormalAllPositionsManipulator)), true);
+    }
+
+    private static void ConfigureSelectionOperator(ParameterConfigurationTree algorithmVc, bool configureTournamenSize) {
       var selectionOperatorPc = algorithmVc.ParameterConfigurations.Where(x => x.Name == "Selector").SingleOrDefault();
       selectionOperatorPc.Optimize = true;
@@ -748 +757 @@
           if (configureTournamenSize) {
             vc.Optimize = true;
-            ConfigureTournamentGroupSize(vc);
+            ConfigureTournamentGroupSize((ParameterizedValueConfiguration)vc);
           }
         } else if (vc.ActualValue.ValueDataType == typeof(RandomSelector)) {
@@ -758 +767 @@
     }
 
-    private static void ConfigureTournamentGroupSize(IValueConfiguration tournamentVc) {
+    private static void ConfigureTournamentGroupSize(ParameterizedValueConfiguration tournamentVc) {
       var groupSizePc = tournamentVc.ParameterConfigurations.Where(x => x.ParameterName == "GroupSize").SingleOrDefault();
       groupSizePc.Optimize = true;
-
-      groupSizePc.ValueConfigurations.First().Optimize = true;
-      groupSizePc.ValueConfigurations.First().RangeConstraint.LowerBound = new IntValue(0);
-      groupSizePc.ValueConfigurations.First().RangeConstraint.UpperBound = new IntValue(10);
-      groupSizePc.ValueConfigurations.First().RangeConstraint.StepSize = new IntValue(1);
-    }
-
-    private static void ConfigurePopulationSize(IValueConfiguration algorithmVc, int lower, int upper, int stepsize) {
+      var groupSizeVc = (RangeValueConfiguration)groupSizePc.ValueConfigurations.First();
+      groupSizeVc.Optimize = true;
+      groupSizeVc.RangeConstraint.LowerBound = new IntValue(0);
+      groupSizeVc.RangeConstraint.UpperBound = new IntValue(10);
+      groupSizeVc.RangeConstraint.StepSize = new IntValue(1);
+    }
+
+    private static void ConfigurePopulationSize(ParameterizedValueConfiguration algorithmVc, int lower, int upper, int stepsize) {
       var populationSizePc = algorithmVc.ParameterConfigurations.Where(x => x.Name == "PopulationSize").SingleOrDefault();
       populationSizePc.Optimize = true;
-      var populationSizeVc = populationSizePc.ValueConfigurations.First();
+      var populationSizeVc = (RangeValueConfiguration)populationSizePc.ValueConfigurations.First();
       populationSizeVc.Optimize = true;
       populationSizeVc.RangeConstraint.LowerBound = new IntValue(lower);
@@ -778 +787 @@
     }
 
-    private static void ConfigureMutationRate(IValueConfiguration algorithmVc, double lower, double upper, double stepsize) {
+    private static void ConfigureMutationRate(ParameterizedValueConfiguration algorithmVc, double lower, double upper, double stepsize) {
       var mutationRatePc = algorithmVc.ParameterConfigurations.Where(x => x.Name == "MutationProbability").SingleOrDefault();
       mutationRatePc.Optimize = true;
-      var mutationRateVc = mutationRatePc.ValueConfigurations.First();
+      var mutationRateVc = (RangeValueConfiguration)mutationRatePc.ValueConfigurations.First();
       mutationRateVc.Optimize = true;
       mutationRateVc.RangeConstraint.LowerBound = new PercentValue(lower);
@@ -788 +797 @@
     }
 
-    private static void ConfigureElites(IValueConfiguration algorithmVc, int from, int to, int stepSize) {
+    private static void ConfigureElites(ParameterizedValueConfiguration algorithmVc, int from, int to, int stepSize) {
       var elitesPc = algorithmVc.ParameterConfigurations.Where(x => x.Name == "Elites").SingleOrDefault();
       elitesPc.Optimize = true;
-      var elitesVc = elitesPc.ValueConfigurations.First();
+      var elitesVc = (RangeValueConfiguration)elitesPc.ValueConfigurations.First();
       elitesVc.Optimize = true;
       elitesVc.RangeConstraint.LowerBound = new IntValue(from);
@@ -855 +864 @@
                 var orderedRuns = rc.OrderBy(x => x.Results["AverageQualityNormalized"]);
 
-                TableBuilder tb = new TableBuilder("QNorm", "Qualities", "PoSi", "MutRa", /*"Eli",*/ "SelOp", "MutOp", "NrSelSubScopes");
+                TableBuilder tb = new TableBuilder("QNorm", "Qualities"/*, "PoSi"/* "MutRa", "Eli", "SelOp", "MutOp", "NrSelSubScopes"*/);
                 foreach (IRun run in orderedRuns) {
-                  string selector;
-                  if (run.Parameters["Selector"] is TournamentSelector) {
-                    selector = string.Format("{0} ({1})", run.Parameters["Selector"].ToString(), ((TournamentSelector)run.Parameters["Selector"]).GroupSizeParameter.Value.ToString());
-                  } else {
-                    selector = string.Format("{0}", run.Parameters["Selector"].ToString());
-                  }
+                  //string selector;
+                  //if (run.Parameters["Selector"] is TournamentSelector) {
+                  //  selector = string.Format("{0} ({1})", run.Parameters["Selector"].ToString(), ((TournamentSelector)run.Parameters["Selector"]).GroupSizeParameter.Value.ToString());
+                  //} else {
+                  //  selector = string.Format("{0}", run.Parameters["Selector"].ToString());
+                  //}
 
                   tb.AppendRow(
                     ((DoubleValue)run.Results["AverageQualityNormalized"]).Value.ToString("#0.0000"),
-                    ((DoubleArray)run.Results["RunsAverageQualities"]).ToString(),
-                    ((IntValue)run.Parameters["PopulationSize"]).Value.ToString(),
-                    ((DoubleValue)run.Parameters["MutationProbability"]).Value.ToString("0.0000"),
+                    ((DoubleArray)run.Results["RunsAverageQualities"]).ToString()
+                    //((IntValue)run.Parameters["PopulationSize"]).Value.ToString(),
+                    //((DoubleValue)run.Parameters["MutationProbability"]).Value.ToString("0.0000"),
                     //((IntValue)run.Parameters["Elites"]).Value.ToString(),
-                    Shorten(selector, 20),
-                    Shorten(run.Parameters.ContainsKey("Mutator") ? run.Parameters["Mutator"].ToString() : "null", 40),
-                    ((ISelector)run.Parameters["Selector"]).NumberOfSelectedSubScopesParameter.Value.ToString());
+                    //Shorten(selector, 20),
+                    //Shorten(run.Parameters.ContainsKey("Mutator") ? run.Parameters["Mutator"].ToString() : "null", 40),
+                    //((ISelector)run.Parameters["Selector"]).NumberOfSelectedSubScopesParameter.Value.ToString()
+                    );
                 }
                 sb.AppendLine(tb.ToString());

branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.sln

@@ -10 +10 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F96C8DD1-9B68-4F2D-AD4F-1A174F596041}"
   ProjectSection(SolutionItems) = preProject
-    Performance1.psess = Performance1.psess
     PreBuildEvent.cmd = PreBuildEvent.cmd
   EndProjectSection

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3

@@ -3 +3 @@
 HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj.user
 HeuristicLabProblemsMetaOptimizationViewsPlugin.cs
+*.vs10x

@@ -3 +3 @@
 HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj.user
 HeuristicLabProblemsMetaOptimizationViewsPlugin.cs
+*.vs10x

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/OptimizableView.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using HeuristicLab.Core.Views;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.Parameters;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MetaOptimization.Views.ValueConfigurationViews {
@@ -47 +39 @@
         if (Content.Optimize) {
           this.viewHost.ViewType = null;
-          if (Content is IParameterConfiguration) {
+
+          var pc = Content as IParameterConfiguration;
+          var vc = Content as IValueConfiguration;
+
+          if (pc != null) {
             this.viewHost.Content = ((IParameterConfiguration)Content).ValueConfigurations;
-          } else if (Content is IValueConfiguration) {
-            if (Content.ActualValue.ValueDataType == typeof(IntValue) ||
+          } else if(vc != null) {
+            var rvc = Content as RangeValueConfiguration;
+            if (rvc != null) {
+              if (Content.ActualValue.ValueDataType == typeof(IntValue) ||
                 Content.ActualValue.ValueDataType == typeof(DoubleValue) ||
                 Content.ActualValue.ValueDataType == typeof(PercentValue)) {
-              this.viewHost.ViewsLabelVisible = true;
-              this.viewHost.Content = ((IValueConfiguration)Content).RangeConstraint;
-            } else if(Content.ActualValue.ValueDataType == typeof(BoolValue)) {
-              this.viewHost.Content = null; // no configuration required
-            } else {
+                this.viewHost.ViewsLabelVisible = true;
+                this.viewHost.Content = rvc.RangeConstraint;
+              } else if (Content.ActualValue.ValueDataType == typeof(BoolValue)) {
+                this.viewHost.Content = null; // no configuration required
+              }
+            }
+
+            var pvc = Content as ParameterizedValueConfiguration;
+            if (pvc != null) {
               this.viewHost.ViewsLabelVisible = false;
-              this.viewHost.Content = ((IValueConfiguration)Content).ParameterConfigurations;
+              this.viewHost.Content = pvc.ParameterConfigurations;
             }
           } else {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemList.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
+using System.Windows.Forms;
+using HeuristicLab.Collections;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.Core;
-using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Collections;
 
 namespace HeuristicLab.Problems.MetaOptimization.Views {
@@ -76 +71 @@
           if (value is NullValue) {
             return new NullValueConfiguration();
+          } else if(value is IParameterizedItem) {
+            return new ParameterizedValueConfiguration(value, value.GetType());
           } else {
-            return new ValueConfiguration(value, value.GetType());
-          }
+            return new RangeValueConfiguration(value, value.GetType());
+          } 
         }
         catch (Exception ex) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Analyzers/ReferenceQualityAnalyzer.cs

@@ -68 +68 @@
       DoubleArray referenceQualities = new DoubleArray(ProblemsParameter.ActualValue.Count);
       for (int pi = 0; pi < ProblemsParameter.ActualValue.Count; pi++) {
-        referenceQualities[pi] = solutions.Select(x => x.AverageQualities[pi]).Min(); // todo: respect minimization / maximization
+        referenceQualities[pi] = solutions.Where(x => x.AverageQualities != null).Select(x => x.AverageQualities[pi]).Min(); // todo: respect minimization / maximization
       }
       return referenceQualities;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Crossovers/ParameterConfigurationCrossover.cs

@@ -97 +97 @@
 
     private static void Cross(IRandom random, IOptimizable configuartion, IOptimizable other, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) {
-      var vc = configuartion as IValueConfiguration;
+      var vc = configuartion as RangeValueConfiguration;
       var pc = configuartion as IParameterConfiguration;
       if (vc != null) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Manipulators/ParameterConfigurationManipulator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
-using HeuristicLab.Core;
 using HeuristicLab.Parameters;
-using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -55 +52 @@
 
     protected static void Mutate(IRandom random, IOptimizable configuration, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
-      var vc = configuration as IValueConfiguration;
+      var vc = configuration as RangeValueConfiguration;
       var pc = configuration as IParameterConfiguration;
 

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

@@ -1 +1 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
 using HeuristicLab.Core;
 
@@ -25 +23 @@
         if (!initialized)
           throw new SystemException("Enumeration not started. Call MoveNext!");
-        return Current; 
+        return Current;
       }
     }
@@ -94 +92 @@
       }
 
-      var vc = node as IValueConfiguration;
-      if (vc != null) {
-        if (vc.RangeConstraint != null) {
-          valueEnumerator = new EnumeratorCollectionEnumerator<IItem>();
-          valueEnumerator.AddEnumerator(vc.RangeConstraint.GetCombinations().GetEnumerator());
-          valueEnumerator.Reset();
-          enumerators.Add(valueEnumerator);
-        } else {
-          foreach (var parameterConfiguration in vc.ParameterConfigurations) {
-            if (parameterConfiguration.Optimize) {
-              var enumerator = new ParameterCombinationsEnumerator(parameterConfiguration);
-              enumerator.Reset();
-              enumerators.Add(enumerator);
-            }
+      var rangeVc = node as RangeValueConfiguration;
+      if (rangeVc != null) {
+        valueEnumerator = new EnumeratorCollectionEnumerator<IItem>();
+        valueEnumerator.AddEnumerator(rangeVc.RangeConstraint.GetCombinations().GetEnumerator());
+        valueEnumerator.Reset();
+        enumerators.Add(valueEnumerator);
+      }
+
+      var parameterizedVc = node as ParameterizedValueConfiguration;
+      if (parameterizedVc != null) {
+        foreach (var parameterConfiguration in parameterizedVc.ParameterConfigurations) {
+          if (parameterConfiguration.Optimize) {
+            var enumerator = new ParameterCombinationsEnumerator(parameterConfiguration);
+            enumerator.Reset();
+            enumerators.Add(enumerator);
           }
-          enumerators.Reverse(); // this makes the list of combinations better readable
         }
+        enumerators.Reverse(); // this makes the list of combinations better readable
       }
     }
@@ -129 +128 @@
     }
 
-    public void Dispose() {  }
+    public void Dispose() { }
 
     public T Current {

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

@@ -1 +1 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Common;
+using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Optimization;
-using HeuristicLab.Data;
-using System.Collections;
 
 namespace HeuristicLab.Problems.MetaOptimization {
   // todo: storable, name, descr, ...
   [StorableClass]
-  public class ParameterConfigurationTree : ValueConfiguration, IEnumerable {
+  public class ParameterConfigurationTree : ParameterizedValueConfiguration, IEnumerable {
 
     [Storable]
@@ -189 +187 @@
     public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions) {
       Experiment experiment = new Experiment();
-      foreach (IValueConfiguration combination in this) {
+      foreach (ParameterizedValueConfiguration combination in this) {
         IAlgorithm clonedAlg = (IAlgorithm)algorithm.Clone();
         clonedAlg.Name = combination.ParameterInfoString;

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

@@ -2 +2 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using System.Text;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -9 +12 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using System.Text;
-using System.Reflection;
-using HeuristicLab.Optimization;
-using HeuristicLab.Collections;
-using System.Drawing;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -147 +145 @@
       this.ActualValue = new ConstrainedValue(
         valueParameter.Value != null ? valueParameter.Value : null, // don't clone here; otherwise settings of a non-optimized ValueParameter will not be synchronized with the ConstrainedValue
-        valueParameter.DataType, 
-        this.validValues != null ? new ItemSet<IItem>(this.validValues) : CreateValidValues(), 
+        valueParameter.DataType,
+        this.validValues != null ? new ItemSet<IItem>(this.validValues) : CreateValidValues(),
         this.IsNullable);
       if (Optimize) {
@@ -200 +198 @@
       if (this.ActualValue != null) this.ActualValue.ToStringChanged -= new EventHandler(ActualValue_ToStringChanged);
     }
-    
+
     private void PopulateValueConfigurations() {
       foreach (Type t in this.validTypes) {
@@ -212 +210 @@
             val = CreateItem(t);
           }
-          this.ValueConfigurations.Add(new ValueConfiguration(val, val.GetType()), true);
+          if (val is IParameterizedItem) {
+            this.ValueConfigurations.Add(new ParameterizedValueConfiguration(val, val.GetType()), true);
+          } else {
+            this.ValueConfigurations.Add(new RangeValueConfiguration(val, val.GetType()), true);
+          }
         }
       }
@@ -224 +226 @@
       // return only one type for ValueTypeValues<> (Int, Double, Percent, Bool). Otherwise 2 types would be returned for DoubleValue (PercentValue which is derived)
       if (IsSubclassOfRawGeneric(typeof(ValueTypeValue<>), parameter.DataType))
-        return new List<Type> { parameter.DataType }; 
-      
+        return new List<Type> { parameter.DataType };
+
       if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
         // use existing validvalues if known
@@ -252 +254 @@
       if (type == typeof(NullValue))
         return new NullValue();
-      
+
       // copy value from ValidValues; this ensures that previously set ActualNames for a type are kept
       IItem value = this.validValues.Where(v => v.GetType() == type).SingleOrDefault();
-      if (value != null) 
+      if (value != null)
         return value;
 
@@ -404 +406 @@
       if (Optimize) {
         if (this.ActualValue.Value is IParameterizedItem) {
-          this.ValueConfigurations[actualValueConfigurationIndex].Parameterize((IParameterizedItem)this.ActualValue.Value);
+          ((ParameterizedValueConfiguration)this.ValueConfigurations[actualValueConfigurationIndex]).Parameterize((IParameterizedItem)this.ActualValue.Value);
         }
       }
       var clonedValue = this.ActualValue.Value != null ? (IItem)this.ActualValue.Value.Clone() : null;
-      AdaptValidValues(parameter, clonedValue);
+      if(clonedValue != null) AdaptValidValues(parameter, clonedValue);
       parameter.Value = clonedValue;
     }
@@ -433 +435 @@
         foreach (var vc in this.ValueConfigurations) {
           if (this.ValueConfigurations.ItemChecked(vc)) {
-            vc.Randomize(random);
+            if (vc.Optimize) vc.Randomize(random);
           }
         }
@@ -447 +449 @@
         foreach (var vc in this.ValueConfigurations) {
           if (this.ValueConfigurations.ItemChecked(vc)) {
-            vc.Mutate(random, mutate, intValueManipulator, doubleValueManipulator);
+            if (vc.Optimize) vc.Mutate(random, mutate, intValueManipulator, doubleValueManipulator);
           }
         }
@@ -459 +461 @@
         for (int i = 0; i < this.ValueConfigurations.Count; i++) {
           if (this.ValueConfigurations.ItemChecked(this.ValueConfigurations[i])) {
-            this.ValueConfigurations[i].Cross(random, otherPc.ValueConfigurations[i], cross, intValueCrossover, doubleValueCrossover);
+            if (this.ValueConfigurations[i].Optimize) this.ValueConfigurations[i].Cross(random, otherPc.ValueConfigurations[i], cross, intValueCrossover, doubleValueCrossover);
           }
         }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/NullValueConfiguration.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -12 +9 @@
 
     public NullValueConfiguration() {
-      this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
       this.ActualValue = new ConstrainedValue(null, null, null, true);
       this.IsOptimizable = false;
@@ -28 +24 @@
       return "null";
     }
+
+    public override void Randomize(IRandom random) { }
+
+    public override void Mutate(IRandom random, MutateDelegate mutate, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) { }
+
+    public override void Cross(IRandom random, IOptimizable other, CrossDelegate cross, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) { }
+
+    public override double CalculateSimilarity(IOptimizable optimizable) {
+      return 1.0;
+    }
+
+    public override string ParameterInfoString {
+      get { return "null"; }
+    }
+
+    public override void CollectOptimizedParameterNames(List<string> parameterNames, string prefix) { }
+
+    public override List<IOptimizable> GetAllOptimizables() {
+      return new List<IOptimizable>();
+    }
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ValueConfiguration.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
-using System.Drawing;
-using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.PluginInfrastructure;
-using System.Collections.Generic;
-using System.Text;
 
 namespace HeuristicLab.Problems.MetaOptimization {
   // TODO: ItemName/Descr, storability
   [StorableClass]
-  public class ValueConfiguration : NamedItem, IValueConfiguration {
+  public abstract class ValueConfiguration : NamedItem, IValueConfiguration {
     public override bool CanChangeName {
       get { return true; }
@@ -38 +34 @@
     [Storable]
     protected bool optimize;
-    public bool Optimize {
+    public virtual bool Optimize {
       get { return optimize; }
       set {
         if (optimize != value) {
           optimize = value;
-          if (optimize) {
-            ClearParameterConfigurations();
-            if (this.actualValue.Value is IParameterizedNamedItem) PopulateParameterConfigurations(this.actualValue.Value as IParameterizedNamedItem);
-          } else {
-            ClearParameterConfigurations();
-          }
           OnOptimizeChanged();
           OnToStringChanged();
         }
       }
-    }
-
-    [Storable]
-    protected IItemCollection<IParameterConfiguration> parameterConfigurations = new ItemCollection<IParameterConfiguration>();
-    public IItemCollection<IParameterConfiguration> ParameterConfigurations {
-      get { return new ReadOnlyItemCollection<IParameterConfiguration>(this.parameterConfigurations); }
-      protected set { this.parameterConfigurations = value; }
     }
 
@@ -69 +52 @@
         if (this.actualValue != value) {
           DeregisterActualValueEvents();
-          ClearParameterConfigurations();
           this.actualValue = value;
-          if (this.actualValue.Value is IParameterizedNamedItem) PopulateParameterConfigurations(this.actualValue.Value as IParameterizedNamedItem);
           OnValueChanged();
           OnToStringChanged();
-          RegisterActualValueEvents();
-        }
-      }
-    }
-
-    [Storable]
-    protected IRange rangeConstraint;
-    public IRange RangeConstraint {
-      get { return rangeConstraint; }
-      private set {
-        if (rangeConstraint != value) {
-          DeregisterRangeConstraintEvents();
-          rangeConstraint = value;
           RegisterActualValueEvents();
         }
@@ -106 +74 @@
     #region Constructors and Cloning
     public ValueConfiguration(IItem value, Type valueDataType) {
-      this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
       var validTypes = ApplicationManager.Manager.GetTypes(valueDataType).OrderBy(x => x.Name).ToArray();
       this.ActualValue = new ConstrainedValue(value, valueDataType, new ItemSet<IItem> { value }, false);
       this.IsOptimizable = true;
-      if (actualValue.ValueDataType == typeof(IntValue)) {
-        RangeConstraint = new IntValueRange(new IntValue(0), (IntValue)value, new IntValue(1));
-      } else if (actualValue.ValueDataType == typeof(DoubleValue)) {
-        RangeConstraint = new DoubleValueRange(new DoubleValue(0), (DoubleValue)value, new DoubleValue(0.01));
-      } else if (actualValue.ValueDataType == typeof(PercentValue)) {
-        RangeConstraint = new PercentValueRange(new PercentValue(0), new PercentValue(1), new PercentValue(0.01));
-      } else if (actualValue.ValueDataType == typeof(BoolValue)) {
-        this.IsOptimizable = false; // there is nothing to configure for bools
-      } else {
-        RangeConstraint = null;
-      }
     }
 
@@ -128 +84 @@
     protected ValueConfiguration(ValueConfiguration original, Cloner cloner)
       : base(original, cloner) {
-      this.ParameterConfigurations = cloner.Clone(original.parameterConfigurations);
       this.actualValue = cloner.Clone(original.ActualValue);
-      this.rangeConstraint = cloner.Clone(original.RangeConstraint);
       this.isOptimizable = original.isOptimizable;
       this.optimize = original.optimize;
       this.number = original.number;
       RegisterActualValueEvents();
-      RegisterRangeConstraintEvents();
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new ValueConfiguration(this, cloner);
-    }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterRangeConstraintEvents();
     }
     #endregion
 
-    protected virtual void PopulateParameterConfigurations(IParameterizedNamedItem parameterizedItem) {
-      foreach (var childParameter in parameterizedItem.Parameters) {
-        var pc = ParameterConfiguration.Create(parameterizedItem, childParameter);
-        if (pc != null) this.parameterConfigurations.Add(pc);
-      }
-    }
-    protected virtual void ClearParameterConfigurations() {
-      parameterConfigurations.Clear();
-    }
-
-    private void RegisterRangeConstraintEvents() {
-      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged += new EventHandler(RangeConstraint_ToStringChanged);
-    }
-    private void DeregisterRangeConstraintEvents() {
-      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged -= new EventHandler(RangeConstraint_ToStringChanged);
-    }
     private void RegisterActualValueEvents() {
       if (this.actualValue != null) this.actualValue.ToStringChanged += new EventHandler(actualValue_ToStringChanged);
@@ -170 +100 @@
 
     #region Events
-    void actualValue_ToStringChanged(object sender, EventArgs e) {
-      OnToStringChanged();
-    }
-    void RangeConstraint_ToStringChanged(object sender, EventArgs e) {
+    private void actualValue_ToStringChanged(object sender, EventArgs e) {
       OnToStringChanged();
     }
@@ -212 +139 @@
     #endregion
 
-    public override string ToString() {
-      if (ActualValue != null && ActualValue.Value != null) {
-        string name = NumberedName;
-
-        if (ActualValue.Value is IParameterizedItem) {
-          if (Optimize) {
-            return string.Format("{0} (Optimize)", name);
-          } else {
-            return string.Format("{0}", name);
-          }
-        } else {
-          if (Optimize) {
-            return string.Format("{0} (Optimize: {1})", name, RangeConstraint);
-          } else {
-            return string.Format("{0}: {1}", name, ActualValue.Value);
-          }
-        }
-      } else {
-        return base.ToString();
-      }
-    }
-
     public string NumberedName {
       get {
@@ -244 +149 @@
     }
 
-    public string ParameterInfoString {
-      get {
-        StringBuilder sb = new StringBuilder();
-        if (this.Optimize && this.ParameterConfigurations.Count > 0) {
-          var parameterInfos = new List<string>();
-          foreach (var pc in this.ParameterConfigurations) {
-            if (pc.Optimize) parameterInfos.Add(pc.ParameterInfoString);
-          }
-          sb.Append(string.Join(", ", parameterInfos.ToArray()));
-        }
-        return sb.ToString();
-      }
-    }
-
-    public virtual void Parameterize(IParameterizedItem item) {
-      foreach (IParameterConfiguration pc in this.ParameterConfigurations) {
-        pc.Parameterize((IValueParameter)item.Parameters[pc.ParameterName]);
-      }
-    }
-
-    public void Randomize(IRandom random) {
-      if (Optimize) {
-        if (rangeConstraint != null) {
-          this.actualValue.Value = rangeConstraint.GetRandomValue(random);
-        } else {
-          foreach (IParameterConfiguration pc in this.ParameterConfigurations) {
-            pc.Randomize(random);
-          }
-        }
-      }
-    }
-
-    public void Mutate(IRandom random, MutateDelegate mutate, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
-      if (Optimize) {
-        if (rangeConstraint != null) {
-          mutate(random, this, intValueManipulator, doubleValueManipulator);
-        } else {
-          foreach (IParameterConfiguration pc in this.ParameterConfigurations) {
-            pc.Mutate(random, mutate, intValueManipulator, doubleValueManipulator);
-          }
-        }
-      }
-    }
-
-    public void Cross(IRandom random, IOptimizable other, CrossDelegate cross, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) {
-      if (Optimize) {
-        if (rangeConstraint != null) {
-          cross(random, this, other, intValueCrossover, doubleValueCrossover);
-        } else {
-          IValueConfiguration otherVc = (IValueConfiguration)other;
-          for (int i = 0; i < this.ParameterConfigurations.Count; i++) {
-            this.ParameterConfigurations.ElementAt(i).Cross(random, otherVc.ParameterConfigurations.ElementAt(i), cross, intValueCrossover, doubleValueCrossover);
-          }
-        }
-      }
-    }
-
-    public List<IOptimizable> GetAllOptimizables() {
-      var list = new List<IOptimizable>();
-      foreach (var pc in ParameterConfigurations) {
-        if (pc.Optimize) {
-          if (pc.ValueConfigurations.CheckedItems.Count() > 1) list.Add(pc); // only add if there are more than 1 choices. otherwise it makes no sense to optimize which VC is selected
-          list.AddRange(pc.GetAllOptimizables());
-        }
-      }
-      return list;
-    }
-
-    public void CollectOptimizedParameterNames(List<string> parameterNames, string prefix) {
-      foreach (var pc in ParameterConfigurations) {
-        if (pc.Optimize) {
-          parameterNames.Add(prefix + pc.ParameterName);
-          pc.CollectOptimizedParameterNames(parameterNames, prefix + pc.ParameterName + ".");
-        }
-      }
-    }
-
-    public IEnumerable<string> GetOptimizedParameterNames() {
-      var list = new List<string>();
-      this.CollectOptimizedParameterNames(list, "");
-      return list;
-    }
-
-    public double CalculateSimilarity(IOptimizable optimizable) {
-      var other = (IValueConfiguration)optimizable;
-      if (rangeConstraint != null) {
-        return this.RangeConstraint.CalculateSimilarity(this.ActualValue.Value, other.ActualValue.Value);
-      } else {
-        double sum = 0;
-        int count = 0;
-        for (int i = 0; i < ParameterConfigurations.Count; i++) {
-          if (this.ParameterConfigurations.ElementAt(i).Optimize) {
-            sum += this.ParameterConfigurations.ElementAt(i).CalculateSimilarity(other.ParameterConfigurations.ElementAt(i));
-            count++;
-          }
-        }
-        return count == 0 ? 1.0 : sum / (double)count;
-      }
-    }
+    public abstract void Randomize(IRandom random);
+    public abstract void Mutate(IRandom random, MutateDelegate mutate, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator);
+    public abstract void Cross(IRandom random, IOptimizable other, CrossDelegate cross, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover);
+    public abstract double CalculateSimilarity(IOptimizable optimizable);
+    public abstract string ParameterInfoString { get; }
+    public abstract void CollectOptimizedParameterNames(List<string> parameterNames, string prefix);
+    public abstract List<IOptimizable> GetAllOptimizables();
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/HeuristicLab.Problems.MetaOptimization-3.3.csproj

@@ -143 +143 @@
     <Compile Include="Analyzers\PMOPopulationDiversityAnalyzer.cs" />
     <Compile Include="ConstrainedTypeValue.cs" />
+    <Compile Include="Encoding\ValueConfigurations\RangeValueConfiguration.cs" />
+    <Compile Include="Encoding\ValueConfigurations\ParameterizedValueConfiguration.cs" />
+    <Compile Include="Evaluators\AlgorithmEvaluator.cs" />
+    <Compile Include="Evaluators\AlgorithmRunsAnalyzer.cs" />
+    <Compile Include="Evaluators\AlgorithmSubScopesCreator.cs" />
+    <Compile Include="Evaluators\PMOEvaluator.cs" />
     <Compile Include="MetaOptimizationUtil.cs" />
     <Compile Include="Operators\Crossovers\MultiIntValueCrossover.cs" />
@@ -167 +173 @@
     <Compile Include="Encoding\ValueConfigurations\ValueConfiguration.cs" />
     <Compile Include="Encoding\ValueConfigurations\CheckedValueConfigurationCollection.cs" />
-    <Compile Include="Evaluators\AlgorithmExecutor.cs" />
+    <Compile Include="AlgorithmExecutor.cs" />
     <Compile Include="Interfaces\IParameterConfigurationCrossover.cs" />
     <Compile Include="Interfaces\ICheckedValueConfigurationCollection.cs" />
@@ -185 +191 @@
     <Compile Include="Interfaces\IParameterConfigurationOperator.cs" />
     <Compile Include="Interfaces\IRange.cs" />
-    <Compile Include="Evaluators\ParameterConfigurationEvaluator.cs" />
     <Compile Include="Interfaces\IParameterConfigurationEvaluator.cs" />
     <Compile Include="Interfaces\IParameterConfiguration.cs" />

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IOptimizable.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.MetaOptimization {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IValueConfiguration.cs

@@ -1 +1 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.MetaOptimization {
   public interface IValueConfiguration : IOptimizable, IItem {
-    IItemCollection<IParameterConfiguration> ParameterConfigurations { get; }
-    IRange RangeConstraint { get; }
     int Number { get; set; } // if larger than 0 it will be visible in the name. this can be used when multiple ValueConfiguration with the same name exist in a list
     string NumberedName { get; }
@@ -13 +9 @@
     event EventHandler ValueChanged;
     
-    void Parameterize(IParameterizedItem item);
+    //void Parameterize(IParameterizedItem item);
   }
 }

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

@@ -137 +137 @@
       Maximization = new BoolValue(false);
       SolutionCreator = new RandomParameterConfigurationCreator();
-      Evaluator = new ParameterConfigurationEvaluator();
+      Evaluator = new PMOEvaluator();
 
       InitializeOperators();
@@ -186 +186 @@
     }
     private void ParameterizeEvaluator() {
-      ((ParameterConfigurationEvaluator)Evaluator).ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
+      ((PMOEvaluator)Evaluator).ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
     }
     private void ParameterizeAnalyzer() {
@@ -246 +246 @@
       IAlgorithm instance = (IAlgorithm)Activator.CreateInstance(AlgorithmType.Value);
       this.ProblemType.ValidTypes = ApplicationManager.Manager.GetTypes(instance.ProblemType, true).ToList();
-      this.ProblemType.Value = this.ProblemType.ValidTypes.Where(t => t != typeof(MetaOptimizationProblem)).FirstOrDefault();
+      this.ProblemType.Value = this.ProblemType.ValidTypes.SingleOrDefault(t => t == typeof(SingleObjectiveTestFunctionProblem)) ?? this.ProblemType.ValidTypes.Where(t => t != typeof(MetaOptimizationProblem)).FirstOrDefault();
       if (ProblemType.Value != null) {
         ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(CreateAlgorithm(AlgorithmType.Value, ProblemType.Value));
+        Problems.Add((IProblem)Activator.CreateInstance(this.ProblemType.Value));
       } else {
         ParameterConfigurationTreeParameter.ActualValue = null;

@@ -2 +2 @@
 obj
 HeuristicLab.MetaOptimization.Test.csproj.user
+*.vs10x

@@ -3 +3 @@
 HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj.user
 HeuristicLabProblemsMetaOptimizationViewsPlugin.cs
+*.vs10x

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x