Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/02/12 15:05:26 (12 years ago)
Author:
bburlacu
Message:

#1763: Rebranched the TreeSimplifier project to fix merging errors. Added functionality to insert symbols into the tree, fixed bug when deleting tree nodes.

Location:
branches/HeuristicLab.TreeSimplifier
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TreeSimplifier

    • Property svn:ignore set to
      *.suo
      _ReSharper.HeuristicLab.TreeSimplifier
      bin

  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

    • Property svn:ignore

      •  

        old new  
         1*.user
        12bin
        23obj
        3 *.user
        4 HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs
        5 *.vs10x
        6 Plugin.cs

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

    r8053 r8388  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
    4847      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    4948      this.splitContainer = new System.Windows.Forms.SplitContainer();
    … …  
    5150      this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
    5251      this.btnSimplify = new System.Windows.Forms.Button();
     52      this.btnPrune = new System.Windows.Forms.Button();
    5353      this.btnOptimizeConstants = new System.Windows.Forms.Button();
     54      this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.InteractiveSymbolicExpressionTreeChart();
    5455      this.grpViewHost = new System.Windows.Forms.GroupBox();
     56      this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
    5557      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    5658      this.splitContainer.Panel1.SuspendLayout();
    … …  
    6264      this.SuspendLayout();
    6365      //
    64       // treeChart
    65       //
    66       this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    67             | System.Windows.Forms.AnchorStyles.Left)
    68             | System.Windows.Forms.AnchorStyles.Right)));
    69       this.treeChart.BackgroundColor = System.Drawing.Color.White;
    70       this.treeChart.LineColor = System.Drawing.Color.Black;
    71       this.treeChart.Location = new System.Drawing.Point(6, 16);
    72       this.treeChart.Name = "treeChart";
    73       this.treeChart.Size = new System.Drawing.Size(201, 291);
    74       this.treeChart.Spacing = 5;
    75       this.treeChart.TabIndex = 0;
    76       this.treeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
    77       this.treeChart.Tree = null;
    78       this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
    79       //
    8066      // viewHost
    8167      //
    82       this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    83             | System.Windows.Forms.AnchorStyles.Left)
     68      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     69            | System.Windows.Forms.AnchorStyles.Left) 
    8470            | System.Windows.Forms.AnchorStyles.Right)));
    8571      this.viewHost.Caption = "View";
    … …  
    11399      // grpSimplify
    114100      //
     101      this.grpSimplify.AutoSize = true;
    115102      this.grpSimplify.Controls.Add(this.flowLayoutPanel);
    116103      this.grpSimplify.Controls.Add(this.treeChart);
    … …  
    125112      // flowLayoutPanel
    126113      //
    127       this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
     114      this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
    128115            | System.Windows.Forms.AnchorStyles.Right)));
    129116      this.flowLayoutPanel.Controls.Add(this.btnSimplify);
     117      this.flowLayoutPanel.Controls.Add(this.btnPrune);
    130118      this.flowLayoutPanel.Controls.Add(this.btnOptimizeConstants);
    131119      this.flowLayoutPanel.Location = new System.Drawing.Point(6, 313);
    … …  
    145133      this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click);
    146134      //
     135      // btnPrune
     136      //
     137      this.btnPrune.Location = new System.Drawing.Point(104, 3);
     138      this.btnPrune.Name = "btnPrune";
     139      this.btnPrune.Size = new System.Drawing.Size(95, 23);
     140      this.btnPrune.TabIndex = 3;
     141      this.btnPrune.Text = "Prune";
     142      this.btnPrune.UseVisualStyleBackColor = true;
     143      this.btnPrune.Click += new System.EventHandler(this.btnPrune_Click);
     144      //
    147145      // btnOptimizeConstants
    148146      //
    149147      this.btnOptimizeConstants.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    150148      this.btnOptimizeConstants.Enabled = false;
    151       this.btnOptimizeConstants.Location = new System.Drawing.Point(104, 3);
     149      this.btnOptimizeConstants.Location = new System.Drawing.Point(205, 3);
    152150      this.btnOptimizeConstants.Name = "btnOptimizeConstants";
    153151      this.btnOptimizeConstants.Size = new System.Drawing.Size(97, 23);
    … …  
    156154      this.btnOptimizeConstants.UseVisualStyleBackColor = true;
    157155      this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click);
     156      //
     157      // treeChart
     158      //
     159      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     160            | System.Windows.Forms.AnchorStyles.Left)
     161            | System.Windows.Forms.AnchorStyles.Right)));
     162      this.treeChart.BackgroundColor = System.Drawing.Color.White;
     163      this.treeChart.LineColor = System.Drawing.Color.Black;
     164      this.treeChart.Location = new System.Drawing.Point(6, 16);
     165      this.treeChart.Name = "treeChart";
     166      this.treeChart.Size = new System.Drawing.Size(201, 291);
     167      this.treeChart.Spacing = 5;
     168      this.treeChart.SuspendRepaint = false;
     169      this.treeChart.TabIndex = 0;
     170      this.treeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
     171      this.treeChart.Tree = null;
     172      this.treeChart.SymbolicExpressionTreeChanged += new System.EventHandler(this.treeChart_SymbolicExpressionTreeChanged);
     173      this.treeChart.SymbolicExpressionTreeNodeChanged += new System.EventHandler(this.treeChart_SymbolicExpressionTreeNodeChanged);
     174      this.treeChart.SymbolicExpressionTreeNodeInserted += new System.EventHandler(this.treeChart_SymbolicExpressionTreeNodeInserted);
     175      this.treeChart.SymbolicExpressionTreeNodeClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeClicked);
     176      this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
    158177      //
    159178      // grpViewHost
    … …  
    168187      this.grpViewHost.Text = "Details";
    169188      //
     189      // backgroundWorker1
     190      //
     191      this.backgroundWorker1.WorkerSupportsCancellation = true;
     192      this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
     193      this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
     194      //
    170195      // InteractiveSymbolicDataAnalysisSolutionSimplifierView
    171196      //
    172197      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    173       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     198      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    174199      this.Controls.Add(this.splitContainer);
    175200      this.Name = "InteractiveSymbolicDataAnalysisSolutionSimplifierView";
    176201      this.Size = new System.Drawing.Size(564, 348);
    177202      this.splitContainer.Panel1.ResumeLayout(false);
     203      this.splitContainer.Panel1.PerformLayout();
    178204      this.splitContainer.Panel2.ResumeLayout(false);
    179205      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
    … …  
    188214    #endregion
    189215
    190     private HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart treeChart;
     216    private HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.InteractiveSymbolicExpressionTreeChart treeChart;
    191217    private System.Windows.Forms.SplitContainer splitContainer;
    192218    private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;
    … …  
    196222    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel;
    197223    protected System.Windows.Forms.Button btnOptimizeConstants;
     224    private System.Windows.Forms.Button btnPrune;
     225    private System.ComponentModel.BackgroundWorker backgroundWorker1;
    198226  }
    199227}
Note: See TracChangeset for help on using the changeset viewer.