Changeset 6197 for branches

Timestamp:

05/14/11 18:49:46 (14 years ago)

Author:

cneumuel

Message:

#1215

• some fixes

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.MetaOptimization.Test/Program.cs (modified) (9 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Analyzers/BestParameterConfigurationAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Analyzers/PMOBestSolutionHistoryAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (5 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/SingleValuedParameterConfiguration.cs (modified) (4 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/ConstrainedValue.cs (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/SymbolicExpressionGrammar/SymbolValueConfiguration.cs (modified) (7 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/SymbolicExpressionGrammar/SymbolicExpressionGrammarValueConfiguration.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/AlgorithmRunsAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Operators/Crossovers/DoubleValue/NormalDoubleValueCrossover.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/DoubleValue/NormalDoubleValueManipulator.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/IntValue/NormalIntValueManipulator.cs (modified) (1 diff)

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

@@ -48 +48 @@
     //private static double mutationProbability = 0.10;
 
-    private static int metaAlgorithmPopulationSize = 10;
-    private static int metaAlgorithmMaxGenerations = 20;
+    private static int metaAlgorithmPopulationSize = 4;
+    private static int metaAlgorithmMaxGenerations = 10;
     private static double metaAlgorithmMutationProbability = 0.10;
-    private static int metaProblemRepetitions = 2;
-    private static int baseAlgorithmMaxGenerations = 10;
+    private static int metaProblemRepetitions = 3;
+    private static int baseAlgorithmMaxGenerations = 20;
     private static int baseAlgorithmPopulationSize = 10;
-    
+
     public override void Run() {
       ContentManager.Initialize(new PersistenceContentManager());
@@ -60 +60 @@
       //TestTableBuilder();
       //TestShorten();
+
+
+      var x = typeof(float).IsPrimitive;
 
       //TestSimilarities(); return;
@@ -79 +82 @@
 
       //TestSymbolicDataAnalysisGrammar(); return;
+      //TestObjectGraphObjectsTraversal(); return;
+      //TestParameterizedItem(); return;
 
       //MetaOptimizationProblem metaOptimizationProblem = LoadOptimizationProblem("Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled).hl");
@@ -92 +97 @@
       //EvolutionStrategy metaLevelAlgorithm = GetMetaES(metaOptimizationProblem);
 
-      //Console.WriteLine("Press enter to start");
-      //Console.ReadLine();
+      //Console.WriteLine("Press enter to start"); Console.ReadLine();
       //TestConfiguration(algorithmVc, typeof(GeneticAlgorithm), metaOptimizationProblem.Problems.First());
 
-      //Console.WriteLine("Press enter to start");
-      //Console.ReadLine();
+      Console.WriteLine("Press enter to start"); Console.ReadLine();
       TestOptimization(metaLevelAlgorithm);
 
@@ -103 +106 @@
 
       Console.ReadLine();
+    }
+
+    private void TestParameterizedItem() {
+      var value = new MyParameterizedItem();
+      Console.WriteLine("P1=1;; " + value.ToString());
+
+      var vc = new ParameterizedValueConfiguration(value, typeof(MyParameterizedItem), true);
+      vc.Optimize = true;
+      ((IntValue)vc.ParameterConfigurations.Single(x => x.Name == "P1").ActualValue.Value).Value = 22;
+      Console.WriteLine("P1=22;; " + value.ToString());
+      vc.ParameterConfigurations.Single(x => x.Name == "P1").ActualValue.Value = new IntValue(33);
+      Console.WriteLine("P1=33;; " + value.ToString());
+      vc.Parameterize(value);
+      Console.WriteLine("P1=33;; " + value.ToString());
+            
+      Console.ReadLine();
+    }
+
+    private void TestObjectGraphObjectsTraversal() {
+      //var obj = new GeneticAlgorithm();
+      var obj = ContentManager.Load("Genetic Programming - Symbolic Regression 3.4_scaled_paused.hl");
+      Console.WriteLine("loaded");
+
+      for (int i = 0; i < 10; i++) {
+        var sw = new Stopwatch();
+        sw.Start();
+        var objects = obj.GetObjectGraphObjects().ToArray();
+        sw.Stop();
+
+        var typeCount = GetTypeCount(objects).ToArray();
+        Console.WriteLine("objects: {0}", objects.Count());
+        Console.WriteLine(sw.Elapsed);
+      }
+    }
+
+    private IOrderedEnumerable<KeyValuePair<Type, long>> GetTypeCount(object[] objects) {
+      var dict = new Dictionary<Type, long>();
+      foreach (var item in objects) {
+        var t = item.GetType();
+        if (!dict.ContainsKey(t))
+          dict.Add(t, 0);
+        dict[t]++;
+      }
+      return dict.OrderByDescending(x => x.Value);
     }
 
@@ -733 +780 @@
     private static ParameterConfigurationTree SetupGAAlgorithm(Type baseLevelAlgorithmType, MetaOptimizationProblem metaOptimizationProblem) {
       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() {
@@ -753 +800 @@
 
       // tower problem
-      metaOptimizationProblem.ImportAlgorithm((IAlgorithm)ContentManager.Load("Genetic Programming - Symbolic Regression 3.4_scaled.hl"));
-      metaOptimizationProblem.Maximization.Value = true;
+      //metaOptimizationProblem.ImportAlgorithm((IAlgorithm)ContentManager.Load("Genetic Programming - Symbolic Regression 3.4_scaled.hl"));
+      //metaOptimizationProblem.Maximization.Value = true;
 
       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);
-      //ConfigureMutationRate(algorithmVc, 0.0, 1.0, 0.01);
-      //ConfigureMutationOperator(algorithmVc);
+      ConfigureMutationRate(algorithmVc, 0.0, 1.0, 0.01);
+      ConfigureMutationOperator(algorithmVc);
       //ConfigureElites(algorithmVc, 0, 10, 1);
       //ConfigureSelectionOperator(algorithmVc, true);
 
-      ConfigureSymbolicExpressionGrammar(algorithmVc);
+      //ConfigureSymbolicExpressionGrammar(algorithmVc);
 
       return algorithmVc;
@@ -992 +1039 @@
 
       ContentManager.Save((IStorableContent)metaLevelAlgorithm, resultPath + "-before.hl", true);
-      
+
       using (var sw = new StreamWriter(outputPath)) {
         sw.AutoFlush = true;
@@ -1262 +1309 @@
     }
   }
+
+  class MyParameterizedItem : ParameterizedNamedItem {
+    public MyParameterizedItem() {
+      this.Parameters.Add(new ValueParameter<IntValue>("P1", new IntValue(1)));
+      this.Parameters.Add(new ValueParameter<IntValue>("P2", new IntValue(2)));
+      this.Parameters.Add(new ValueParameter<IntValue>("P3", new IntValue(3)));
+      this.Parameters.Add(new ValueParameter<MyOtherParameterizedItem>("P4", new MyOtherParameterizedItem()));
+    }
+
+    protected MyParameterizedItem(MyParameterizedItem original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MyParameterizedItem(this, cloner);
+    }
+
+    public override string ToString() {
+      return string.Format("P1: {0}, P2: {1}, P3: {2}, P4: {3}", Parameters["P1"].ActualValue, Parameters["P2"].ActualValue, Parameters["P3"].ActualValue, Parameters["P4"].ActualValue);
+    }
+  }
+
+  class MyOtherParameterizedItem : ParameterizedNamedItem {
+    public MyOtherParameterizedItem() {
+      this.Parameters.Add(new ValueParameter<IntValue>("PP1", new IntValue(1)));
+      this.Parameters.Add(new ValueParameter<IntValue>("PP2", new IntValue(2)));
+      this.Parameters.Add(new ValueParameter<IntValue>("PP3", new IntValue(3)));
+    }
+
+    protected MyOtherParameterizedItem(MyOtherParameterizedItem original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MyOtherParameterizedItem(this, cloner);
+    }
+
+    public override string ToString() {
+      return string.Format("PP1: {0}, PP2: {1}, PP3: {2}", Parameters["PP1"].ActualValue, Parameters["PP2"].ActualValue, Parameters["PP3"].ActualValue);
+    }
+  }
 }

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

@@ -102 +102 @@
       RunCollection rc = new RunCollection();
       foreach (ParameterConfigurationTree pt in (maximization ? parameterTrees.OrderByDescending(x => x.Quality) : parameterTrees.OrderBy(x => x.Quality))) {
-        rc.Add(pt.ToRun(string.Format("Individual {0} ({1})", i, pt.ParameterInfoString)));
+        rc.Add(pt.ToRun(string.Format("Individual {0} ({1})", i, pt.ParameterInfoString), true));
         i++;
       }

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

@@ -76 +76 @@
       }
       if (bestSolutionHistory.Count == 0 || best.ParameterInfoString != ((StringValue)bestSolutionHistory.Last().Results["Meta.ParameterInfoString"]).Value) {
-        IRun run = best.ToRun(string.Format("{0}: {1}", currentGeneration, best.ParameterInfoString));
+        IRun run = best.ToRun(string.Format("{0}: {1}", currentGeneration, best.ParameterInfoString), false);
         run.Results.Add("Meta.Generation", new IntValue(currentGeneration));
         run.Results.Add("Meta.ParameterInfoString", new StringValue(best.ParameterInfoString));

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

@@ -184 +184 @@
         this.parameters.Add(p.Key, cloner.Clone(p.Value));
       }
-      //this.name = original.name;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -291 +290 @@
     }
 
-    public IRun ToRun() {
-      return ToRun(this.ParameterInfoString);
-    }
-
-    public IRun ToRun(string name) {
+    public IRun ToRun(bool clearParameters) {
+      return ToRun(this.ParameterInfoString, clearParameters);
+    }
+
+    public IRun ToRun(string name, bool clearParameters) {
       IRun run = new Run();
       run.Name = name;
       this.CollectResultValues(run.Results);
       this.CollectParameterValues(run.Parameters);
-      MetaOptimizationUtil.ClearParameters(run, this.GetOptimizedParameterNames());
+      if(clearParameters) MetaOptimizationUtil.ClearParameters(run, this.GetOptimizedParameterNames());
       return run;
     }

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

@@ -211 +211 @@
       this.validTypes = original.validTypes.ToArray();
       this.valueConfigurations = cloner.Clone(original.ValueConfigurations);
-      this.ActualValue = cloner.Clone(original.ActualValue);
+      if (this.valueConfigurations != null) RegisterValueConfigurationEvents();
+      this.actualValue = cloner.Clone(original.actualValue);
+      if (this.actualValue != null) RegisterActualValueEvents();
       this.optimize = original.optimize;
       this.actualValueConfigurationIndex = original.actualValueConfigurationIndex;
@@ -217 +219 @@
       this.itemImage = original.itemImage;
       this.discoverValidValues = original.discoverValidValues;
-      if (this.valueConfigurations != null) RegisterValueConfigurationEvents();
       this.AutoPopulateValueConfigurations = original.AutoPopulateValueConfigurations;
     }
@@ -226 +227 @@
     }
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
+    protected virtual void AfterDeserialization() {
       if (this.valueConfigurations != null) RegisterValueConfigurationEvents();
+      if (this.actualValue != null) RegisterActualValueEvents();
     }
     #endregion
@@ -400 +402 @@
 
     #region Events
-    void ActualValue_ToStringChanged(object sender, EventArgs e) {
+    protected virtual void ActualValue_ToStringChanged(object sender, EventArgs e) {
       OnToStringChanged();
     }
@@ -495 +497 @@
       var clonedValue = this.ActualValue.Value != null ? (IItem)this.ActualValue.Value.Clone() : null;
       if (clonedValue != null) AdaptValidValues(parameter, clonedValue);
-      parameter.Value = clonedValue;
+      parameter.ActualValue = clonedValue;
     }
 

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

@@ -8 +8 @@
   [StorableClass]
   public class SingleValuedParameterConfiguration : ParameterConfiguration {
-
+    
     #region Constructors and Cloning
     [StorableConstructor]
@@ -25 +25 @@
       this.validValues = new ItemSet<IItem> { valueConfiguration.ActualValue.Value };
       this.validTypes = new Type[] { valueConfiguration.ActualValue.ValueDataType };
-      this.IsNullable = false;
+      this.isNullable = false;
       this.itemImage = valueConfiguration.ItemImage;
       this.ValueConfigurations = new CheckedValueConfigurationList { valueConfiguration };
@@ -54 +54 @@
 
     public override string ToString() {
-      if (this.valueConfigurations.First() is SymbolValueConfiguration) {
-        var syVc = (SymbolValueConfiguration)this.valueConfigurations.First();
+      if (this.valueConfigurations.Single() is SymbolValueConfiguration) {
+        var syVc = (SymbolValueConfiguration)this.valueConfigurations.Single();
         if (this.Optimize) {
           return syVc.ToString() + " (Optimize)";
         } else {
-          return syVc.ToString();
+          return ActualValue.ToString();
         }
       } else {
@@ -66 +66 @@
     }
 
-    private void valueConfiguration_ToStringChanged(object sender, EventArgs e) {
+    protected virtual void valueConfiguration_ToStringChanged(object sender, EventArgs e) {
       OnToStringChanged();
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/ConstrainedValue.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Common;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -56 +53 @@
     private void RegisterEvents() {
       this.value.ToStringChanged += new EventHandler(value_ToStringChanged);
+      if (this.value is Symbol) {
+        ((Symbol)this.value).Changed += new EventHandler(ConstrainedValue_Changed);
+      }
     }
+
     private void DeregisterEvents() {
       this.value.ToStringChanged -= new EventHandler(value_ToStringChanged);
+      if (this.value is Symbol) {
+        ((Symbol)this.value).Changed -= new EventHandler(ConstrainedValue_Changed);
+      }
     }
 
@@ -90 +94 @@
     }
 
+    private void ConstrainedValue_Changed(object sender, EventArgs e) {
+      OnToStringChanged();
+    }
+
     public override string ToString() {
+      if (this.value is Symbol) {
+        return string.Format("{0}: {1}", this.value, ((Symbol)this.value).InitialFrequency);
+      }
       return value != null ? value.ToString() : base.ToString();
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/SymbolicExpressionGrammar/SymbolValueConfiguration.cs

@@ -1 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -11 +12 @@
   [StorableClass]
   public class SymbolValueConfiguration : ParameterizedValueConfiguration {
+    [Storable]
+    private IOptimizable parentOptimizable;
+    public IOptimizable ParentOptimizable {
+      get { return parentOptimizable; }
+      set { this.parentOptimizable = value; }
+    }
 
     #region Constructors and Cloning
@@ -21 +28 @@
       this.Optimize = false;
       this.Name = symbol.Name;
-      this.actualValue = new ConstrainedValue(symbol, symbol.GetType(), new ItemSet<IItem> { symbol }, false);
+      this.ActualValue = new ConstrainedValue(symbol, symbol.GetType(), new ItemSet<IItem> { symbol }, false);
     }
     protected SymbolValueConfiguration(SymbolValueConfiguration original, Cloner cloner)
       : base(original, cloner) {
+      RegisterInitialFrequencyEvents();
+      this.parentOptimizable = cloner.Clone(original.parentOptimizable);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SymbolValueConfiguration(this, cloner);
+    }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterInitialFrequencyEvents();
     }
     #endregion
@@ -33 +46 @@
     protected override void PopulateParameterConfigurations(IItem item, bool discoverValidValues) {
       this.ClearParameterConfigurations();
-
       var symbol = (Symbol)item;
 
@@ -41 +53 @@
       var initialFrequencyParameterConfiguration = new ParameterConfiguration("InitialFrequency", typeof(Symbol), new DoubleValue(symbol.InitialFrequency), initialFrequencyValueConfigurations);
       this.parameterConfigurations.Add(initialFrequencyParameterConfiguration);
+      RegisterInitialFrequencyEvents();
 
       var constant = symbol as Constant;
@@ -74 +87 @@
 
     public virtual void Parameterize(Symbol symbol) {
-      symbol.InitialFrequency = GetDoubleValue("InitialFrequency");
-      
+      var actualValueSymbol = this.ActualValue.Value as Symbol;
+      symbol.InitialFrequency = parentOptimizable.Optimize ? GetDoubleValue("InitialFrequency") : actualValueSymbol.InitialFrequency;
+
       var constant = symbol as Constant;
       if (constant != null) {
-        constant.MinValue = GetDoubleValue("MinValue");
-        constant.MaxValue = GetDoubleValue("MaxValue");
-        constant.ManipulatorMu = GetDoubleValue("ManipulatorMu");
-        constant.ManipulatorSigma = GetDoubleValue("ManipulatorSigma");
-        constant.MultiplicativeManipulatorSigma = GetDoubleValue("MultiplicativeManipulatorSigma");
+        var actualValueConstant = this.ActualValue.Value as Constant;
+        constant.MinValue = parentOptimizable.Optimize ? GetDoubleValue("MinValue") : actualValueConstant.MinValue;
+        constant.MaxValue = parentOptimizable.Optimize ? GetDoubleValue("MaxValue") : actualValueConstant.MaxValue;
+        constant.ManipulatorMu = parentOptimizable.Optimize ? GetDoubleValue("ManipulatorMu") : actualValueConstant.ManipulatorMu;
+        constant.ManipulatorSigma = parentOptimizable.Optimize ? GetDoubleValue("ManipulatorSigma") : actualValueConstant.ManipulatorSigma;
+        constant.MultiplicativeManipulatorSigma = parentOptimizable.Optimize ? GetDoubleValue("MultiplicativeManipulatorSigma") : actualValueConstant.MultiplicativeManipulatorSigma;
       }
-      
+
       var variable = symbol as HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
       if (variable != null) {
-        variable.WeightMu = GetDoubleValue("WeightMu");
-        variable.WeightSigma = GetDoubleValue("WeightSigma");
-        variable.WeightManipulatorMu = GetDoubleValue("WeightManipulatorMu");
-        variable.WeightManipulatorSigma = GetDoubleValue("WeightManipulatorSigma");
-        variable.MultiplicativeWeightManipulatorSigma = GetDoubleValue("MultiplicativeWeightManipulatorSigma");
+        var actualValueVariable = this.ActualValue.Value as HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
+        variable.WeightMu = parentOptimizable.Optimize ? GetDoubleValue("WeightMu") : actualValueVariable.WeightMu;
+        variable.WeightSigma = parentOptimizable.Optimize ? GetDoubleValue("WeightSigma") : actualValueVariable.WeightSigma;
+        variable.WeightManipulatorMu = parentOptimizable.Optimize ? GetDoubleValue("WeightManipulatorMu") : actualValueVariable.WeightManipulatorMu;
+        variable.WeightManipulatorSigma = parentOptimizable.Optimize ? GetDoubleValue("WeightManipulatorSigma") : actualValueVariable.WeightManipulatorSigma;
+        variable.MultiplicativeWeightManipulatorSigma = parentOptimizable.Optimize ? GetDoubleValue("MultiplicativeWeightManipulatorSigma") : actualValueVariable.MultiplicativeWeightManipulatorSigma;
       }
     }
@@ -97 +113 @@
     private double GetDoubleValue(string name) {
       return ((DoubleValue)ParameterConfigurations.Single(x => x.Name == name).ActualValue.Value).Value;
+    }
+
+    private void RegisterInitialFrequencyEvents() {
+      this.parameterConfigurations.Single(x => x.Name == "InitialFrequency").ToStringChanged += new EventHandler(initialFrequencyParameterConfiguration_ToStringChanged);
+    }
+    private void DeregisterInitialFrequencyEvents() {
+      this.parameterConfigurations.Single(x => x.Name == "InitialFrequency").ToStringChanged -= new EventHandler(initialFrequencyParameterConfiguration_ToStringChanged);
+    }
+
+    protected virtual void initialFrequencyParameterConfiguration_ToStringChanged(object sender, EventArgs e) {
+      OnToStringChanged();
     }
 

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/SymbolicExpressionGrammar/SymbolicExpressionGrammarValueConfiguration.cs

@@ -28 +28 @@
       var grammar = (ISymbolicExpressionGrammar)item;
       foreach (Symbol symbol in grammar.Symbols) {
-        var pc = new SingleValuedParameterConfiguration(symbol.Name, new SymbolValueConfiguration(symbol));
+        var svc = new SymbolValueConfiguration(symbol);
+        var pc = new SingleValuedParameterConfiguration(symbol.Name, svc);
+        svc.ParentOptimizable = pc;
         SetOptimizeIfOnlyOneValueConfiguration(pc);
         this.parameterConfigurations.Add(pc);
@@ -36 +38 @@
     public virtual void Parameterize(ISymbolicExpressionGrammar grammar) {
       foreach (Symbol symbol in grammar.Symbols) {
-        ((SymbolValueConfiguration)this.parameterConfigurations.Single(pc => pc.Name == symbol.Name).ValueConfigurations.First()).Parameterize(symbol);
+        var symbolValueConfiguration = (SymbolValueConfiguration)this.parameterConfigurations.Single(pc => pc.Name == symbol.Name).ValueConfigurations.First();
+        symbolValueConfiguration.Parameterize(symbol);
       }
     }

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

@@ -132 +132 @@
           int repetitionIndex = repetitionIndices[i].Value;
 
-          IRun run = algorithms[i].Runs.Single();
+          IRun run = (IRun)algorithms[i].Runs.Single().Clone();
           MetaOptimizationUtil.ClearResults(run, resultNames);
           MetaOptimizationUtil.ClearParameters(run, parameterNames);
@@ -142 +142 @@
           executionTimes[problemIndex][repetitionIndex] = (((TimeSpanValue)run.Results["Execution Time"]).Value);
           evaluatedSolutions[problemIndex][repetitionIndex] = (((IntValue)run.Results["EvaluatedSolutions"]).Value);
-          runs.Add((IRun)run.Clone());
+          runs.Add(run);
         }
 

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

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

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/DoubleValue/NormalDoubleValueManipulator.cs

@@ -35 +35 @@
       var vector = new RealVector(1);
       double val = value.Value;
-
+      
       do { 
         vector[0] = val;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/IntValue/NormalIntValueManipulator.cs

@@ -15 +15 @@
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-
+    
     public NormalIntValueManipulator() { }
     [StorableConstructor]