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

Timestamp:

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

Author:

pkimmesw

Message:

#2665 Made ErcOptions checkable

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/VectorConstantsErcValue.cs (modified) (2 diffs)

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

@@ -15 +15 @@
     private const string ConstantsParameterName = "Constants";
 
-    private readonly TValue[] arrays; // perf opt: avoid using parameter getter
+    protected VectorConstantsErcValue(params TValue[] arrays) : this(true, 1d, arrays) { }
 
-    protected VectorConstantsErcValue(params TValue[] arrays) : this(true, arrays) { }
-
-    protected VectorConstantsErcValue(bool isEnabled, params TValue[] arrays) {
-      this.arrays = arrays;
+    protected VectorConstantsErcValue(bool isEnabled, double weight = 1d, params TValue[] arrays) : base(isEnabled, weight) {
       IsEnabled = isEnabled;
       Parameters.Add(new ValueParameter<ItemCollection<TValue>>(ConstantsParameterName, new ItemCollection<TValue>(arrays)));
@@ -42 +39 @@
     public override IReadOnlyList<T> GetErcValue(IRandom random) {
       // TODO: remove ToList when ValueTypeArray implements IReadOnlyList
-      return arrays.SampleRandom(random).ToList();
+      return Constants.SampleRandom(random).ToArray();
     }
   }