Changeset 14898 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base

Timestamp:

04/28/17 23:33:27 (7 years ago)

Author:

pkimmesw

Message:

#2665 Set name properties of ERC values

Location:

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

Files:

• Boolean/BooleanRandomErcValue.cs (modified) (1 diff)
• Float/FloatConstantErcValue.cs (modified) (1 diff)
• Float/FloatRangeErcValue.cs (modified) (1 diff)
• FloatVector/FloatVectorConstantsErcValue.cs (modified) (2 diffs)
• Integer/IntegerConstantErcValue.cs (modified) (1 diff)
• Integer/IntegerRangeErcValue.cs (modified) (1 diff)
• IntegerVector/IntegerVectorConstantsErcValue.cs (modified) (1 diff)
• String/StringConstantErcValue.cs (modified) (1 diff)
• String/StringRandomErcValue.cs (modified) (1 diff)
• StringVector/StringVectorConstantsErcValue.cs (modified) (2 diffs)
• VectorConstantsErcValue.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/Boolean/BooleanRandomErcValue.cs

@@ -21 +21 @@
       }
 
+      Name = "Boolean random";
       IsEnabled = isEnabled;
       Parameters.Add(new FixedValueParameter<BoolValue>(AllowTrueParameterName, new BoolValue(allowTrue)));

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

@@ -9 +9 @@
     public FloatConstantErcValue() : this(new double[0]) { }
 
-    public FloatConstantErcValue(params double[] constants) : base(new DoubleArray(constants)) { }
+    public FloatConstantErcValue(params double[] constants)
+      : base(new DoubleArray(constants)) {
+      Name = "Float constants";
+    }
 
     [StorableConstructor]

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

@@ -11 +11 @@
 
     public FloatRangeErcValue() {
+      Name = "Float range";
       this.Parameters.Add(new FixedValueParameter<DoubleRange>(RangeParameterName));
     }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/FloatVector/FloatVectorConstantsErcValue.cs

@@ -8 +8 @@
   [StorableClass]
   public class FloatVectorConstantsErcValue : VectorConstantsErcValue<double, DoubleArray> {
-    public FloatVectorConstantsErcValue() {
-    }
+    public FloatVectorConstantsErcValue() : this(new double[0][]) { }
 
     public FloatVectorConstantsErcValue(params double[][] values)
@@ -17 +16 @@
     public FloatVectorConstantsErcValue(bool isEnabled, params double[][] values)
       : base(isEnabled, values.Select(v => new DoubleArray(v)).ToArray()) {
+      Name = "Float vector constants";
     }
 

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

@@ -9 +9 @@
     public IntegerConstantErcValue() : this(new int[0]) { }
 
-    public IntegerConstantErcValue(params int[] constants) : base(new IntArray(constants)) { }
+    public IntegerConstantErcValue(params int[] constants)
+      : base(new IntArray(constants)) {
+      Name = "Integer constants";
+    }
 
     [StorableConstructor]

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

@@ -11 +11 @@
 
     public IntegerRangeErcValue() {
-      this.Parameters.Add(new FixedValueParameter<IntRange>(RangeParameterName));
+      Name = "Integer range";
+      Parameters.Add(new FixedValueParameter<IntRange>(RangeParameterName));
     }
 
     public IntegerRangeErcValue(int start, int end) : this() {
-      this.Start = start;
-      this.End = end;
+      Start = start;
+      End = end;
     }
 

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/IntegerVector/IntegerVectorConstantsErcValue.cs

@@ -8 +8 @@
   [StorableClass]
   public class IntegerVectorConstantsErcValue : VectorConstantsErcValue<int, IntArray> {
-    public IntegerVectorConstantsErcValue() {
-    }
+    public IntegerVectorConstantsErcValue() : this(new int[0][]) { }
 
-    public IntegerVectorConstantsErcValue(params int[][] values)
-      : this(true, values) {
-    }
+    public IntegerVectorConstantsErcValue(params int[][] values) : this(true, values) { }
 
     public IntegerVectorConstantsErcValue(bool isEnabled, params int[][] values)
       : base(isEnabled, values.Select(v => new IntArray(v)).ToArray()) {
+      Name = "Integer vector constants";
     }
 

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

@@ -17 +17 @@
 
     public StringConstantErcValue(params string[] constants) {
+      Name = "String constants";
       array = new StringArray(constants);
       Parameters.Add(new FixedValueParameter<StringArray>(ConstantsParameterName, array));

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

@@ -28 +28 @@
 
     public StringRandomErcValue() {
+      Name = "String random";
       Parameters.Add(new FixedValueParameter<BoolValue>(AllowLowercaseLettersParameterName, new BoolValue(true)));
       Parameters.Add(new FixedValueParameter<BoolValue>(AllowUppercaseLettersParameterName, new BoolValue(true)));

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/StringVector/StringVectorConstantsErcValue.cs

@@ -17 +17 @@
     private readonly StringArray[] arrays; // perf opt: avoid using parameter getter
 
+    public StringVectorConstantsErcValue() : this(false, new StringArray[0]) { }
+
     public StringVectorConstantsErcValue(params StringArray[] arrays) : this(true, arrays) { }
 
     public StringVectorConstantsErcValue(bool isEnabled, params StringArray[] arrays) {
       this.arrays = arrays;
+      Name = "String vector constants";
       IsEnabled = isEnabled;
-      Parameters.Add(new ValueParameter<ItemArray<StringArray>>(ConstantsParameterName, new ItemArray<StringArray>(arrays)));
+      Parameters.Add(new ValueParameter<ItemCollection<StringArray>>(ConstantsParameterName, new ItemCollection<StringArray>(arrays)));
     }
 
@@ -30 +33 @@
     public StringVectorConstantsErcValue(StringVectorConstantsErcValue origin, Cloner cloner) : base(origin, cloner) { }
 
-    public IValueParameter<ItemArray<StringArray>> ConstantsParameter
+    public IValueParameter<ItemCollection<StringArray>> ConstantsParameter
     {
-      get { return (IValueParameter<ItemArray<StringArray>>)Parameters[ConstantsParameterName]; }
+      get { return (IValueParameter<ItemCollection<StringArray>>)Parameters[ConstantsParameterName]; }
     }
 

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

@@ -22 +22 @@
       this.arrays = arrays;
       IsEnabled = isEnabled;
-      Parameters.Add(new ValueParameter<ItemArray<TValue>>(ConstantsParameterName, new ItemArray<TValue>(arrays)));
+      Parameters.Add(new ValueParameter<ItemCollection<TValue>>(ConstantsParameterName, new ItemCollection<TValue>(arrays)));
     }
 
@@ -30 +30 @@
     protected VectorConstantsErcValue(VectorConstantsErcValue<T, TValue> origin, Cloner cloner) : base(origin, cloner) { }
 
-    public IValueParameter<ItemArray<TValue>> ConstantsParameter
+    public IValueParameter<ItemCollection<TValue>> ConstantsParameter
     {
-      get { return (IValueParameter<ItemArray<TValue>>)Parameters[ConstantsParameterName]; }
+      get { return (IValueParameter<ItemCollection<TValue>>)Parameters[ConstantsParameterName]; }
     }