Changeset 17778 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean

Timestamp:

10/29/20 14:44:19 (4 years ago)

Author:

abeham

Message:

#2521: working on refactoring

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean

Files:

• EvenParityProblem.cs (modified) (3 diffs)
• MultiplexerProblem.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/EvenParityProblem.cs

@@ -39 +39 @@
   public sealed class EvenParityProblem : SymbolicExpressionTreeProblem {
 
-    #region parameter names
-    private const string NumberOfBitsParameterName = "NumberOfBits";
-    #endregion
-
     #region Parameter Properties
-    public IFixedValueParameter<IntValue> NumberOfBitsParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[NumberOfBitsParameterName]; }
-    }
+    [Storable] public IFixedValueParameter<IntValue> NumberOfBitsParameter { get; private set; }
     #endregion
 
@@ -68 +62 @@
     private EvenParityProblem(EvenParityProblem original, Cloner cloner)
       : base(original, cloner) {
+      NumberOfBitsParameter = cloner.Clone(original.NumberOfBitsParameter);
       RegisterEventHandlers();
     }
@@ -78 +73 @@
       : base(new SymbolicExpressionTreeEncoding()) {
       Maximization = true;
-      Parameters.Add(new FixedValueParameter<IntValue>(NumberOfBitsParameterName, "The number of bits for the input parameter for the even parity function", new IntValue(4)));
+      Parameters.Add(NumberOfBitsParameter = new FixedValueParameter<IntValue>("NumberOfBits", "The number of bits for the input parameter for the even parity function", new IntValue(4)));
 
       Encoding.TreeLength = 100;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/MultiplexerProblem.cs

@@ -41 +41 @@
   public sealed class MultiplexerProblem : SymbolicExpressionTreeProblem {
 
-    #region parameter names
-    private const string NumberOfBitsParameterName = "NumberOfBits";
-    #endregion
-
     #region Parameter Properties
-    public IFixedValueParameter<IntValue> NumberOfBitsParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[NumberOfBitsParameterName]; }
-    }
+    [Storable] public IFixedValueParameter<IntValue> NumberOfBitsParameter { get; private set; }
     #endregion
 
@@ -70 +64 @@
     private MultiplexerProblem(MultiplexerProblem original, Cloner cloner)
       : base(original, cloner) {
+      NumberOfBitsParameter = cloner.Clone(original.NumberOfBitsParameter);
       RegisterEventHandlers();
     }
@@ -81 +76 @@
       : base(new SymbolicExpressionTreeEncoding()) {
       Maximization = true;
-      Parameters.Add(new FixedValueParameter<IntValue>(NumberOfBitsParameterName,
+      Parameters.Add(NumberOfBitsParameter = new FixedValueParameter<IntValue>("NumberOfBits",
         "The number of bits for the input parameter for the multiplexer function. This is the sum of the number of address bits and the number of input lines. E.g. the 11-MUX has 3 address bits and 8 input lines",
         new IntValue(11)));