Changeset 14908 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem

Timestamp:

05/02/17 22:03:01 (8 years ago)

Author:

pkimmesw

Message:

#2665 Removed "this" qualifier

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem

Files:

• BenchmarkSuite/BenchmarkSuitePushSolutionView.cs (modified) (13 diffs)
• BenchmarkSuite/PushBenchmarkSuiteEvaluator.cs (modified) (1 diff)
• PushProblem.cs (modified) (5 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/BenchmarkSuitePushSolutionView.cs

@@ -37 +37 @@
 
     ~BenchmarkSuitePushSolutionView() {
-      this.interpreter.Dispose();
+      interpreter.Dispose();
     }
 
     private void InitEvents() {
-      this.exampleComboBox.SelectedIndexChanged += this.SelectedExampleIndexChanged;
-      this.pushDebugger.OnReset += this.PushDebuggerReset;
+      exampleComboBox.SelectedIndexChanged += SelectedExampleIndexChanged;
+      pushDebugger.OnReset += PushDebuggerReset;
     }
 
     private void PushDebuggerReset(object sender, IPushInterpreter interpreter) {
-      if (this.exampleComboBox.SelectedIndex < 0) return;
-
-      var example = Evaluator.Data.Examples[this.exampleComboBox.SelectedIndex];
+      if (exampleComboBox.SelectedIndex < 0) return;
+
+      var example = Evaluator.Data.Examples[exampleComboBox.SelectedIndex];
 
       interpreter.BooleanStack.Push(example.InputBoolean);
@@ -62 +62 @@
 
     private void SelectedExampleIndexChanged(object sender, EventArgs e) {
-      this.pushDebugger.ResetDebugging();
+      pushDebugger.ResetDebugging();
     }
 
@@ -80 +80 @@
 
     protected override void OnContentChanged() {
-      if (this.Content == null) return;
-
-      this.Name = "Push Solution";
-      this.nameTextBox.Text = this.Name;
-
-      this.pool = new PushInterpreterPool(this.Content.Config);
-
-      if (this.interpreter != null) {
-        this.interpreter.Dispose();
-      }
-
-      this.interpreter = this.pool.Create(this.Content.Random);
-      this.UpdateExamples(Evaluator.Data);
-
-      if (this.exampleComboBox.SelectedIndex < 0) {
-        this.exampleComboBox.SelectedIndex = 0; // Triggers ResetDebugging via event
-      }
-
-      this.InitResultGrid();
-      this.pushDebugger.Content = this.Content;
+      if (Content == null) return;
+
+      Name = "Push Solution";
+      nameTextBox.Text = Name;
+
+      pool = new PushInterpreterPool(Content.Config);
+
+      if (interpreter != null) {
+        interpreter.Dispose();
+      }
+
+      interpreter = pool.Create(Content.Random);
+      UpdateExamples(Evaluator.Data);
+
+      if (exampleComboBox.SelectedIndex < 0) {
+        exampleComboBox.SelectedIndex = 0; // Triggers ResetDebugging via event
+      }
+
+      InitResultGrid();
+      pushDebugger.Content = Content;
     }
 
     private void InitResultGrid() {
-      this.resultsDataGrid.Columns.Clear();
-      this.resultsDataGrid.Rows.Clear();
+      resultsDataGrid.Columns.Clear();
+      resultsDataGrid.Rows.Clear();
 
       var cellTemplate = new DataGridViewTextBoxCell();
@@ -118 +118 @@
 
         column.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
-        this.resultsDataGrid.Columns.Add(column);
+        resultsDataGrid.Columns.Add(column);
       }
 
@@ -139 +139 @@
         outputColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
 
-        this.resultsDataGrid.Columns.Add(estimatedOutputColumn);
-        this.resultsDataGrid.Columns.Add(outputColumn);
+        resultsDataGrid.Columns.Add(estimatedOutputColumn);
+        resultsDataGrid.Columns.Add(outputColumn);
       }
 
@@ -158 +158 @@
       relativeDiffColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
 
-      this.resultsDataGrid.Columns.Add(absoluteDiffColumn);
-      this.resultsDataGrid.Columns.Add(relativeDiffColumn);
-
-      using (var pushInterpreter = this.pool.Create(this.Content.Random)) {
+      resultsDataGrid.Columns.Add(absoluteDiffColumn);
+      resultsDataGrid.Columns.Add(relativeDiffColumn);
+
+      using (var pushInterpreter = pool.Create(Content.Random)) {
         for (var i = 0; i < data.Examples.Length; i++) {
           var example = data.Examples[i];
@@ -169 +169 @@
 
           row.HeaderCell.Value = row.Index + 1;
-          row.CreateCells(this.resultsDataGrid);
+          row.CreateCells(resultsDataGrid);
 
           for (var j = 0; j < data.InputArgumentTypes.Length; j++) {
@@ -177 +177 @@
           for (var j = 0; j < data.OutputArgumentTypes.Length; j++) {
             row.Cells[data.InputArgumentTypes.Length + j * 2].Value = ViewHelper.StringifyOutput(data.OutputArgumentTypes[j], example, Separator);
-            row.Cells[data.InputArgumentTypes.Length + j * 2 + 1].Value = this.StringifyResult(data.OutputArgumentTypes[j], pushInterpreter, example, Separator);
+            row.Cells[data.InputArgumentTypes.Length + j * 2 + 1].Value = StringifyResult(data.OutputArgumentTypes[j], pushInterpreter, example, Separator);
           }
 
@@ -183 +183 @@
           row.Cells[data.TotalArgumentCount + 2].Value = relativeDiff + "%";
 
-          this.resultsDataGrid.Rows.Add(row);
+          resultsDataGrid.Rows.Add(row);
           pushInterpreter.Reset();
         }
@@ -192 +192 @@
       switch (type) {
         case ExampleArgumentType.Integer:
-        case ExampleArgumentType.IntegerVector: return interpreter.IntegerStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.IntegerStack.Peek(this.GetCount(interpreter.IntegerStack, example.OutputInteger)));
+        case ExampleArgumentType.IntegerVector: return interpreter.IntegerStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.IntegerStack.Peek(GetCount(interpreter.IntegerStack, example.OutputInteger)));
 
         case ExampleArgumentType.Float:
-        case ExampleArgumentType.FloatVector: return interpreter.FloatStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.FloatStack.Peek(this.GetCount(interpreter.FloatStack, example.OutputFloat)).Select(d => d.ToString(CultureInfo.CurrentUICulture)));
+        case ExampleArgumentType.FloatVector: return interpreter.FloatStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.FloatStack.Peek(GetCount(interpreter.FloatStack, example.OutputFloat)).Select(d => d.ToString(CultureInfo.CurrentUICulture)));
 
         case ExampleArgumentType.Boolean: return interpreter.BooleanStack.IsEmpty ? EmptySign : interpreter.BooleanStack.Top.ToString();
@@ -201 +201 @@
 
         case ExampleArgumentType.String:
-        case ExampleArgumentType.StringVector: return interpreter.StringStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.StringStack.Peek(this.GetCount(interpreter.StringStack, example.OutputString)));
+        case ExampleArgumentType.StringVector: return interpreter.StringStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.StringStack.Peek(GetCount(interpreter.StringStack, example.OutputString)));
         default: return string.Empty;
       }
@@ -211 +211 @@
 
     private void UpdateExamples(ProblemData data) {
-      this.exampleComboBox.Items.Clear();
+      exampleComboBox.Items.Clear();
       if (data == null) return;
 
@@ -220 +220 @@
 
       foreach (var str in stringRepresentations) {
-        this.exampleComboBox.Items.Add(str);
+        exampleComboBox.Items.Add(str);
       }
     }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteEvaluator.cs

@@ -69 +69 @@
 
     public void LoadData(ProblemData data) {
-      this.Data = data;
+      Data = data;
 
       DataBounds.TrainingRange.Start = 0;

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushProblem.cs

@@ -72 +72 @@
 
     private void EnabledExpressionsChanged(object sender, EnabledExpressionsChangedEventArgs e) {
-      this.Encoding.Bounds[0, 1] = config.EnabledExpressions.Count;
-      this.Encoding.BoundsParameter.Value[0, 1] = config.EnabledExpressions.Count;
+      Encoding.Bounds[0, 1] = config.EnabledExpressions.Count;
+      Encoding.BoundsParameter.Value[0, 1] = config.EnabledExpressions.Count;
     }
 
@@ -228 +228 @@
     public IValueParameter<IntValue> MaxPointsInProgramParameter
     {
-      get { return (IValueParameter<IntValue>)this.Parameters[MaxPointsInProgramParameterName]; }
+      get { return (IValueParameter<IntValue>)Parameters[MaxPointsInProgramParameterName]; }
     }
 
@@ -250 +250 @@
     public IValueParameter<IntValue> MinPointsInProgramParameter
     {
-      get { return (IValueParameter<IntValue>)this.Parameters[MinPointsInProgramParameterName]; }
+      get { return (IValueParameter<IntValue>)Parameters[MinPointsInProgramParameterName]; }
     }
 
@@ -287 +287 @@
     public IValueParameter<BoolValue> TopLevelPushCodeParameter
     {
-      get { return (IValueParameter<BoolValue>)this.Parameters[TopLevelPushCodeParameterName]; }
+      get { return (IValueParameter<BoolValue>)Parameters[TopLevelPushCodeParameterName]; }
     }
 
@@ -305 +305 @@
     public IValueParameter<BoolValue> TopLevelPopCodeParameter
     {
-      get { return (IValueParameter<BoolValue>)this.Parameters[TopLevelPopCodeParameterName]; }
+      get { return (IValueParameter<BoolValue>)Parameters[TopLevelPopCodeParameterName]; }
     }