Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/04/12 16:12:15 (12 years ago)
Author:
bburlacu
Message:

#1772: Performance improvements for the GenealogyGraph. Minor refactoring to VisualGenealogyGraphArc and VisualGenealogyGraphNode classes. Added new functionality to the SymbolicExpressionTreeFragmentsAnalyzer, minor refactoring in the other two analyzers. Refactored View code. Updated project references and plugin dependencies and added HeuristicLab.Problems.DataAnalysis.Symbolic to the branch.

Location:
branches/HeuristicLab.EvolutionaryTracking
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.EvolutionaryTracking

    • Property svn:ignore

      •  

        old new  
         1*.suo
        12_ReSharper.HeuristicLab.Tracking
        23bin

  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views

    • Property svn:ignore set to
      *.user
      bin
      obj

  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.Designer.cs

    r7779 r8213  
    2727      this.mainTableLayout = new System.Windows.Forms.TableLayoutPanel();
    2828      this.splitContainer = new System.Windows.Forms.SplitContainer();
    29       this.topControlBox = new System.Windows.Forms.GroupBox();
    30       this.similarityModeLabel = new System.Windows.Forms.Label();
    31       this.similarityModeSelector = new System.Windows.Forms.ComboBox();
    32       this.symbolicExpressionTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
    3329      this.genealogyTableLayout = new System.Windows.Forms.TableLayoutPanel();
    3430      this.graphControlsPanel = new System.Windows.Forms.Panel();
    … …  
    3632      this.moveModeButton = new System.Windows.Forms.RadioButton();
    3733      this.zoomModeButton = new System.Windows.Forms.RadioButton();
     34      this.symbolicExpressionTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
     35      this.topControlBox = new System.Windows.Forms.GroupBox();
     36      this.similarityModeLabel = new System.Windows.Forms.Label();
     37      this.similarityModeSelector = new System.Windows.Forms.ComboBox();
    3838      this.genealogyGraphChart = new HeuristicLab.EvolutionaryTracking.Views.GenealogyGraphChart();
     39      this.inDegreeButton = new System.Windows.Forms.Button();
     40      this.outDegreeButton = new System.Windows.Forms.Button();
    3941      this.mainTableLayout.SuspendLayout();
    4042      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    … …  
    4244      this.splitContainer.Panel2.SuspendLayout();
    4345      this.splitContainer.SuspendLayout();
    44       this.topControlBox.SuspendLayout();
    4546      this.genealogyTableLayout.SuspendLayout();
    4647      this.graphControlsPanel.SuspendLayout();
     48      this.topControlBox.SuspendLayout();
    4749      this.SuspendLayout();
    4850      //
    … …  
    8385      this.splitContainer.TabIndex = 7;
    8486      //
    85       // topControlBox
    86       //
    87       this.topControlBox.Controls.Add(this.similarityModeLabel);
    88       this.topControlBox.Controls.Add(this.similarityModeSelector);
    89       this.topControlBox.Dock = System.Windows.Forms.DockStyle.Fill;
    90       this.topControlBox.Location = new System.Drawing.Point(3, 3);
    91       this.topControlBox.Name = "topControlBox";
    92       this.topControlBox.Size = new System.Drawing.Size(522, 44);
    93       this.topControlBox.TabIndex = 6;
    94       this.topControlBox.TabStop = false;
    95       this.topControlBox.Text = "Controls";
    96       //
    97       // similarityModeLabel
    98       //
    99       this.similarityModeLabel.AutoSize = true;
    100       this.similarityModeLabel.Location = new System.Drawing.Point(6, 20);
    101       this.similarityModeLabel.Name = "similarityModeLabel";
    102       this.similarityModeLabel.Size = new System.Drawing.Size(80, 13);
    103       this.similarityModeLabel.TabIndex = 1;
    104       this.similarityModeLabel.Text = "Similarity Mode:";
    105       //
    106       // similarityModeSelector
    107       //
    108       this.similarityModeSelector.FormattingEnabled = true;
    109       this.similarityModeSelector.Items.AddRange(new object[] {
    110             "Exact",
    111             "High",
    112             "Relaxed"});
    113       this.similarityModeSelector.Location = new System.Drawing.Point(92, 17);
    114       this.similarityModeSelector.Name = "similarityModeSelector";
    115       this.similarityModeSelector.Size = new System.Drawing.Size(148, 21);
    116       this.similarityModeSelector.TabIndex = 0;
    117       this.similarityModeSelector.SelectedIndexChanged += new System.EventHandler(this.similarityModeSelector_SelectedIndexChanged);
    118       //
    119       // symbolicExpressionTreeChart
    120       //
    121       this.symbolicExpressionTreeChart.BackgroundColor = System.Drawing.Color.White;
    122       this.symbolicExpressionTreeChart.Dock = System.Windows.Forms.DockStyle.Fill;
    123       this.symbolicExpressionTreeChart.LineColor = System.Drawing.Color.Black;
    124       this.symbolicExpressionTreeChart.Location = new System.Drawing.Point(0, 0);
    125       this.symbolicExpressionTreeChart.Name = "symbolicExpressionTreeChart";
    126       this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(275, 385);
    127       this.symbolicExpressionTreeChart.Spacing = 5;
    128       this.symbolicExpressionTreeChart.SuspendRepaint = false;
    129       this.symbolicExpressionTreeChart.TabIndex = 2;
    130       this.symbolicExpressionTreeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
    131       this.symbolicExpressionTreeChart.Tree = null;
    132       //
    13387      // genealogyTableLayout
    13488      //
    … …  
    148102      // graphControlsPanel
    149103      //
     104      this.graphControlsPanel.Controls.Add(this.outDegreeButton);
     105      this.graphControlsPanel.Controls.Add(this.inDegreeButton);
    150106      this.graphControlsPanel.Controls.Add(this.selectModeButton);
    151107      this.graphControlsPanel.Controls.Add(this.moveModeButton);
    … …  
    160116      this.selectModeButton.Appearance = System.Windows.Forms.Appearance.Button;
    161117      this.selectModeButton.AutoSize = true;
    162       this.selectModeButton.Location = new System.Drawing.Point(103, 3);
     118      this.selectModeButton.Location = new System.Drawing.Point(65, 3);
    163119      this.selectModeButton.Name = "selectModeButton";
    164       this.selectModeButton.Size = new System.Drawing.Size(47, 23);
     120      this.selectModeButton.Size = new System.Drawing.Size(24, 23);
    165121      this.selectModeButton.TabIndex = 5;
    166122      this.selectModeButton.TabStop = true;
    167       this.selectModeButton.Text = "Select";
     123      this.selectModeButton.Text = "S";
    168124      this.selectModeButton.UseVisualStyleBackColor = true;
    169125      this.selectModeButton.CheckedChanged += new System.EventHandler(this.selectModeButton_CheckedChanged);
    … …  
    175131      this.moveModeButton.Location = new System.Drawing.Point(3, 3);
    176132      this.moveModeButton.Name = "moveModeButton";
    177       this.moveModeButton.Size = new System.Drawing.Size(44, 23);
     133      this.moveModeButton.Size = new System.Drawing.Size(26, 23);
    178134      this.moveModeButton.TabIndex = 3;
    179135      this.moveModeButton.TabStop = true;
    180       this.moveModeButton.Text = "Move";
     136      this.moveModeButton.Text = "M";
    181137      this.moveModeButton.UseVisualStyleBackColor = true;
    182138      this.moveModeButton.CheckedChanged += new System.EventHandler(this.moveModeButton_CheckedChanged);
    … …  
    186142      this.zoomModeButton.Appearance = System.Windows.Forms.Appearance.Button;
    187143      this.zoomModeButton.AutoSize = true;
    188       this.zoomModeButton.Location = new System.Drawing.Point(53, 3);
     144      this.zoomModeButton.Location = new System.Drawing.Point(35, 3);
    189145      this.zoomModeButton.Name = "zoomModeButton";
    190       this.zoomModeButton.Size = new System.Drawing.Size(44, 23);
     146      this.zoomModeButton.Size = new System.Drawing.Size(24, 23);
    191147      this.zoomModeButton.TabIndex = 4;
    192148      this.zoomModeButton.TabStop = true;
    193       this.zoomModeButton.Text = "Zoom";
     149      this.zoomModeButton.Text = "Z";
    194150      this.zoomModeButton.UseVisualStyleBackColor = true;
    195151      this.zoomModeButton.CheckedChanged += new System.EventHandler(this.zoomModeButton_CheckedChanged);
     152      //
     153      // symbolicExpressionTreeChart
     154      //
     155      this.symbolicExpressionTreeChart.BackgroundColor = System.Drawing.Color.White;
     156      this.symbolicExpressionTreeChart.Dock = System.Windows.Forms.DockStyle.Fill;
     157      this.symbolicExpressionTreeChart.LineColor = System.Drawing.Color.Black;
     158      this.symbolicExpressionTreeChart.Location = new System.Drawing.Point(0, 0);
     159      this.symbolicExpressionTreeChart.Name = "symbolicExpressionTreeChart";
     160      this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(275, 385);
     161      this.symbolicExpressionTreeChart.Spacing = 5;
     162      this.symbolicExpressionTreeChart.SuspendRepaint = false;
     163      this.symbolicExpressionTreeChart.TabIndex = 2;
     164      this.symbolicExpressionTreeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
     165      this.symbolicExpressionTreeChart.Tree = null;
     166      //
     167      // topControlBox
     168      //
     169      this.topControlBox.Controls.Add(this.similarityModeLabel);
     170      this.topControlBox.Controls.Add(this.similarityModeSelector);
     171      this.topControlBox.Dock = System.Windows.Forms.DockStyle.Fill;
     172      this.topControlBox.Location = new System.Drawing.Point(3, 3);
     173      this.topControlBox.Name = "topControlBox";
     174      this.topControlBox.Size = new System.Drawing.Size(522, 44);
     175      this.topControlBox.TabIndex = 6;
     176      this.topControlBox.TabStop = false;
     177      this.topControlBox.Text = "Controls";
     178      //
     179      // similarityModeLabel
     180      //
     181      this.similarityModeLabel.AutoSize = true;
     182      this.similarityModeLabel.Location = new System.Drawing.Point(6, 20);
     183      this.similarityModeLabel.Name = "similarityModeLabel";
     184      this.similarityModeLabel.Size = new System.Drawing.Size(80, 13);
     185      this.similarityModeLabel.TabIndex = 1;
     186      this.similarityModeLabel.Text = "Similarity Mode:";
     187      //
     188      // similarityModeSelector
     189      //
     190      this.similarityModeSelector.FormattingEnabled = true;
     191      this.similarityModeSelector.Items.AddRange(new object[] {
     192            "Exact",
     193            "High",
     194            "Relaxed"});
     195      this.similarityModeSelector.Location = new System.Drawing.Point(92, 17);
     196      this.similarityModeSelector.Name = "similarityModeSelector";
     197      this.similarityModeSelector.Size = new System.Drawing.Size(148, 21);
     198      this.similarityModeSelector.TabIndex = 0;
     199      this.similarityModeSelector.SelectedIndexChanged += new System.EventHandler(this.similarityModeSelector_SelectedIndexChanged);
    196200      //
    197201      // genealogyGraphChart
    … …  
    204208      this.genealogyGraphChart.Size = new System.Drawing.Size(233, 343);
    205209      this.genealogyGraphChart.TabIndex = 2;
     210      //
     211      // inDegreeButton
     212      //
     213      this.inDegreeButton.AutoSize = true;
     214      this.inDegreeButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
     215      this.inDegreeButton.Location = new System.Drawing.Point(95, 3);
     216      this.inDegreeButton.Name = "inDegreeButton";
     217      this.inDegreeButton.Size = new System.Drawing.Size(28, 23);
     218      this.inDegreeButton.TabIndex = 6;
     219      this.inDegreeButton.Text = "IN";
     220      this.inDegreeButton.UseVisualStyleBackColor = true;
     221      this.inDegreeButton.Click += new System.EventHandler(this.inDegreeButton_Click);
     222      //
     223      // outDegreeButton
     224      //
     225      this.outDegreeButton.AutoSize = true;
     226      this.outDegreeButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
     227      this.outDegreeButton.Location = new System.Drawing.Point(129, 3);
     228      this.outDegreeButton.Name = "outDegreeButton";
     229      this.outDegreeButton.Size = new System.Drawing.Size(40, 23);
     230      this.outDegreeButton.TabIndex = 7;
     231      this.outDegreeButton.Text = "OUT";
     232      this.outDegreeButton.UseVisualStyleBackColor = true;
     233      this.outDegreeButton.Click += new System.EventHandler(this.outDegreeButton_Click);
    206234      //
    207235      // GenealogyGraphView
    … …  
    217245      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
    218246      this.splitContainer.ResumeLayout(false);
    219       this.topControlBox.ResumeLayout(false);
    220       this.topControlBox.PerformLayout();
    221247      this.genealogyTableLayout.ResumeLayout(false);
    222248      this.graphControlsPanel.ResumeLayout(false);
    223249      this.graphControlsPanel.PerformLayout();
     250      this.topControlBox.ResumeLayout(false);
     251      this.topControlBox.PerformLayout();
    224252      this.ResumeLayout(false);
    225253
    … …  
    240268    private System.Windows.Forms.RadioButton moveModeButton;
    241269    private System.Windows.Forms.RadioButton zoomModeButton;
     270    private System.Windows.Forms.Button inDegreeButton;
     271    private System.Windows.Forms.Button outDegreeButton;
    242272
    243273  }
Note: See TracChangeset for help on using the changeset viewer.