Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/12/14 13:26:18 (10 years ago)
Author:
pfleck
Message:
  • Merged trunk into preprocessing branch.
Location:
branches/DataPreprocessing
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessing

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

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

    r9975 r11009  
    111111  <ItemGroup>
    112112    <Compile Include="Exporters\SymbolicSolutionExcelExporter.cs" />
    113     <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
    114       <SubType>UserControl</SubType>
    115     </Compile>
     113    <Compile Include="InteractiveSymbolicExpressionTreeChart.cs" />
    116114    <Compile Include="InteractiveSymbolicExpressionTreeChart.Designer.cs">
    117115      <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon>
    118116    </Compile>
    119     <Compile Include="MathSymbolicDataAnalysisModelView.cs">
    120       <SubType>UserControl</SubType>
    121     </Compile>
     117    <Compile Include="MathSymbolicDataAnalysisModelView.cs" />
    122118    <Compile Include="MathSymbolicDataAnalysisModelView.designer.cs">
    123119      <DependentUpon>MathSymbolicDataAnalysisModelView.cs</DependentUpon>
    124120    </Compile>
    125121    <Compile Include="Plugin.cs" />
    126     <Compile Include="TextualSymbolicDataAnalysisModelView.cs">
    127       <SubType>UserControl</SubType>
    128     </Compile>
     122    <Compile Include="TextualSymbolicDataAnalysisModelView.cs" />
    129123    <Compile Include="TextualSymbolicDataAnalysisModelView.designer.cs">
    130124      <DependentUpon>TextualSymbolicDataAnalysisModelView.cs</DependentUpon>
    131125    </Compile>
    132     <Compile Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs">
    133       <SubType>UserControl</SubType>
    134     </Compile>
     126    <Compile Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs" />
    135127    <Compile Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs">
    136128      <DependentUpon>InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs</DependentUpon>
    137129    </Compile>
    138     <Compile Include="GraphicalSymbolicDataAnalysisModelView.cs">
    139       <SubType>UserControl</SubType>
    140     </Compile>
     130    <Compile Include="GraphicalSymbolicDataAnalysisModelView.cs" />
    141131    <Compile Include="GraphicalSymbolicDataAnalysisModelView.designer.cs">
    142132      <DependentUpon>GraphicalSymbolicDataAnalysisModelView.cs</DependentUpon>
    143133    </Compile>
    144     <Compile Include="Symbols\ConstantView.cs">
    145       <SubType>UserControl</SubType>
    146     </Compile>
     134    <Compile Include="Symbols\ConstantView.cs" />
    147135    <Compile Include="Symbols\ConstantView.Designer.cs">
    148136      <DependentUpon>ConstantView.cs</DependentUpon>
    149137    </Compile>
    150     <Compile Include="Symbols\LaggedVariableView.cs">
    151       <SubType>UserControl</SubType>
    152     </Compile>
     138    <Compile Include="Symbols\LaggedVariableView.cs" />
    153139    <Compile Include="Symbols\LaggedVariableView.Designer.cs">
    154140      <DependentUpon>LaggedVariableView.cs</DependentUpon>
    155141    </Compile>
    156     <Compile Include="Symbols\TimeLagView.cs">
    157       <SubType>UserControl</SubType>
    158     </Compile>
     142    <Compile Include="Symbols\TimeLagView.cs" />
    159143    <Compile Include="Symbols\TimeLagView.Designer.cs">
    160144      <DependentUpon>TimeLagView.cs</DependentUpon>
    161145    </Compile>
    162     <Compile Include="Symbols\VariableConditionView.cs">
    163       <SubType>UserControl</SubType>
    164     </Compile>
     146    <Compile Include="Symbols\VariableConditionView.cs" />
    165147    <Compile Include="Symbols\VariableConditionView.Designer.cs">
    166148      <DependentUpon>VariableConditionView.cs</DependentUpon>
    167149    </Compile>
    168     <Compile Include="Symbols\VariableView.cs">
    169       <SubType>UserControl</SubType>
    170     </Compile>
     150    <Compile Include="Symbols\VariableView.cs" />
    171151    <Compile Include="Symbols\VariableView.Designer.cs">
    172152      <DependentUpon>VariableView.cs</DependentUpon>
    … …  
    193173    <None Include="Plugin.cs.frame" />
    194174    <None Include="Properties\AssemblyInfo.cs.frame" />
    195     <Compile Include="RunCollectionVariableImpactView.cs">
    196       <SubType>UserControl</SubType>
    197     </Compile>
     175    <Compile Include="RunCollectionVariableImpactView.cs" />
    198176    <Compile Include="RunCollectionVariableImpactView.Designer.cs">
    199177      <DependentUpon>RunCollectionVariableImpactView.cs</DependentUpon>
    … …  
    205183      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    206184      <Name>HeuristicLab.Collections-3.3</Name>
     185      <Private>False</Private>
     186    </ProjectReference>
     187    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     188      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     189      <Name>HeuristicLab.Common.Resources-3.3</Name>
    207190      <Private>False</Private>
    208191    </ProjectReference>

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

    r9462 r11009  
    1919 */
    2020#endregion
     21
    2122
    2223namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
    … …  
    137138      //
    138139      // btnOptimizeConstants
    139       //
    140       this.btnOptimizeConstants.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     140      //      
     141      this.btnOptimizeConstants.AutoSize = true;
    141142      this.btnOptimizeConstants.Enabled = false;
    142       this.btnOptimizeConstants.Location = new System.Drawing.Point(104, 3);
     143      this.btnOptimizeConstants.Image = HeuristicLab.Common.Resources.VSImageLibrary.Performance;
     144      this.btnOptimizeConstants.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter;
     145      this.btnOptimizeConstants.Location = new System.Drawing.Point(105, 3);
    143146      this.btnOptimizeConstants.Name = "btnOptimizeConstants";
    144       this.btnOptimizeConstants.Size = new System.Drawing.Size(97, 23);
     147      this.btnOptimizeConstants.Size = new System.Drawing.Size(80, 24);
    145148      this.btnOptimizeConstants.TabIndex = 2;
    146149      this.btnOptimizeConstants.Text = "Optimize";
     150      this.btnOptimizeConstants.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
     151      this.btnOptimizeConstants.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    147152      this.btnOptimizeConstants.UseVisualStyleBackColor = true;
    148153      this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click);
    … …  
    150155      // btnSimplify
    151156      //
     157      this.btnSimplify.AutoSize = true;
     158      this.btnSimplify.Enabled = true;
     159      this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator;
     160      this.btnSimplify.ImageAlign = System.Drawing.ContentAlignment.MiddleCenter;
    152161      this.btnSimplify.Location = new System.Drawing.Point(3, 3);
    153162      this.btnSimplify.Name = "btnSimplify";
    154       this.btnSimplify.Size = new System.Drawing.Size(95, 23);
     163      this.btnSimplify.Size = new System.Drawing.Size(80, 24);
    155164      this.btnSimplify.TabIndex = 1;
    156165      this.btnSimplify.Text = "Simplify";
     166      this.btnSimplify.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
     167      this.btnSimplify.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    157168      this.btnSimplify.UseVisualStyleBackColor = true;
    158169      this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click);

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

    r10538 r11009  
    5252      Content.ModelChanged += Content_Changed;
    5353      Content.ProblemDataChanged += Content_Changed;
     54      treeChart.Repainted += treeChart_Repainted;
    5455    }
    5556    protected override void DeregisterContentEvents() {
    … …  
    5758      Content.ModelChanged -= Content_Changed;
    5859      Content.ProblemDataChanged -= Content_Changed;
     60      treeChart.Repainted -= treeChart_Repainted;
    5961    }
    6062
    … …  
    6870      UpdateView();
    6971      viewHost.Content = this.Content;
     72    }
     73
     74    private void treeChart_Repainted(object sender, EventArgs e) {
     75      if (nodeImpacts != null && nodeImpacts.Count > 0)
     76        PaintNodeImpacts();
    7077    }
    7178
    … …  
    98105    private void treeChart_SymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
    99106      var visualNode = (VisualTreeNode<ISymbolicExpressionTreeNode>)sender;
     107      if (visualNode.Content == null) { throw new Exception("Visual node content cannot be null."); }
    100108      var symbExprTreeNode = (SymbolicExpressionTreeNode)visualNode.Content;
    101       if (symbExprTreeNode == null) return;
    102       var tree = Content.Model.SymbolicExpressionTree;
     109      if (!foldedNodes.ContainsKey(symbExprTreeNode)) return; // constant nodes cannot be folded
    103110      var parent = symbExprTreeNode.Parent;
    104111      int indexOfSubtree = parent.IndexOfSubtree(symbExprTreeNode);
    105       if (foldedNodes.ContainsKey(symbExprTreeNode)) {
    106         // undo node folding
    107         SwitchNodeWithReplacementNode(parent, indexOfSubtree);
    108       }
    109       UpdateModel(tree);
     112      SwitchNodeWithReplacementNode(parent, indexOfSubtree);
     113      UpdateModel(Content.Model.SymbolicExpressionTree);
    110114    }
    111115
    112116    private void SwitchNodeWithReplacementNode(ISymbolicExpressionTreeNode parent, int subTreeIndex) {
    113117      ISymbolicExpressionTreeNode subTree = parent.GetSubtree(subTreeIndex);
    114       parent.RemoveSubtree(subTreeIndex);
    115118      if (foldedNodes.ContainsKey(subTree)) {
     119        parent.RemoveSubtree(subTreeIndex);
    116120        var replacementNode = foldedNodes[subTree];
    117121        parent.InsertSubtree(subTreeIndex, replacementNode);
    … …  
    130134
    131135        if (!(treeNode is ConstantTreeNode) && nodeImpacts.ContainsKey(treeNode)) {
     136          visualTree.ToolTip = visualTree.Content.ToString(); // to avoid duplicate tooltips
    132137          double impact = nodeImpacts[treeNode];
    133138

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

    r10538 r11009  
    218218            if (tempNode.IterateNodesBreadth().Contains(node))
    219219              throw new ArgumentException();// cannot cut/paste a node into itself
    220             ModifyTree(Tree, tempNode.Parent, tempNode, null); //remove node from its original parent     
     220            ModifyTree(Tree, tempNode.Parent, tempNode, null); //remove node from its original parent
    221221            ModifyTree(Tree, node, null, tempNode); //insert it as a child to the new parent
    222222            break;

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame

    r10037 r11009  
    3232  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3333  [PluginDependency("HeuristicLab.Common", "3.3")]
     34  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3435  [PluginDependency("HeuristicLab.Core", "3.3")]
    3536  [PluginDependency("HeuristicLab.Core.Views", "3.3")]

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.designer.cs

    r10538 r11009  
    5454      this.symbolicExpressionTreeView.Content = null;
    5555      this.symbolicExpressionTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
    56       this.symbolicExpressionTreeView.Font = new System.Drawing.Font("Consolas", 8.25F);
    5756      this.symbolicExpressionTreeView.Location = new System.Drawing.Point(0, 0);
    5857      this.symbolicExpressionTreeView.Name = "symbolicExpressionTreeView";
Note: See TracChangeset for help on using the changeset viewer.