Changeset 12018 for branches/ALPS/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

Timestamp:

02/16/15 20:14:52 (10 years ago)

Author:

pfleck

Message:

#2269

• merged trunk after 3.3.11 release
• updated copyright and plugin version in ALPS plugin
• removed old ALPS samples based on an userdefined alg

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs (modified) (4 diffs)

branches/ALPS/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -67 +67 @@
       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."));
       oldEncoding = Encoding;
+      if(Encoding != null) Parameterize();
       RegisterEvents();
     }
@@ -91 +92 @@
 
     protected virtual void OnEncodingChanged() {
+      Parameterize();
+
+      OnOperatorsChanged();
+      OnReset();
+    }
+
+    private void Parameterize() {
       if (oldEncoding != null) {
         AdaptEncodingOperators(oldEncoding, Encoding);
@@ -108 +116 @@
       Parameters.Remove(SolutionCreatorParameter);
       Parameters.Add(solutionCreatorParam);
-
-      //TODO register solution creator changed event, change access modifier to private
-      //((IValueParameter)solutionCreatorParam).ValueChanged += SolutionCreatorParameter_ValueChanged;      
+      ((IValueParameter)solutionCreatorParam).ValueChanged += SolutionCreatorParameter_ValueChanged;
 
       var multiEncoding = Encoding as MultiEncoding;
       if (multiEncoding != null) multiEncoding.EncodingsChanged += MultiEncodingOnEncodingsChanged;
-
-      OnOperatorsChanged();
-      OnReset();
     }