Changeset 12266 for branches/SymbolicExpressionTreeEncoding/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs

Timestamp:

03/30/15 12:28:56 (10 years ago)

Author:

mkommend

Message:

#2320: Corrected event registration in SymbolicExpressionTreeEncoding.

File:

• branches/SymbolicExpressionTreeEncoding/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs (modified) (8 diffs)

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

@@ -51 +51 @@
         treeLengthParameter = value;
         Parameters.Add(treeLengthParameter);
+        OnLengthParameterChanged();
       }
     }
@@ -68 +69 @@
         treeDepthParameter = value;
         Parameters.Add(treeDepthParameter);
+        OnDepthParameterChanged();
       }
     }
@@ -75 +77 @@
     [StorableConstructor]
     public SymbolicExpressionTreeEncoding(bool deserializing) : base(deserializing) { }
-
-    public SymbolicExpressionTreeEncoding(Encoding<ISymbolicExpressionTreeCreator> original, Cloner cloner)
-      : base(original, cloner) {
-    }
-
     public SymbolicExpressionTreeEncoding() : this("SymbolicExpressionTree") { }
     public SymbolicExpressionTreeEncoding(string name) : base(name) { }
@@ -85 +82 @@
     private SymbolicExpressionTreeEncoding(SymbolicExpressionTreeEncoding original, Cloner cloner)
       : base(original, cloner) {
+      TreeLengthParameter = cloner.Clone(original.TreeLengthParameter);
+      TreeDepthParameter = cloner.Clone(original.TreeDepthParameter);
     }
 
@@ -91 +90 @@
     }
 
-    public override void ConfigureOperators(IEnumerable<IOperator> operators) {
-      ConfigureCreators(operators.OfType<ISymbolicExpressionTreeCreator>());
-      ConfigureCrossovers(operators.OfType<ISymbolicExpressionTreeCrossover>());
-      ConfigureManipulators(operators.OfType<ISymbolicExpressionTreeManipulator>());
-    }
+  
 
     private void OnLengthParameterChanged() {
@@ -105 +100 @@
       RegisterDepthParameterEvents();
       ConfigureOperators(Operators);
+    }
+
+    private void RegisterEvents() {
+      RegisterLengthParameterEvents();
+      RegisterLengthParameterEvents();
     }
 
@@ -119 +119 @@
     #region Operator discovery
     private static readonly IEnumerable<Type> encodingSpecificOperatorTypes;
-
     static SymbolicExpressionTreeEncoding() {
       encodingSpecificOperatorTypes = new List<Type>
@@ -143 +142 @@
 
     #region Specific operator wiring
+
+    public override void ConfigureOperators(IEnumerable<IOperator> operators) {
+      ConfigureCreators(operators.OfType<ISymbolicExpressionTreeCreator>());
+      ConfigureCrossovers(operators.OfType<ISymbolicExpressionTreeCrossover>());
+      ConfigureManipulators(operators.OfType<ISymbolicExpressionTreeManipulator>());
+    }
+
     private void ConfigureCreators(IEnumerable<ISymbolicExpressionTreeCreator> creators) {
       foreach (var creator in creators) {