Changeset 14905 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/Integer

Timestamp:

05/02/17 20:42:40 (8 years ago)

Author:

pkimmesw

Message:

#2665 Made ErcOptions checkable

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/Integer

Files:

• IntegerConstantErcValue.cs (modified) (1 diff)
• IntegerRangeErcValue.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/Integer/IntegerConstantErcValue.cs

@@ -17 +17 @@
     public IntegerConstantErcValue(bool deserializing) : base(deserializing) { }
 
-    public IntegerConstantErcValue(IntegerConstantErcValue origin, Cloner cloner) : base(origin, cloner) {
-    }
+    public IntegerConstantErcValue(IntegerConstantErcValue origin, Cloner cloner) : base(origin, cloner) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/Integer/IntegerRangeErcValue.cs

@@ -10 +10 @@
     private const string RangeParameterName = "Range";
 
-    public IntegerRangeErcValue() {
+    public IntegerRangeErcValue() : this(false, 0, 0) { }
+
+    public IntegerRangeErcValue(int start, int end) : this(true, start, end) { }
+
+    public IntegerRangeErcValue(bool isEnabled, int start, int end, double weight = 1d) : base(isEnabled, weight) {
       Name = "Integer range";
-      Parameters.Add(new FixedValueParameter<IntRange>(RangeParameterName));
-    }
-
-    public IntegerRangeErcValue(int start, int end) : this() {
-      Start = start;
-      End = end;
+      Parameters.Add(new FixedValueParameter<IntRange>(RangeParameterName, new IntRange(start, end)));
     }
 
     [StorableConstructor]
-    public IntegerRangeErcValue(bool deseralizing) : base(deseralizing) { }
+    protected IntegerRangeErcValue(bool deseralizing) : base(deseralizing) { }
 
     public IntegerRangeErcValue(IntegerRangeErcValue origin, Cloner cloner) : base(origin, cloner) { }