Changeset 81 for trunk

Timestamp:

03/19/08 13:32:00 (16 years ago)

Author:

abeham

Message:

fixed #61 regarding ES

Location:

trunk/sources/HeuristicLab.ES

Files:

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

trunk/sources/HeuristicLab.ES/ES.cs

@@ -104 +104 @@
       vi.AddVariable(new Variable("TargetSuccessProbability", new DoubleData(0.2)));
       vi.AddVariable(new Variable("SuccessProbability", new DoubleData(0.2)));
+      vi.AddVariable(new Variable("UseSuccessRule", new BoolData(true)));
       op.OperatorGraph.AddOperator(vi);
       sp.AddSubOperator(vi);
@@ -249 +250 @@
       op.OperatorGraph.InitialOperator = sp1;
 
+      ConditionalBranch cb = new ConditionalBranch();
+      cb.GetVariableInfo("Condition").ActualName = "UseSuccessRule";
+      op.OperatorGraph.AddOperator(cb);
+      sp1.AddSubOperator(cb);
+
+      SequentialProcessor sp2 = new SequentialProcessor();
+      op.OperatorGraph.AddOperator(sp2);
+      cb.AddSubOperator(sp2);
+
       OffspringAnalyzer oa = new OffspringAnalyzer();
       oa.Name = "Offspring Analyzer";
@@ -254 +264 @@
       oa.GetVariable("ComparisonFactor").Value = new DoubleData(0.0);
       op.OperatorGraph.AddOperator(oa);
-      sp1.AddSubOperator(oa);
+      sp2.AddSubOperator(oa);
 
       UniformSequentialSubScopesProcessor ussp = new UniformSequentialSubScopesProcessor();
       op.OperatorGraph.AddOperator(ussp);
       oa.AddSubOperator(ussp);
-
-      SequentialProcessor sp2 = new SequentialProcessor();
-      op.OperatorGraph.AddOperator(sp2);
-      ussp.AddSubOperator(sp2);
+      cb.AddSubOperator(ussp);
+
+      SequentialProcessor sp3 = new SequentialProcessor();
+      op.OperatorGraph.AddOperator(sp3);
+      ussp.AddSubOperator(sp3);
 
       OperatorExtractor oe1 = new OperatorExtractor();
@@ -268 +279 @@
       oe1.GetVariableInfo("Operator").ActualName = "Mutator";
       op.OperatorGraph.AddOperator(oe1);
-      sp2.AddSubOperator(oe1);
+      sp3.AddSubOperator(oe1);
 
       OperatorExtractor oe2 = new OperatorExtractor();
@@ -274 +285 @@
       oe2.GetVariableInfo("Operator").ActualName = "Evaluator";
       op.OperatorGraph.AddOperator(oe2);
-      sp2.AddSubOperator(oe2);
+      sp3.AddSubOperator(oe2);
 
       Counter c = new Counter();
       c.GetVariableInfo("Value").ActualName = "EvaluatedSolutions";
       op.OperatorGraph.AddOperator(c);
-      sp2.AddSubOperator(c);
+      sp3.AddSubOperator(c);
 
       SuccessRuleMutationStrengthAdjuster srmsa = new SuccessRuleMutationStrengthAdjuster();
       srmsa.Name = "SuccessRuleMutationStrengthAdjuster";
       op.OperatorGraph.AddOperator(srmsa);
-      sp1.AddSubOperator(srmsa);
+      sp2.AddSubOperator(srmsa);
 
       return op;
@@ -392 +403 @@
       get { return myMaximumGenerations.Data; }
       set { myMaximumGenerations.Data = value; }
+    }
+    private BoolData myUseSuccessRule;
+    public bool UseSuccessRule {
+      get { return myUseSuccessRule.Data; }
+      set { myUseSuccessRule.Data = value; }
     }
     private CombinedOperator myES;
@@ -481 +497 @@
       myTargetSuccessProbability = vi.GetVariable("TargetSuccessProbability").GetValue<DoubleData>();
       mySuccessProbability = vi.GetVariable("SuccessProbability").GetValue<DoubleData>();
+      myUseSuccessRule = vi.GetVariable("UseSuccessRule").GetValue<BoolData>();
       // Population Initialization
       CombinedOperator co3 = (CombinedOperator)sp1.SubOperators[1];

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

@@ -86 +86 @@
       this.resetButton = new System.Windows.Forms.Button();
       this.cloneEngineButton = new System.Windows.Forms.Button();
+      this.useSuccessRuleCheckBox = new System.Windows.Forms.CheckBox();
       this.tabControl.SuspendLayout();
       this.parametersTabPage.SuspendLayout();
@@ -117 +118 @@
       // parametersTabPage
       // 
+      this.parametersTabPage.Controls.Add(this.useSuccessRuleCheckBox);
       this.parametersTabPage.Controls.Add(this.targetSuccessRateTextBox);
       this.parametersTabPage.Controls.Add(this.targetSuccessRateLabel);
@@ -525 +527 @@
       this.cloneEngineButton.UseVisualStyleBackColor = true;
       this.cloneEngineButton.Click += new System.EventHandler(this.cloneEngineButton_Click);
+      // 
+      // useSuccessRuleMutationStrengthAdjustmentCheckBox
+      // 
+      this.useSuccessRuleCheckBox.Anchor = System.Windows.Forms.AnchorStyles.None;
+      this.useSuccessRuleCheckBox.AutoSize = true;
+      this.useSuccessRuleCheckBox.Checked = true;
+      this.useSuccessRuleCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+      this.useSuccessRuleCheckBox.Location = new System.Drawing.Point(411, 184);
+      this.useSuccessRuleCheckBox.Name = "useSuccessRuleMutationStrengthAdjustmentCheckBox";
+      this.useSuccessRuleCheckBox.Size = new System.Drawing.Size(51, 17);
+      this.useSuccessRuleCheckBox.TabIndex = 40;
+      this.useSuccessRuleCheckBox.Text = "Use?";
+      this.useSuccessRuleCheckBox.UseVisualStyleBackColor = true;
+      this.useSuccessRuleCheckBox.CheckedChanged += new System.EventHandler(this.useSuccessRuleCheckBox_CheckedChanged);
       // 
       // ESEditor
@@ -587 +603 @@
     private System.Windows.Forms.TextBox targetSuccessRateTextBox;
     private System.Windows.Forms.Label targetSuccessRateLabel;
+    private System.Windows.Forms.CheckBox useSuccessRuleCheckBox;
   }
 }

trunk/sources/HeuristicLab.ES/ESEditor.cs

@@ -90 +90 @@
       initialMutationStrengthTextBox.DataBindings.Add("Text", ES, "ShakingFactor");
       targetSuccessRateTextBox.DataBindings.Add("Text", ES, "SuccessProbability");
+      useSuccessRuleCheckBox.DataBindings.Add("Checked", ES, "UseSuccessRule");
     }
 
@@ -177 +178 @@
     private void Engine_Finished(object sender, EventArgs e) {
       scopeView.Refresh();
+      if (executeButton.InvokeRequired) {
+        executeButton.Invoke(new MethodInvoker(EnableExecute));
+      } else {
+        executeButton.Enabled = true;
+        abortButton.Enabled = false;
+      }
+    }
+    private void EnableExecute() {
       executeButton.Enabled = true;
       abortButton.Enabled = false;
     }
     #endregion
+
+    #region CheckBox Events
+    private void useSuccessRuleCheckBox_CheckedChanged(object sender, EventArgs e) {
+      targetSuccessRateTextBox.Enabled = useSuccessRuleCheckBox.Checked;
+    }
+    #endregion
   }
 }