Changeset 9835 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs

Timestamp:

08/01/13 13:01:40 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged remaining trunk changes into the EvolutionaryTracking branch.

Location:

branches/HeuristicLab.EvolutionaryTracking

Files:

• . (modified) (3 props)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (copied) (copied from branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionaryTracking

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -54 +54 @@
       this.btnSimplify = new System.Windows.Forms.Button();
       this.treeStatusLabel = new System.Windows.Forms.Label();
-      this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart();
+      this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       this.grpViewHost = new System.Windows.Forms.GroupBox();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -176 +176 @@
       this.treeChart.LineColor = System.Drawing.Color.Black;
       this.treeChart.Location = new System.Drawing.Point(6, 32);
-      this.treeChart.ModifyTree = null;
       this.treeChart.Name = "treeChart";
       this.treeChart.Size = new System.Drawing.Size(201, 332);
@@ -220 +219 @@
     #endregion
 
-    private InteractiveSymbolicExpressionTreeChart treeChart;
+    private HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart treeChart;
     private System.Windows.Forms.SplitContainer splitContainer;
     private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin