Changeset 17614

Timestamp:

06/19/20 17:53:36 (4 years ago)

Author:

abeham

Message:

#2521: work in progress (removed solution creator parameter from encoding), OrienteeringProblem and test functions are broken

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IConstrainedValueParameter.cs (modified) (1 diff)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEncoding.cs (modified) (2 diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.4/LinearLinkageEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs (modified) (2 diffs)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMRandomCreator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JobSequenceMatrixEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWRRandomCreator.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PermutationWithRepetitionEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVRandomCreator.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PriorityRulesVectorEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeMultiObjectiveProblem.cs (modified) (6 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/CombinedEncoding.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IEncoding.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs (modified) (6 diffs)
• HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs (modified) (2 diffs)
• HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs (modified) (1 diff)
• HeuristicLab.Parameters/3.3/ParameterChangeHandler.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblemInstances.cs (modified) (12 diffs)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

@@ -381 +381 @@
     }
     private void UpdateCrossovers() {
-      ICrossover oldCrossover = CrossoverParameter.Value;
-      CrossoverParameter.ValidValues.Clear();
-      ICrossover defaultCrossover = Problem.Operators.OfType<ICrossover>().FirstOrDefault();
-
-      foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
-        CrossoverParameter.ValidValues.Add(crossover);
-
-      if (oldCrossover != null) {
-        ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
-        if (crossover != null) CrossoverParameter.Value = crossover;
-        else oldCrossover = null;
-      }
-      if (oldCrossover == null && defaultCrossover != null)
-        CrossoverParameter.Value = defaultCrossover;
-    }
+      CrossoverParameter.Repopulate(Problem.Operators);
+    }
+
     private void UpdateMutators() {
-      IManipulator oldMutator = MutatorParameter.Value;
-      MutatorParameter.ValidValues.Clear();
-      IManipulator defaultMutator = Problem.Operators.OfType<IManipulator>().FirstOrDefault();
-
-      foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
-        MutatorParameter.ValidValues.Add(mutator);
-
-      if (oldMutator != null) {
-        IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
-        if (mutator != null) MutatorParameter.Value = mutator;
-        else oldMutator = null;
-      }
-
-      if (oldMutator == null && defaultMutator != null)
-        MutatorParameter.Value = defaultMutator;
+      MutatorParameter.Repopulate(Problem.Operators);
     }
     private void UpdateAnalyzers() {

branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IConstrainedValueParameter.cs

@@ -29 +29 @@
 
     void Populate(IEnumerable<IItem> items);
+    void Repopulate(IEnumerable<IItem> items);
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs

@@ -46 +46 @@
     public BinaryVectorEncoding(int length) : this("BinaryVector", length) { }
     public BinaryVectorEncoding(string name, int length)
-      : base(name, length) {      
-      SolutionCreator = new RandomBinaryVectorCreator();
-
+      : base(name, length) {
       DiscoverOperators();
     }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEncoding.cs

@@ -78 +78 @@
       Parameters.Add(BoundsParameter);
 
-      SolutionCreator = new UniformRandomIntegerVectorCreator();
       DiscoverOperators();
       RegisterEventHandlers();
@@ -99 +98 @@
       Parameters.Add(BoundsParameter);
 
-      SolutionCreator = new UniformRandomIntegerVectorCreator();
       DiscoverOperators();
       RegisterEventHandlers();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/LinearLinkageEncoding.cs

@@ -49 +49 @@
     public LinearLinkageEncoding(string name, int length)
       : base(name, length) {
-      SolutionCreator = new RandomLinearLinkageCreator();
       DiscoverOperators();
     }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs

@@ -70 +70 @@
       Parameters.Add(PermutationTypeParameter);
 
-      SolutionCreator = new RandomPermutationCreator();
       DiscoverOperators();
       RegisterParameterEvents();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs

@@ -75 +75 @@
       Parameters.Add(BoundsParameter);
 
-      SolutionCreator = new UniformRandomRealVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
@@ -94 +93 @@
       Parameters.Add(BoundsParameter);
 
-      SolutionCreator = new UniformRandomRealVectorCreator();
       DiscoverOperators();
       RegisterParameterEvents();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMRandomCreator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -25 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("JobSequenceMatrixCreator", "Creator class used to create Job Sequence Matrix solutions for standard JobShop scheduling problems.")]
   [StorableType("F8053C69-31C2-4E05-8FA0-5AED15FAF804")]
-  public class JSMRandomCreator : ScheduleCreator<JSM>, IStochasticOperator {
+  public class JSMRandomCreator : ScheduleCreator<JSM>, IJSMOperator, IStochasticOperator {
 
     public ILookupParameter<IRandom> RandomParameter {

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JobSequenceMatrixEncoding.cs

@@ -43 +43 @@
     public JobSequenceMatrixEncoding()
       : base("JSM") {
-      SolutionCreator = new JSMRandomCreator();
       Decoder = new JSMDecoder();
       DiscoverOperators();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWRRandomCreator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PermutationWithRepetitionRandomCreator", "Creates PWR-individuals at random.")]
   [StorableType("6E753916-C0FD-4585-B6A6-47FD66ED098F")]
-  public class PWRRandomCreator : ScheduleCreator<PWR>, IStochasticOperator {
+  public class PWRRandomCreator : ScheduleCreator<PWR>, IPWROperator, IStochasticOperator {
 
     public ILookupParameter<IRandom> RandomParameter {

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PermutationWithRepetitionEncoding.cs

@@ -42 +42 @@
     public PermutationWithRepetitionEncoding()
       : base("PWR") {
-      SolutionCreator = new PWRRandomCreator();
       Decoder = new PWRDecoder();
       DiscoverOperators();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVRandomCreator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
   [Item("PriorityRulesRandomCreator", "Creator class used to create PRV encoding objects for scheduling problems.")]
   [StorableType("5FF2A11E-86F9-4A8B-8E1C-713D6801506C")]
-  public class PRVRandomCreator : ScheduleCreator<PRV>, IStochasticOperator {
+  public class PRVRandomCreator : ScheduleCreator<PRV>, IPRVOperator, IStochasticOperator {
 
     [Storable]

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PriorityRulesVectorEncoding.cs

@@ -65 +65 @@
       Parameters.Add(numberOfRulesParameter);
 
-      SolutionCreator = new PRVRandomCreator();
       Decoder = new PRVDecoder();
       DiscoverOperators();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding.cs

@@ -161 +161 @@
     }
 
-
     public override void ConfigureOperators(IEnumerable<IItem> operators) {
       base.ConfigureOperators(operators);

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleEncoding.cs

@@ -43 +43 @@
     public DirectScheduleEncoding()
       : base("Schedule") {
-      SolutionCreator = new DirectScheduleRandomCreator();
       Decoder = new DirectScheduleDecoder();
       DiscoverOperators();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs

@@ -177 +177 @@
       Parameters.Add(functionArgumentsParameter);
 
-      SolutionCreator = new ProbabilisticTreeCreator();
       RegisterParameterEvents();
       DiscoverOperators();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeMultiObjectiveProblem.cs

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   [StorableType("f4819c68-b6fc-469f-bcb5-cb5b2a9d8aff")]
   public abstract class SymbolicExpressionTreeMultiObjectiveProblem : MultiObjectiveProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
+    [Storable] private ReferenceParameter<IntValue> TreeLengthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<IntValue> TreeDepthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<ISymbolicExpressionGrammar> GrammarRefParameter { get; set; }
+
+    public int TreeLength {
+      get => TreeLengthRefParameter.Value.Value;
+      set => TreeLengthRefParameter.Value.Value = value;
+    }
+
+    public int TreeDepth {
+      get => TreeDepthRefParameter.Value.Value;
+      set => TreeDepthRefParameter.Value.Value = value;
+    }
+
+    public ISymbolicExpressionGrammar Grammar {
+      get => GrammarRefParameter.Value;
+      set => GrammarRefParameter.Value = value;
+    }
 
     // persistence
@@ -37 +57 @@
     protected SymbolicExpressionTreeMultiObjectiveProblem(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() { }
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
 
 
@@ -43 +65 @@
     protected SymbolicExpressionTreeMultiObjectiveProblem(SymbolicExpressionTreeMultiObjectiveProblem original, Cloner cloner)
       : base(original, cloner) {
+      TreeLengthRefParameter = cloner.Clone(original.TreeLengthRefParameter);
+      TreeDepthRefParameter = cloner.Clone(original.TreeDepthRefParameter);
+      GrammarRefParameter = cloner.Clone(original.GrammarRefParameter);
+      RegisterEventHandlers();
     }
 
@@ -48 +74 @@
       : base(encoding) {
       EncodingParameter.ReadOnly = true;
+      Parameters.Add(TreeLengthRefParameter = new ReferenceParameter<IntValue>("TreeLength", "The maximum amount of nodes.", Encoding.TreeLengthParameter));
+      Parameters.Add(TreeDepthRefParameter = new ReferenceParameter<IntValue>("TreeDepth", "The maximum depth of the tree.", Encoding.TreeDepthParameter));
+      Parameters.Add(GrammarRefParameter = new ReferenceParameter<ISymbolicExpressionGrammar>("Grammar", "The grammar that describes a valid tree.", Encoding.GrammarParameter));
+
+      Parameterize();
+      RegisterEventHandlers();
     }
 
@@ -59 +91 @@
     }
 
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
-      Parameterize();
-    }
-
     private void Parameterize() {
       foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
@@ -70 +97 @@
       }
     }
+
+    private void RegisterEventHandlers() {
+      IntValueParameterChangeHandler.Create(TreeLengthRefParameter, TreeLengthOnChanged);
+      IntValueParameterChangeHandler.Create(TreeDepthRefParameter, TreeDepthOnChanged);
+      ParameterChangeHandler<ISymbolicExpressionGrammar>.Create(GrammarRefParameter, GrammarOnChanged);
+    }
+
+    protected virtual void TreeLengthOnChanged() { }
+    protected virtual void TreeDepthOnChanged() { }
+    protected virtual void GrammarOnChanged() { }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs

@@ -29 +29 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   [StorableType("A1B9F4C8-5E29-493C-A483-2AC68453BC63")]
   public abstract class SymbolicExpressionTreeProblem : SingleObjectiveProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
+    [Storable] private ReferenceParameter<IntValue> TreeLengthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<IntValue> TreeDepthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<ISymbolicExpressionGrammar> GrammarRefParameter { get; set; }
+
+    public int TreeLength {
+      get => TreeLengthRefParameter.Value.Value;
+      set => TreeLengthRefParameter.Value.Value = value;
+    }
+
+    public int TreeDepth {
+      get => TreeDepthRefParameter.Value.Value;
+      set => TreeDepthRefParameter.Value.Value = value;
+    }
+
+    public ISymbolicExpressionGrammar Grammar {
+      get => GrammarRefParameter.Value;
+      set => GrammarRefParameter.Value = value;
+    }
 
     // persistence
@@ -38 +57 @@
     protected SymbolicExpressionTreeProblem(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() { }
-
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
 
     // cloning
     protected SymbolicExpressionTreeProblem(SymbolicExpressionTreeProblem original, Cloner cloner)
       : base(original, cloner) {
+      TreeLengthRefParameter = cloner.Clone(original.TreeLengthRefParameter);
+      TreeDepthRefParameter = cloner.Clone(original.TreeDepthRefParameter);
+      GrammarRefParameter = cloner.Clone(original.GrammarRefParameter);
+      RegisterEventHandlers();
     }
 
@@ -50 +74 @@
       : base(encoding) {
       EncodingParameter.ReadOnly = true;
+      Parameters.Add(TreeLengthRefParameter = new ReferenceParameter<IntValue>("TreeLength", "The maximum amount of nodes.", Encoding.TreeLengthParameter));
+      Parameters.Add(TreeDepthRefParameter = new ReferenceParameter<IntValue>("TreeDepth", "The maximum depth of the tree.", Encoding.TreeDepthParameter));
+      Parameters.Add(GrammarRefParameter = new ReferenceParameter<ISymbolicExpressionGrammar>("Grammar", "The grammar that describes a valid tree.", Encoding.GrammarParameter));
+
+      Parameterize();
+      RegisterEventHandlers();
     }
 
@@ -73 +103 @@
     }
 
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
-      Parameterize();
-    }
-
     private void Parameterize() {
       foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
@@ -84 +109 @@
       }
     }
+    private void RegisterEventHandlers() {
+      IntValueParameterChangeHandler.Create(TreeLengthRefParameter, TreeLengthOnChanged);
+      IntValueParameterChangeHandler.Create(TreeDepthRefParameter, TreeDepthOnChanged);
+      ParameterChangeHandler<ISymbolicExpressionGrammar>.Create(GrammarRefParameter, GrammarOnChanged);
+    }
+
+    protected virtual void TreeLengthOnChanged() { }
+    protected virtual void TreeDepthOnChanged() { }
+    protected virtual void GrammarOnChanged() { }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs

@@ -185 +185 @@
     protected override void DeregisterProblemEvents() {
       Problem.Reset -= new EventHandler(Problem_Reset);
+      Problem.OperatorsChanged -= new EventHandler(Problem_OperatorsChanged);
     }
     protected override void RegisterProblemEvents() {
       Problem.Reset += new EventHandler(Problem_Reset);
+      Problem.OperatorsChanged += new EventHandler(Problem_OperatorsChanged);
     }
     protected virtual void Problem_OperatorsChanged(object sender, EventArgs e) { }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/CombinedEncoding.cs

@@ -55 +55 @@
       : base("CombinedEncoding") {
       encodings = new ItemCollection<IEncoding>();
-      SolutionCreator = new MultiEncodingCreator() { SolutionParameter = { ActualName = Name } };
       foreach (var @operator in ApplicationManager.Manager.GetInstances<IMultiEncodingOperator>()) {
         @operator.SolutionParameter.ActualName = Name;

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -52 +52 @@
         encodingOperators.Clear();
         foreach (var op in value) encodingOperators.Add(op);
-
-        ISolutionCreator<TEncodedSolution> newSolutionCreator = (ISolutionCreator<TEncodedSolution>)encodingOperators.FirstOrDefault(o => o.GetType() == SolutionCreator.GetType()) ??
-                               encodingOperators.OfType<ISolutionCreator<TEncodedSolution>>().First();
-        SolutionCreator = newSolutionCreator;
         OnOperatorsChanged();
-      }
-    }
-
-    public IValueParameter SolutionCreatorParameter {
-      get { return (IValueParameter)Parameters[Name + ".SolutionCreator"]; }
-    }
-
-    ISolutionCreator IEncoding.SolutionCreator {
-      get { return SolutionCreator; }
-    }
-    public ISolutionCreator<TEncodedSolution> SolutionCreator {
-      get { return (ISolutionCreator<TEncodedSolution>)SolutionCreatorParameter.Value; }
-      set {
-        if (value == null) throw new ArgumentNullException("SolutionCreator must not be null.");
-        encodingOperators.Remove(SolutionCreator);
-        encodingOperators.Add(value);
-        SolutionCreatorParameter.Value = value;
-        OnSolutionCreatorChanged();
       }
     }
@@ -82 +60 @@
     protected Encoding(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEventHandlers();
-    }
+    private void AfterDeserialization() { }
 
     protected Encoding(Encoding<TEncodedSolution> original, Cloner cloner)
       : base(original, cloner) {
       encodingOperators = cloner.Clone(original.encodingOperators);
-
-      RegisterEventHandlers();
     }
 
     protected Encoding(string name)
       : base(name) {
-      Parameters.Add(new ValueParameter<ISolutionCreator<TEncodedSolution>>(name + ".SolutionCreator", "The operator to create a solution.") {
-        ReadOnly = true
-      });
       Parameters.Add(new FixedValueParameter<ReadOnlyItemSet<IOperator>>(name + ".Operators", "The operators that the encoding specifies.", encodingOperators.AsReadOnly()) {
         GetsCollected = false, ReadOnly = true
       });
-
-      RegisterEventHandlers();
-    }
-
-    private void RegisterEventHandlers() {
-      SolutionCreatorParameter.ValueChanged += (o, e) => OnSolutionCreatorChanged();
     }
 
@@ -137 +102 @@
     }
 
-    public event EventHandler SolutionCreatorChanged;
-    protected virtual void OnSolutionCreatorChanged() {
-      ConfigureOperator(SolutionCreator);
-      var handler = SolutionCreatorChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
     public event EventHandler OperatorsChanged;
     protected virtual void OnOperatorsChanged() {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IEncoding.cs

@@ -28 +28 @@
   [StorableType("d70b2675-246c-489c-a91b-b2e19a1616a3")]
   public interface IEncoding : IParameterizedNamedItem {
-    IValueParameter SolutionCreatorParameter { get; }
-    ISolutionCreator SolutionCreator { get; }
-
     IEnumerable<IOperator> Operators { get; set; }
 
@@ -37 +34 @@
 
     event EventHandler OperatorsChanged;
-    event EventHandler SolutionCreatorChanged;
   }
 

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblem.cs

@@ -40 +40 @@
   //TODO Intermediate class for compatibility 
   //TODO move members to generic IProblem after every problem used the new architecture
+  //TODO ABE: We can maybe use it as non-generic interface that exports IEncoding Encoding { get; }
+  //TODO ABE: and which is explicitely implemented in some base class
   public interface IEncodedProblem : IProblem {
     IEnumerable<IItem> Operators { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -57 +55 @@
     }
 
-    public override void AddEncoding(IEncoding encoding) {
-      base.AddEncoding(encoding);
-      var parameter = GetParameter(encoding);
-      parameter.Value = encoding.SolutionCreator;
-      encoding.SolutionCreatorChanged += Encoding_SolutionCreatorChanged;
-    }
-
-    public override bool RemoveEncoding(IEncoding encoding) {
-      var success = base.RemoveEncoding(encoding);
-      encoding.SolutionCreatorChanged -= Encoding_SolutionCreatorChanged;
-      return success;
-    }
-
-    private void Encoding_SolutionCreatorChanged(object sender, EventArgs e) {
-      var encoding = (IEncoding)sender;
-      var parameter = GetParameter(encoding);
-
-      var oldCreator = parameter.ValidValues.Single(creator => creator.GetType() == encoding.SolutionCreator.GetType());
-      parameter.ValidValues.Remove(oldCreator);
-      parameter.ValidValues.Add(encoding.SolutionCreator);
-      parameter.Value = encoding.SolutionCreator;
-    }
-
 
     public override IOperation InstrumentedApply() {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -37 +37 @@
     where TEvaluator : class, IEvaluator {
 
+    [Storable] protected ConstrainedValueParameter<ISolutionCreator> SolutionCreatorParameter { get; private set; }
 
     //TODO remove parameter for encoding?
@@ -52 +53 @@
     }
 
-
-    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
-      get { return Encoding.SolutionCreator; }
-    }
-    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
-      get { return Encoding.SolutionCreatorParameter; }
-    }
+    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator { get => SolutionCreatorParameter.Value; }
+    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter { get => SolutionCreatorParameter; }
+
     event EventHandler IHeuristicOptimizationProblem.SolutionCreatorChanged {
       add {
-        if (Encoding != null) Encoding.SolutionCreatorChanged += value;
+        SolutionCreatorParameter.ValueChanged += value;
       }
       remove {
-        if (Encoding != null) Encoding.SolutionCreatorChanged -= value;
+        SolutionCreatorParameter.ValueChanged -= value;
       }
     }
@@ -106 +103 @@
       Parameters.Add(new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any.", encoding) { Hidden = true });
       Parameters.Add(new ValueParameter<TEvaluator>("Evaluator", "The operator used to evaluate a solution.") { Hidden = true });
+      Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "The operator used to create a solution."));
 
       oldEncoding = Encoding;
@@ -116 +114 @@
       : base(original, cloner) {
       oldEncoding = cloner.Clone(original.oldEncoding);
+      SolutionCreatorParameter = cloner.Clone(original.SolutionCreatorParameter);
       RegisterEvents();
     }
@@ -124 +123 @@
     private void AfterDeserialization() {
       oldEncoding = Encoding;
+      // TODO: remove below
+      if (SolutionCreatorParameter == null) Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "The operator used to create a solution."));
+
       RegisterEvents();
     }
@@ -157 +159 @@
 
       Encoding.ConfigureOperators(Operators);
+
+      SolutionCreatorParameter.Repopulate(GetOperators());
       //var multiEncoding = Encoding as MultiEncoding;
       //if (multiEncoding != null) multiEncoding.EncodingsChanged += MultiEncodingOnEncodingsChanged;

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -57 +58 @@
     }
 
+    public override void Repopulate(IEnumerable<IItem> items) {
+      var itemsOfT = items.OfType<T>().ToList();
+      T oldItem = Value;
+      ValidValues.Clear();
+      T defaultItem = itemsOfT.FirstOrDefault();
+
+      foreach (T i in itemsOfT.OrderBy(x => x is INamedItem ? ((INamedItem)x).Name : x.ItemName))
+        ValidValues.Add(i);
+
+      if (oldItem != null) {
+        T item = ValidValues.FirstOrDefault(x => x.GetType() == oldItem.GetType());
+        if (item != null) Value = item;
+        else oldItem = null;
+      }
+      if (oldItem == null && defaultItem != null)
+        Value = defaultItem;
+    }
+
     protected override void ValidValues_ItemsAdded(object sender, CollectionItemsChangedEventArgs<T> e) {
       if (Value == null) Value = ValidValues.First();

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs

@@ -175 +175 @@
     }
 
+    public virtual void Repopulate(IEnumerable<IItem> items) {
+      var itemsOfT = items.OfType<T>().ToList();
+      T oldItem = Value;
+      ValidValues.Clear();
+
+      foreach (T i in itemsOfT.OrderBy(x => x is INamedItem ? ((INamedItem)x).Name : x.ItemName))
+        ValidValues.Add(i);
+
+      if (oldItem != null) {
+        T item = ValidValues.FirstOrDefault(x => x.GetType() == oldItem.GetType());
+        if (item != null) Value = item;
+      }
+    }
+
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ParameterChangeHandler.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Parameters {
-  public abstract class ParameterChangeHandler<TItem> where TItem : class, IItem {
+  public class ParameterChangeHandler<TItem> where TItem : class, IItem {
     protected Action handler;
 
@@ -37 +37 @@
       handler();
     }
+
+    public static ParameterChangeHandler<TItem> Create(IValueParameter<TItem> parameter, Action handler) {
+      return new ParameterChangeHandler<TItem>(parameter, handler);
+    }
   }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblemInstances.cs

@@ -41 +41 @@
   [StorableType("4ea0ded8-4451-4011-b88e-4d0680721b01")]
   public sealed class SingleObjectiveBinaryVectorExternalEvaluationProblem : ExternalEvaluationProblem<BinaryVectorEncoding, BinaryVector> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
 
     public int Dimension {
@@ -72 +71 @@
   [StorableType("46465e8c-11d8-4d02-8c45-de41a08db7fa")]
   public sealed class SingleObjectiveIntegerVectorExternalEvaluationProblem : ExternalEvaluationProblem<IntegerVectorEncoding, IntegerVector> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
-    [Storable] private ReferenceParameter<IntMatrix> BoundsRefParameter;
-    public IValueParameter<IntMatrix> BoundsParameter => BoundsRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
+    [Storable] private ReferenceParameter<IntMatrix> BoundsRefParameter { get; set; }
 
     public int Dimension {
@@ -112 +109 @@
   [StorableType("637f091f-6601-494e-bafb-2a8ea474210c")]
   public sealed class SingleObjectiveRealVectorExternalEvaluationProblem : ExternalEvaluationProblem<RealVectorEncoding, RealVector> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
-    [Storable] private ReferenceParameter<DoubleMatrix> BoundsRefParameter;
-    public IValueParameter<DoubleMatrix> BoundsParameter => BoundsRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
+    [Storable] private ReferenceParameter<DoubleMatrix> BoundsRefParameter { get; set; }
 
     public int Dimension {
@@ -152 +147 @@
   [StorableType("ad9d45f8-b97e-49a7-b3d2-487d9a2cbdf9")]
   public sealed class SingleObjectivePermutationExternalEvaluationProblem : ExternalEvaluationProblem<PermutationEncoding, Permutation> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
 
     public int Dimension {
@@ -183 +177 @@
   [StorableType("9b3ee4a8-7076-4edd-ae7e-4188bc49aaa3")]
   public sealed class SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem : ExternalEvaluationProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
+    [Storable] private ReferenceParameter<IntValue> TreeLengthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<IntValue> TreeDepthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<ISymbolicExpressionGrammar> GrammarRefParameter { get; set; }
+
+    public int TreeLength {
+      get => TreeLengthRefParameter.Value.Value;
+      set => TreeLengthRefParameter.Value.Value = value;
+    }
+
+    public int TreeDepth {
+      get => TreeDepthRefParameter.Value.Value;
+      set => TreeDepthRefParameter.Value.Value = value;
+    }
+
+    public ISymbolicExpressionGrammar Grammar {
+      get => GrammarRefParameter.Value;
+      set => GrammarRefParameter.Value = value;
+    }
 
     [StorableConstructor]
     private SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem(StorableConstructorFlag _) : base(_) { }
-    private SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem(SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem original, Cloner cloner) : base(original, cloner) { }
+    private SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem(SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem original, Cloner cloner)
+      : base(original, cloner) {
+      TreeLengthRefParameter = cloner.Clone(original.TreeLengthRefParameter);
+      TreeDepthRefParameter = cloner.Clone(original.TreeDepthRefParameter);
+      GrammarRefParameter = cloner.Clone(original.GrammarRefParameter);
+    }
 
     public SingleObjectiveSymbolicExpressionTreeExternalEvaluationProblem()
       : base(new SymbolicExpressionTreeEncoding()) {
-      // TODO: Change to ReferenceParameter
-      var lengthParameter = new FixedValueParameter<IntValue>("TreeLength", "The total amount of nodes.", new IntValue(50));
-      Parameters.Add(lengthParameter);
-      Encoding.TreeLengthParameter = lengthParameter;
-      var depthParameter = new FixedValueParameter<IntValue>("TreeDepth", "The depth of the tree.", new IntValue(10));
-      Parameters.Add(depthParameter);
-      Encoding.TreeDepthParameter = depthParameter;
+      Parameters.Add(TreeLengthRefParameter = new ReferenceParameter<IntValue>("TreeLength", "The maximum amount of nodes.", Encoding.TreeLengthParameter));
+      Parameters.Add(TreeDepthRefParameter = new ReferenceParameter<IntValue>("TreeDepth", "The maximum depth of the tree.", Encoding.TreeDepthParameter));
+      Parameters.Add(GrammarRefParameter = new ReferenceParameter<ISymbolicExpressionGrammar>("Grammar", "The grammar that describes a valid tree.", Encoding.GrammarParameter));
       // TODO: Add and parameterize additional operators, 
     }
@@ -210 +223 @@
   [StorableType("945a35d9-89a8-4423-9ea0-21829ac68887")]
   public sealed class SingleObjectiveLinearLinkageExternalEvaluationProblem : ExternalEvaluationProblem<LinearLinkageEncoding, LinearLinkage> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
 
     public int Dimension {
@@ -258 +270 @@
   [StorableType("f14c7e88-b74d-4cad-ae55-83daf7b4c288")]
   public sealed class MultiObjectiveBinaryVectorExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<BinaryVectorEncoding, BinaryVector> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
 
     public int Dimension {
@@ -289 +300 @@
   [StorableType("90a82c2f-6c37-4ffd-8495-bee278c583d3")]
   public sealed class MultiObjectiveIntegerVectorExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<IntegerVectorEncoding, IntegerVector> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
-    [Storable] private ReferenceParameter<IntMatrix> BoundsRefParameter;
-    public IValueParameter<IntMatrix> BoundsParameter => BoundsRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
+    [Storable] private ReferenceParameter<IntMatrix> BoundsRefParameter { get; set; }
 
     public int Dimension {
@@ -329 +338 @@
   [StorableType("38e1d068-d569-48c5-bad6-cbdd685b7c6b")]
   public sealed class MultiObjectiveRealVectorExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<RealVectorEncoding, RealVector> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
-    [Storable] private ReferenceParameter<DoubleMatrix> BoundsRefParameter;
-    public IValueParameter<DoubleMatrix> BoundsParameter => BoundsRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
+    [Storable] private ReferenceParameter<DoubleMatrix> BoundsRefParameter { get; set; }
 
     public int Dimension {
@@ -369 +376 @@
   [StorableType("f1b265b0-ac7c-4c36-b346-5b3f2c37694b")]
   public sealed class MultiObjectivePermutationExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<PermutationEncoding, Permutation> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
 
     public int Dimension {
@@ -400 +406 @@
   [StorableType("fb6834e2-2d56-4711-a3f8-5e0ab55cd040")]
   public sealed class MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
+    [Storable] private ReferenceParameter<IntValue> TreeLengthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<IntValue> TreeDepthRefParameter { get; set; }
+    [Storable] private ReferenceParameter<ISymbolicExpressionGrammar> GrammarRefParameter { get; set; }
+
+    public int TreeLength {
+      get => TreeLengthRefParameter.Value.Value;
+      set => TreeLengthRefParameter.Value.Value = value;
+    }
+
+    public int TreeDepth {
+      get => TreeDepthRefParameter.Value.Value;
+      set => TreeDepthRefParameter.Value.Value = value;
+    }
+
+    public ISymbolicExpressionGrammar Grammar {
+      get => GrammarRefParameter.Value;
+      set => GrammarRefParameter.Value = value;
+    }
 
     [StorableConstructor]
     private MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem(StorableConstructorFlag _) : base(_) { }
-    private MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem(MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem original, Cloner cloner) : base(original, cloner) { }
+    private MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem(MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem original, Cloner cloner)
+      : base(original, cloner) {
+      TreeLengthRefParameter = cloner.Clone(original.TreeLengthRefParameter);
+      TreeDepthRefParameter = cloner.Clone(original.TreeDepthRefParameter);
+      GrammarRefParameter = cloner.Clone(original.GrammarRefParameter);
+    }
 
     public MultiObjectiveSymbolicExpressionTreeExternalEvaluationProblem()
       : base(new SymbolicExpressionTreeEncoding()) {
-      // TODO: Change to ReferenceParameter
-      var lengthParameter = new FixedValueParameter<IntValue>("TreeLength", "The total amount of nodes.", new IntValue(50));
-      Parameters.Add(lengthParameter);
-      Encoding.TreeLengthParameter = lengthParameter;
-      var depthParameter = new FixedValueParameter<IntValue>("TreeDepth", "The depth of the tree.", new IntValue(10));
-      Parameters.Add(depthParameter);
-      Encoding.TreeDepthParameter = depthParameter;
+      Parameters.Add(TreeLengthRefParameter = new ReferenceParameter<IntValue>("TreeLength", "The maximum amount of nodes.", Encoding.TreeLengthParameter));
+      Parameters.Add(TreeDepthRefParameter = new ReferenceParameter<IntValue>("TreeDepth", "The maximum depth of the tree.", Encoding.TreeDepthParameter));
+      Parameters.Add(GrammarRefParameter = new ReferenceParameter<ISymbolicExpressionGrammar>("Grammar", "The grammar that describes a valid tree.", Encoding.GrammarParameter));
       // TODO: Add and parameterize additional operators, 
     }
@@ -427 +452 @@
   [StorableType("ed0c1129-651d-465f-87b0-f412f3e3b3d1")]
   public sealed class MultiObjectiveLinearLinkageExternalEvaluationProblem : MultiObjectiveExternalEvaluationProblem<LinearLinkageEncoding, LinearLinkage> {
-    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter;
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
+    [Storable] private ReferenceParameter<IntValue> DimensionRefParameter { get; set; }
 
     public int Dimension {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

@@ -165 +165 @@
 
     private void InitializeOperators() {
-      Encoding.SolutionCreator = new GreedyOrienteeringTourCreator() {
+      ISolutionCreator creator;
+      SolutionCreatorParameter.ValidValues.Add(creator = new GreedyOrienteeringTourCreator() {
         OrienteeringProblemDataParameter = { ActualName = OrienteeringProblemDataParameter.Name }
-      };
+      });
+      SolutionCreatorParameter.Value = creator;
+
       Operators.Add(new OrienteeringLocalImprovementOperator() {
         OrienteeringProblemDataParameter = { ActualName = OrienteeringProblemDataParameter.Name }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -186 +186 @@
         foreach (var c in calcs) {
           // TODO: unified encoding parameters
-          c.SolutionVariableName = ((IRealVectorSolutionOperator)Encoding.SolutionCreator).RealVectorParameter.ActualName;
+          c.SolutionVariableName = Encoding.Name;
           c.QualityVariableName = Evaluator.QualityParameter.ActualName;
           op.SimilarityCalculatorParameter.ValidValues.Add(c);
@@ -200 +200 @@
       foreach (var op in Operators.OfType<IRealVectorParticleCreator>()) {
         // TODO: unified encoding parameters
-        op.RealVectorParameter.ActualName = ((IRealVectorSolutionOperator)Encoding.SolutionCreator).RealVectorParameter.ActualName;
+        op.RealVectorParameter.ActualName = Encoding.Name;
         op.RealVectorParameter.Hidden = true;
         op.BoundsParameter.ActualName = BoundsRefParameter.Name;
@@ -207 +207 @@
       foreach (var op in Operators.OfType<IRealVectorParticleUpdater>()) {
         // TODO: unified encoding parameters
-        op.RealVectorParameter.ActualName = ((IRealVectorSolutionOperator)Encoding.SolutionCreator).RealVectorParameter.ActualName;
+        op.RealVectorParameter.ActualName = Encoding.Name;
         op.RealVectorParameter.Hidden = true;
         op.BoundsParameter.ActualName = BoundsRefParameter.Name;