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

Timestamp:

06/01/17 09:28:34 (8 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

Location:

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

Files:

• String/StringRandomErc.cs (modified) (1 diff)
• StringVector/StringVectorConstantsErc.cs (modified) (1 diff)
• Views/ErcOptionsView.Designer.cs (modified) (3 diffs)
• Views/ErcOptionsView.cs (modified) (2 diffs)
• Views/ErcOptionsView.resx (modified) (1 diff)

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

@@ -49 +49 @@
 
     public override string GetErcValue(IRandom random) {
-      if (random.NextDouble().IsAlmost(NewStringProbability) || generatedValues.Count == 0) {
+      if (random.NextDouble() < NewStringProbability || generatedValues.Count == 0) {
         var value = StringGenerator.RandomString(
           AllowLowercaseLetters,

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

@@ -16 +16 @@
 
     public StringVectorConstantsErc() : this(false, 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.Designer.cs

@@ -34 +34 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(63, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(645, 20);
+      this.nameTextBox.Location = new System.Drawing.Point(75, 0);
+      this.nameTextBox.Size = new System.Drawing.Size(633, 20);
       //
       // infoLabel
@@ -54 +54 @@
       this.possibilityTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.possibilityTextBox.Location = new System.Drawing.Point(63, 25);
+      this.possibilityTextBox.Location = new System.Drawing.Point(75, 25);
       this.possibilityTextBox.Name = "possibilityTextBox";
-      this.possibilityTextBox.Size = new System.Drawing.Size(670, 20);
-      this.possibilityTextBox.TabIndex = 1;
+      this.possibilityTextBox.Size = new System.Drawing.Size(658, 20);
+      this.possibilityTextBox.TabIndex = 2;
       //
       // ErcOptionListView
@@ -69 +69 @@
       this.ErcOptionListView.Name = "ErcOptionListView";
       this.ErcOptionListView.ReadOnly = false;
+      this.ErcOptionListView.ShowDetails = true;
       this.ErcOptionListView.Size = new System.Drawing.Size(733, 434);
       this.ErcOptionListView.TabIndex = 3;

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

@@ -15 +15 @@
 
       possibilityTextBox.Validating += PossibilityTextBoxValidating;
+      possibilityTextBox.KeyDown += PossibilityTextBoxKeyDown;
+    }
+
+    private void PossibilityTextBoxKeyDown(object sender, System.Windows.Forms.KeyEventArgs e) {
+      if (e.KeyCode == System.Windows.Forms.Keys.Enter) {
+        Validate();
+      }
     }
 
     private void PossibilityTextBoxValidating(object sender, System.ComponentModel.CancelEventArgs e) {
+      var text = possibilityTextBox.Text.Trim();
+      if (text.EndsWith("%")) {
+        text = text.Substring(0, text.Length - 1);
+      }
+
       double value;
-      if (double.TryParse(possibilityTextBox.Text, out value)) {
-        possibilityTextBox.Text = value.ToString(PERCENTAGE_FORMAT);
+      if (double.TryParse(text, out value)) {
+        possibilityTextBox.Text = (value / 100.0).ToString(PERCENTAGE_FORMAT);
       } else {
-        possibilityTextBox.Text = "0 %";
+        possibilityTextBox.Text = "0%";
         e.Cancel = true;
       }
@@ -37 +49 @@
         base.Content = value;
       }
+    }
+
+    protected override void OnReadOnlyChanged() {
+      base.OnReadOnlyChanged();
+
+      possibilityTextBox.ReadOnly = ReadOnly;
     }
 

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

@@ -121 +121 @@
     <value>17, 17</value>
   </metadata>
-  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>140, 17</value>