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

Timestamp:

06/12/17 14:11:43 (8 years ago)

Author:

pkimmesw

Message:

#2665 Fixed bias 0 issue, PushExpressionFrequencyAnalyzer, Fixed probability for ERC settings, Fixed enable/disable instructions, Added expression descriptions

Location:

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

Files:

• Boolean/BooleanRandomErc.cs (modified) (1 diff)
• Float/FloatConstantErc.cs (modified) (1 diff)
• Float/FloatRangeErc.cs (modified) (1 diff)
• Integer/IntegerConstantErc.cs (modified) (1 diff)
• Integer/IntegerRangeErc.cs (modified) (1 diff)
• String/StringConstantErc.cs (modified) (1 diff)
• String/StringRandomErc.cs (modified) (1 diff)
• StringVector/StringVectorConstantsErc.cs (modified) (1 diff)
• Views/ErcOptionsView.cs (modified) (1 diff)

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

@@ -14 +14 @@
     private const string AllowFalseParameterName = "Allow false";
 
-    public BooleanRandomErc() : this(false, true, true) { }
+    public BooleanRandomErc() : this(true, true, true) { }
 
     public BooleanRandomErc(bool isEnabled, bool allowTrue, bool allowFalse, double weight = 1d) : base(isEnabled, weight) {

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

@@ -7 +7 @@
   public class FloatConstantErc : ConstantsWeightedErc<double, DoubleArray> {
 
-    public FloatConstantErc() : this(false, 1d) { }
+    public FloatConstantErc() : this(true, 1d) { }
 
     public FloatConstantErc(params double[] constants) : this(true, 1d, constants) { }

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

@@ -10 +10 @@
     private const string RangeParameterName = "Range";
 
-    public FloatRangeErc() : this(false, 0d, 0d) { }
+    public FloatRangeErc() : this(true, 0d, 0d) { }
 
     public FloatRangeErc(double start, double end) : this(true, start, end) { }

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

@@ -7 +7 @@
   public class IntegerConstantErc : ConstantsWeightedErc<int, IntArray> {
 
-    public IntegerConstantErc() : this(false, 1d) { }
+    public IntegerConstantErc() : this(true, 1d) { }
 
     public IntegerConstantErc(params int[] constants) : this(true, 1d, constants) { }

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

@@ -10 +10 @@
     private const string RangeParameterName = "Range";
 
-    public IntegerRangeErc() : this(false, 0, 0) { }
+    public IntegerRangeErc() : this(true, 0, 0) { }
 
     public IntegerRangeErc(int start, int end) : this(true, start, end) { }

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

@@ -12 +12 @@
     private const string ConstantsParameterName = "Constants";
 
-    public StringConstantErc() : this(false, 1d) { }
+    public StringConstantErc() : this(true, 1d) { }
 
     public StringConstantErc(params string[] constants) : this(true, 1d, constants) { }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/String/StringRandomErc.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 StringRandomErc() : this(false, 1d) { }
+    public StringRandomErc() : this(true, 1d) { }
 
     public StringRandomErc(bool isEnabled, double weight = 1d) : base(isEnabled, weight) {

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

@@ -15 +15 @@
     private const string ConstantsParameterName = "Constants";
 
-    public StringVectorConstantsErc() : this(false, 1d) { }
+    public StringVectorConstantsErc() : this(true, 1d) { }
     public StringVectorConstantsErc(params string[][] arrays) : this(true, 1d, arrays.Select(x => new StringArray(x)).ToArray()) { }
     public StringVectorConstantsErc(params StringArray[] arrays) : this(true, 1d, arrays) { }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/Views/ErcOptionsView.cs

@@ -32 +32 @@
       double value;
       if (double.TryParse(text, out value)) {
-        possibilityTextBox.Text = (value / 100.0).ToString(PERCENTAGE_FORMAT);
+        if (value > 1) value /= 100.0;
+        possibilityTextBox.Text = value.ToString(PERCENTAGE_FORMAT);
       } else {
         possibilityTextBox.Text = "0%";