Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/16/12 14:30:54 (12 years ago)
Author:
bburlacu
Message:

#1763: Added HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views and HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views to the branch. Removed prune button, minor functionality improvements.

Location:
branches/HeuristicLab.TreeSimplifier
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TreeSimplifier

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views5700-5808

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

    r8915 r8916  
    273273  <ItemGroup>
    274274    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
    275       <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>
     275      <Project>{423bd94f-963a-438e-ba45-3bb3d61cd03b}</Project>
    276276      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
    277       <Private>False</Private>
    278277    </ProjectReference>
    279278    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    280       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     279      <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
    281280      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    282       <Private>False</Private>
    283281    </ProjectReference>
    284282  </ItemGroup>

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

    r8915 r8916  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    4849      this.splitContainer = new System.Windows.Forms.SplitContainer();
    … …  
    5051      this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
    5152      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 InteractiveSymbolicExpressionTreeChart();
     54      this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart();
    5555      this.grpViewHost = new System.Windows.Forms.GroupBox();
    5656      this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
    … …  
    6666      // viewHost
    6767      //
    68       this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    69             | 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) 
    7070            | System.Windows.Forms.AnchorStyles.Right)));
    7171      this.viewHost.Caption = "View";
    … …  
    112112      // flowLayoutPanel
    113113      //
    114       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) 
    115115            | System.Windows.Forms.AnchorStyles.Right)));
    116116      this.flowLayoutPanel.Controls.Add(this.btnSimplify);
    117       this.flowLayoutPanel.Controls.Add(this.btnPrune);
    118117      this.flowLayoutPanel.Controls.Add(this.btnOptimizeConstants);
    119118      this.flowLayoutPanel.Location = new System.Drawing.Point(6, 313);
    … …  
    133132      this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click);
    134133      //
    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       //
    145134      // btnOptimizeConstants
    146135      //
    147136      this.btnOptimizeConstants.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    148137      this.btnOptimizeConstants.Enabled = false;
    149       this.btnOptimizeConstants.Location = new System.Drawing.Point(205, 3);
     138      this.btnOptimizeConstants.Location = new System.Drawing.Point(104, 3);
    150139      this.btnOptimizeConstants.Name = "btnOptimizeConstants";
    151140      this.btnOptimizeConstants.Size = new System.Drawing.Size(97, 23);
    … …  
    157146      // treeChart
    158147      //
    159       this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    160             | System.Windows.Forms.AnchorStyles.Left)
     148      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     149            | System.Windows.Forms.AnchorStyles.Left) 
    161150            | System.Windows.Forms.AnchorStyles.Right)));
    162151      this.treeChart.BackgroundColor = System.Drawing.Color.White;
    … …  
    221210    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel;
    222211    protected System.Windows.Forms.Button btnOptimizeConstants;
    223     private System.Windows.Forms.Button btnPrune;
    224212    private System.ComponentModel.BackgroundWorker backgroundWorker1;
    225213  }

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

    r8409 r8916  
    4747      originalValues = new Dictionary<ISymbolicExpressionTreeNode, double>();
    4848      originalVariableNames = new Dictionary<ISymbolicExpressionTreeNode, string>();
    49       Caption = "Interactive Solution Simplifier";
     49
     50      this.Caption = "Interactive Solution Simplifier";
    5051    }
    5152
    … …  
    218219      var dialog = (ValueChangeDialog)sender;
    219220      bool flag1 = false, flag2 = false;
    220       if (dialog.Content is VariableTreeNode) {
    221         var variable = (VariableTreeNode)dialog.Content;
     221      var node = dialog.Content;
     222
     223      if (node is VariableTreeNode) {
     224        var variable = dialog.Content as VariableTreeNode;
    222225        var weight = double.Parse(dialog.NewValueTextBox.Text);
    223226        var name = (string)dialog.VariableNameComboBox.SelectedItem;
    … …  
    232235          variable.VariableName = name;
    233236        }
    234       } else if (dialog.Content is ConstantTreeNode) {
    235         var constant = (ConstantTreeNode)dialog.Content;
     237      } else if (node is ConstantTreeNode) {
     238        var constant = dialog.Content as ConstantTreeNode;
    236239        var value = double.Parse(dialog.NewValueTextBox.Text);
    237240        if (!constant.Value.Equals(value)) {
    … …  
    239242          originalValues[constant] = constant.Value;
    240243          constant.Value = value;
    241 
    242244        }
    243245      }
    … …  
    324326    protected abstract void btnOptimizeConstants_Click(object sender, EventArgs e);
    325327
    326     private void btnPrune_Click(object sender, EventArgs e) {
    327       btnPrune.Enabled = false;
    328       backgroundWorker1.RunWorkerAsync();
    329     }
     328    //    private void btnPrune_Click(object sender, EventArgs e) {
     329    //      btnPrune.Enabled = false;
     330    //      backgroundWorker1.RunWorkerAsync();
     331    //    }
    330332
    331333    private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e) {
    … …  
    360362        updateInProgress = false;
    361363      }
    362       btnPrune.Enabled = true;
     364      //      btnPrune.Enabled = true;
    363365    }
    364366

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

    r8915 r8916  
    305305              // copy subtree
    306306              var clone = tempNode.Clone() as ISymbolicExpressionTreeNode;
    307               clone.Parent = tempNode.Parent;
    308               tempNode = clone;
     307              if (clone != null) {
     308                clone.Parent = tempNode.Parent;
     309                tempNode = clone;
     310              }
    309311              break;
    310312            }
    311313        }
    312314        node.AddSubtree(tempNode);
    313         Tree = Tree; // hack in order to trigger the reinitialization of the dictionaries after new nodes appeared in the graph
     315        Tree = Tree;
     316        // hack in order to trigger the reinitialization of the dictionaries after new nodes appeared in the graph
    314317        OnSymbolicExpressionTreeChanged(sender, e);
    315318      } else {

  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeChangeValueDialog.cs

    r8409 r8916  
    9494        variableNamesCombo.Visible = true;
    9595        foreach (var name in variable.Symbol.VariableNames) variableNamesCombo.Items.Add(name);
    96         variableNamesCombo.SelectedIndex = 0;
     96        variableNamesCombo.SelectedIndex = variableNamesCombo.Items.IndexOf(variable.VariableName);
     97        //        variableNamesCombo.SelectedText = variable.VariableName;
     98        //        variableNamesCombo.SelectedIndex = 0;
    9799      } else if (Content is ConstantTreeNode) {
    98100        Caption = "Change constant value";
Note: See TracChangeset for help on using the changeset viewer.