Changeset 98

Timestamp:

03/25/08 11:50:17 (16 years ago)

Author:

abeham

Message:

Added the DampeningFactor as variable as well so that Success Rule adjustment is completely configurable (ref ticket #77)

Location:

trunk/sources/HeuristicLab.ES

Files:

• ES.cs (modified) (2 diffs)
• ESEditor.Designer.cs (modified) (7 diffs)
• ESEditor.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.ES/ES.cs

@@ -384 +384 @@
     public int Seed {
       get { return mySeed.Data; }
-      set { mySeed.Data = value; }
+      set {
+        mySeed.Data = value;
+        OnChanged();
+      }
     }
     private IntData myMu;
@@ -586 +589 @@
       mySuccessProbability = vi.GetVariable("SuccessProbability").GetValue<DoubleData>();
       myLearningRate = vi.GetVariable("LearningRate").GetValue<DoubleData>();
+      myDampeningFactor = vi.GetVariable("DampeningFactor").GetValue<DoubleData>();
       myUseSuccessRule = vi.GetVariable("UseSuccessRule").GetValue<BoolData>();
       // Population Initialization

trunk/sources/HeuristicLab.ES/ESEditor.Designer.cs

@@ -50 +50 @@
       this.parametersTabPage = new System.Windows.Forms.TabPage();
       this.successRuleGroupBox = new System.Windows.Forms.GroupBox();
+      this.dampeningFactorTextBox = new System.Windows.Forms.TextBox();
+      this.dampeningFactorLabel = new System.Windows.Forms.Label();
       this.learningRateTextBox = new System.Windows.Forms.TextBox();
       this.label1 = new System.Windows.Forms.Label();
@@ -97 +99 @@
       this.resetButton = new System.Windows.Forms.Button();
       this.cloneEngineButton = new System.Windows.Forms.Button();
-      this.dampeningFactorLabel = new System.Windows.Forms.Label();
-      this.dampeningFactorTextBox = new System.Windows.Forms.TextBox();
       this.tabControl.SuspendLayout();
       this.parametersTabPage.SuspendLayout();
@@ -193 +193 @@
       this.successRuleGroupBox.Text = "Success Rule Mutation Strength Adjustment";
       // 
+      // dampeningFactorTextBox
+      // 
+      this.dampeningFactorTextBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.dampeningFactorTextBox.Location = new System.Drawing.Point(150, 71);
+      this.dampeningFactorTextBox.Name = "dampeningFactorTextBox";
+      this.dampeningFactorTextBox.Size = new System.Drawing.Size(180, 20);
+      this.dampeningFactorTextBox.TabIndex = 19;
+      // 
+      // dampeningFactorLabel
+      // 
+      this.dampeningFactorLabel.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.dampeningFactorLabel.AutoSize = true;
+      this.dampeningFactorLabel.Location = new System.Drawing.Point(7, 74);
+      this.dampeningFactorLabel.Name = "dampeningFactorLabel";
+      this.dampeningFactorLabel.Size = new System.Drawing.Size(97, 13);
+      this.dampeningFactorLabel.TabIndex = 18;
+      this.dampeningFactorLabel.Text = "Dampening Factor:";
+      // 
       // learningRateTextBox
       // 
@@ -330 +348 @@
       this.useSuccessRuleCheckBox.Checked = true;
       this.useSuccessRuleCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.useSuccessRuleCheckBox.Location = new System.Drawing.Point(410, 235);
+      this.useSuccessRuleCheckBox.Location = new System.Drawing.Point(410, 248);
       this.useSuccessRuleCheckBox.Name = "useSuccessRuleCheckBox";
       this.useSuccessRuleCheckBox.Size = new System.Drawing.Size(51, 17);
@@ -618 +636 @@
       this.scopesTabPage.Name = "scopesTabPage";
       this.scopesTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.scopesTabPage.Size = new System.Drawing.Size(518, 477);
+      this.scopesTabPage.Size = new System.Drawing.Size(518, 497);
       this.scopesTabPage.TabIndex = 2;
       this.scopesTabPage.Text = "Scopes";
@@ -630 +648 @@
       this.scopeView.Name = "scopeView";
       this.scopeView.Scope = null;
-      this.scopeView.Size = new System.Drawing.Size(512, 471);
+      this.scopeView.Size = new System.Drawing.Size(512, 491);
       this.scopeView.TabIndex = 0;
       // 
@@ -666 +684 @@
       this.cloneEngineButton.UseVisualStyleBackColor = true;
       this.cloneEngineButton.Click += new System.EventHandler(this.cloneEngineButton_Click);
-      // 
-      // dampeningFactorLabel
-      // 
-      this.dampeningFactorLabel.Anchor = System.Windows.Forms.AnchorStyles.Top;
-      this.dampeningFactorLabel.AutoSize = true;
-      this.dampeningFactorLabel.Location = new System.Drawing.Point(7, 74);
-      this.dampeningFactorLabel.Name = "dampeningFactorLabel";
-      this.dampeningFactorLabel.Size = new System.Drawing.Size(97, 13);
-      this.dampeningFactorLabel.TabIndex = 18;
-      this.dampeningFactorLabel.Text = "Dampening Factor:";
-      // 
-      // dampeningFactorTextBox
-      // 
-      this.dampeningFactorTextBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
-      this.dampeningFactorTextBox.Location = new System.Drawing.Point(150, 71);
-      this.dampeningFactorTextBox.Name = "dampeningFactorTextBox";
-      this.dampeningFactorTextBox.Size = new System.Drawing.Size(180, 20);
-      this.dampeningFactorTextBox.TabIndex = 19;
       // 
       // ESEditor

trunk/sources/HeuristicLab.ES/ESEditor.cs

@@ -65 +65 @@
     void ES_Changed(object sender, EventArgs e) {
       // neither Refresh() nor Update() work
+      randomSeedTextBox.Text = ES.Seed.ToString();
       muTextBox.Text = ES.Mu.ToString();
       rhoTextBox.Text = ES.Rho.ToString();
@@ -95 +96 @@
       targetSuccessRateTextBox.DataBindings.Add("Text", ES, "SuccessProbability");
       learningRateTextBox.DataBindings.Add("Text", ES, "LearningRate");
+      dampeningFactorTextBox.DataBindings.Add("Text", ES, "DampeningFactor");
       useSuccessRuleCheckBox.DataBindings.Add("Checked", ES, "UseSuccessRule");
     }
@@ -204 +206 @@
       targetSuccessRateTextBox.Enabled = useSuccessRuleCheckBox.Checked;
       learningRateTextBox.Enabled = useSuccessRuleCheckBox.Checked;
+      dampeningFactorTextBox.Enabled = useSuccessRuleCheckBox.Checked;
     }
     #endregion