Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8409


Ignore:
Timestamp:
08/03/12 19:28:39 (12 years ago)
Author:
bburlacu
Message:

#1763: Fixed bug when pasting subtrees. Moved the InteractiveSymbolicExpressionTreeChart and dialogs in the HeuristicLab.Problems.DataAnalysis.Symbolic.Views namespace and renamed the impact values calculators to a more sensible name.

Location:
branches/HeuristicLab.TreeSimplifier
Files:
10 added
9 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj

    r8395 r8409  
    158158  </ItemGroup>
    159159  <ItemGroup>
    160     <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
    161       <SubType>UserControl</SubType>
    162     </Compile>
    163     <Compile Include="InteractiveSymbolicExpressionTreeChart.Designer.cs">
    164       <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon>
    165     </Compile>
    166160    <Compile Include="Plugin.cs" />
    167161    <Compile Include="SymbolicExpressionGrammarAllowedChildSymbolsControl.cs">
    … …  
    188182    <Compile Include="SymbolicExpressionGrammarView.Designer.cs">
    189183      <DependentUpon>SymbolicExpressionGrammarView.cs</DependentUpon>
    190     </Compile>
    191     <Compile Include="SymbolicExpressionTreeNodeChangeValueDialog.cs">
    192       <SubType>Form</SubType>
    193     </Compile>
    194     <Compile Include="SymbolicExpressionTreeNodeChangeValueDialog.Designer.cs">
    195       <DependentUpon>SymbolicExpressionTreeNodeChangeValueDialog.cs</DependentUpon>
    196     </Compile>
    197     <Compile Include="SymbolicExpressionTreeNodeInsertDialog.cs">
    198       <SubType>Form</SubType>
    199     </Compile>
    200     <Compile Include="SymbolicExpressionTreeNodeInsertDialog.Designer.cs">
    201       <DependentUpon>SymbolicExpressionTreeNodeInsertDialog.cs</DependentUpon>
    202184    </Compile>
    203185    <Compile Include="SymbolView.cs">
    … …  
    250232      <Install>true</Install>
    251233    </BootstrapperPackage>
    252   </ItemGroup>
    253   <ItemGroup>
    254     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    255       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    256       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    257     </ProjectReference>
    258234  </ItemGroup>
    259235  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

    r8388 r8409  
    167167  </ItemGroup>
    168168  <ItemGroup>
     169    <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
     170      <SubType>UserControl</SubType>
     171    </Compile>
     172    <Compile Include="InteractiveSymbolicExpressionTreeChart.Designer.cs">
     173      <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon>
     174    </Compile>
    169175    <Compile Include="MathSymbolicDataAnalysisModelView.cs">
    170176      <SubType>UserControl</SubType>
    … …  
    221227    <Compile Include="Symbols\VariableView.Designer.cs">
    222228      <DependentUpon>VariableView.cs</DependentUpon>
     229    </Compile>
     230    <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeChangeValueDialog.cs">
     231      <SubType>Form</SubType>
     232    </Compile>
     233    <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeChangeValueDialog.Designer.cs">
     234      <DependentUpon>SymbolicExpressionTreeNodeChangeValueDialog.cs</DependentUpon>
     235    </Compile>
     236    <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeInsertDialog.cs">
     237      <SubType>Form</SubType>
     238    </Compile>
     239    <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeInsertDialog.Designer.cs">
     240      <DependentUpon>SymbolicExpressionTreeNodeInsertDialog.cs</DependentUpon>
    223241    </Compile>
    224242    <None Include="HeuristicLab.snk" />

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

    r8388 r8409  
    5252      this.btnPrune = new System.Windows.Forms.Button();
    5353      this.btnOptimizeConstants = new System.Windows.Forms.Button();
    54       this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.InteractiveSymbolicExpressionTreeChart();
     54      this.treeChart = new 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);
    … …  
    157157      // treeChart
    158158      //
    159       this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    160             | System.Windows.Forms.AnchorStyles.Left) 
     159      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     160            | System.Windows.Forms.AnchorStyles.Left)
    161161            | System.Windows.Forms.AnchorStyles.Right)));
    162162      this.treeChart.BackgroundColor = System.Drawing.Color.White;
    … …  
    214214    #endregion
    215215
    216     private HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.InteractiveSymbolicExpressionTreeChart treeChart;
     216    private InteractiveSymbolicExpressionTreeChart treeChart;
    217217    private System.Windows.Forms.SplitContainer splitContainer;
    218218    private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;

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

    r8388 r8409  
    209209
    210210    private void treeChart_SymbolicExpressionTreeChanged(object sender, EventArgs e) {
    211       CalculateReplacementNodesAndNodeImpacts(treeChart.Tree);
    212       PaintModel();
     211      updateInProgress = true;
     212      UpdateModel(model);
     213      updateInProgress = false;
     214      CalculateReplacementNodesAndNodeImpacts();
    213215    }
    214216
    … …  
    354356      } else {
    355357        // The operation completed normally. We can update the model
     358        updateInProgress = true;
    356359        UpdateModel(model);
     360        updateInProgress = false;
    357361      }
    358362      btnPrune.Enabled = true;
Note: See TracChangeset for help on using the changeset viewer.