Changeset 14909 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc

Timestamp:

05/03/17 01:31:10 (8 years ago)

Author:

pkimmesw

Message:

#2665 Fixed VectorExpression errors, Fixed BenchmarkSuite Problem Data View issues

Location:

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

Files:

• Float/FloatConstantErcValue.cs (modified) (1 diff)
• Integer/IntegerConstantErcValue.cs (modified) (1 diff)
• String/StringRandomErcValue.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/Float/FloatConstantErcValue.cs

@@ -7 +7 @@
   public class FloatConstantErcValue : ConstantsWeightedErcValue<double, DoubleArray> {
 
-    public FloatConstantErcValue() : this(new double[0]) { }
+    public FloatConstantErcValue() : this(false, 1d) { }
 
-    public FloatConstantErcValue(params double[] constants)
-      : base(new DoubleArray(constants)) {
+    public FloatConstantErcValue(params double[] constants) : this(true, 1d, constants) { }
+
+    public FloatConstantErcValue(bool isEnabled, double weight = 1d, params double[] constants)
+      : base(isEnabled, new DoubleArray(constants), weight) {
       Name = "Float constants";
     }

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

@@ -7 +7 @@
   public class IntegerConstantErcValue : ConstantsWeightedErcValue<int, IntArray> {
 
-    public IntegerConstantErcValue() : this(new int[0]) { }
+    public IntegerConstantErcValue() : this(false, 1d) { }
 
-    public IntegerConstantErcValue(params int[] constants)
-      : base(new IntArray(constants)) {
+    public IntegerConstantErcValue(params int[] constants) : this(true, 1d, constants) { }
+
+    public IntegerConstantErcValue(bool isEnabled, double weight = 1d, params int[] constants)
+      : base(isEnabled, new IntArray(constants), weight) {
       Name = "Integer constants";
     }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/String/StringRandomErcValue.cs

@@ -27 +27 @@
     private const string NewStringProbabilityParameterDescription = "The probability that the selection of the ephemeral random string constant for inclusion in randomly generated code will produce a new string (rather than a string that was previously generated).";
 
-    public StringRandomErcValue() : base(false, 1d) { }
+    public StringRandomErcValue() : this(false, 1d) { }
 
     public StringRandomErcValue(bool isEnabled, double weight = 1d) : base(isEnabled, weight) {