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

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/String

Files:

• StringConstantErcValue.cs (modified) (4 diffs)
• StringRandomErcValue.cs (modified) (1 diff)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Base.Erc.String {
-  using System.Collections.Generic;
 
   using HeuristicLab.Common;
@@ -12 +11 @@
 
     private const string ConstantsParameterName = "Constants";
-    private readonly StringArray array; // perf opt: reduce parameter getter usage
 
-    public StringConstantErcValue() : this(new string[0]) { }
+    public StringConstantErcValue() : this(false, 1d) { }
 
-    public StringConstantErcValue(params string[] constants) {
+    public StringConstantErcValue(params string[] constants) : this(true, 1d, constants) { }
+
+    public StringConstantErcValue(bool isEnabled, double weight = 1d, params string[] constants) : base(isEnabled, weight) {
       Name = "String constants";
-      array = new StringArray(constants);
-      Parameters.Add(new FixedValueParameter<StringArray>(ConstantsParameterName, array));
+      Parameters.Add(new FixedValueParameter<StringArray>(ConstantsParameterName, new StringArray(constants)));
     }
 
@@ -34 +33 @@
     }
 
-    public IEnumerable<string> Constants
+    public StringArray Constants
     {
       get { return ConstantsParameter.Value; }
@@ -44 +43 @@
 
     public override string GetErcValue(IRandom random) {
-      var x = random.Next(array.Length);
-      return array[x];
+      if (Constants.Length == 0) return string.Empty;
+
+      var x = random.Next(Constants.Length);
+      return Constants[x];
     }
   }

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() {
+    public StringRandomErcValue() : base(false, 1d) { }
+
+    public StringRandomErcValue(bool isEnabled, double weight = 1d) : base(isEnabled, weight) {
       Name = "String random";
       Parameters.Add(new FixedValueParameter<BoolValue>(AllowLowercaseLettersParameterName, new BoolValue(true)));