Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/18/14 12:35:00 (10 years ago)
Author:
ascheibe
Message:

reverted last commit

Location:
branches/HiveStatistics/sources
Files:
1 deleted
33 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

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

    r11202 r11203  
    9797      <Private>False</Private>
    9898    </Reference>
    99     <Reference Include="EPPlus-3.1.3, Version=3.1.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
    100       <SpecificVersion>False</SpecificVersion>
    101       <HintPath>..\..\bin\EPPlus-3.1.3.dll</HintPath>
    102       <Private>False</Private>
    103     </Reference>
    10499    <Reference Include="System" />
    105100    <Reference Include="System.Core">
    … …  
    108103    <Reference Include="System.Drawing" />
    109104    <Reference Include="System.Windows.Forms" />
    110   </ItemGroup>
    111   <ItemGroup>
    112     <Compile Include="Exporters\SymbolicSolutionExcelExporter.cs" />
     105    <Reference Include="System.Windows.Forms.DataVisualization" />
     106    <Reference Include="System.Xml.Linq">
     107      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     108    </Reference>
     109    <Reference Include="System.Data.DataSetExtensions">
     110      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     111    </Reference>
     112    <Reference Include="System.Data" />
     113    <Reference Include="System.Xml" />
     114  </ItemGroup>
     115  <ItemGroup>
    113116    <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
    114117      <SubType>UserControl</SubType>
    … …  
    208211    </ProjectReference>
    209212    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    210       <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     213      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    211214      <Name>HeuristicLab.Common.Resources-3.3</Name>
    212215      <Private>False</Private>
    … …  
    257260      <Private>False</Private>
    258261    </ProjectReference>
     262    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     263      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     264      <Name>HeuristicLab.Operators-3.3</Name>
     265      <Private>False</Private>
     266    </ProjectReference>
     267    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
     268      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
     269      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     270      <Private>False</Private>
     271    </ProjectReference>
    259272    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    260273      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    … …  
    262275      <Private>False</Private>
    263276    </ProjectReference>
     277    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     278      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     279      <Name>HeuristicLab.Parameters-3.3</Name>
     280      <Private>False</Private>
     281    </ProjectReference>
     282    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     283      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     284      <Name>HeuristicLab.Persistence-3.3</Name>
     285      <Private>False</Private>
     286    </ProjectReference>
    264287    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    265288      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    … …  
    275298      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    276299      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     300      <Private>False</Private>
     301    </ProjectReference>
     302    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     303      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
     304      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    277305      <Private>False</Private>
    278306    </ProjectReference>

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

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 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.
    … …  
    1919 */
    2020#endregion
    21 
    2221
    2322namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
    … …  
    4746    private void InitializeComponent() {
    4847      this.components = new System.ComponentModel.Container();
    49       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InteractiveSymbolicDataAnalysisSolutionSimplifierView));
    5048      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5149      this.splitContainer = new System.Windows.Forms.SplitContainer();
    … …  
    5351      this.treeStatusValue = new System.Windows.Forms.Label();
    5452      this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
     53      this.btnOptimizeConstants = new System.Windows.Forms.Button();
    5554      this.btnSimplify = new System.Windows.Forms.Button();
    56       this.btnOptimizeConstants = new System.Windows.Forms.Button();
     55      this.treeStatusLabel = new System.Windows.Forms.Label();
     56      this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart();
    5757      this.grpViewHost = new System.Windows.Forms.GroupBox();
    58       this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart();
    5958      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    6059      this.splitContainer.Panel1.SuspendLayout();
    … …  
    104103      this.grpSimplify.Controls.Add(this.treeStatusValue);
    105104      this.grpSimplify.Controls.Add(this.flowLayoutPanel);
     105      this.grpSimplify.Controls.Add(this.treeStatusLabel);
    106106      this.grpSimplify.Controls.Add(this.treeChart);
    107107      this.grpSimplify.Dock = System.Windows.Forms.DockStyle.Fill;
    … …  
    115115      // treeStatusValue
    116116      //
    117       this.treeStatusValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    118117      this.treeStatusValue.AutoSize = true;
    119       this.treeStatusValue.BackColor = System.Drawing.Color.White;
    120       this.treeStatusValue.ForeColor = System.Drawing.Color.Red;
    121       this.treeStatusValue.Location = new System.Drawing.Point(6, 351);
     118      this.treeStatusValue.BackColor = System.Drawing.Color.Transparent;
     119      this.treeStatusValue.ForeColor = System.Drawing.Color.Green;
     120      this.treeStatusValue.Location = new System.Drawing.Point(72, 16);
    122121      this.treeStatusValue.Name = "treeStatusValue";
    123       this.treeStatusValue.Size = new System.Drawing.Size(63, 13);
     122      this.treeStatusValue.Size = new System.Drawing.Size(30, 13);
    124123      this.treeStatusValue.TabIndex = 3;
    125       this.treeStatusValue.Text = "Invalid Tree";
    126       this.treeStatusValue.Visible = false;
     124      this.treeStatusValue.Text = "Valid";
    127125      //
    128126      // flowLayoutPanel
    … …  
    138136      this.flowLayoutPanel.WrapContents = false;
    139137      //
     138      // btnOptimizeConstants
     139      //
     140      this.btnOptimizeConstants.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     141      this.btnOptimizeConstants.Enabled = false;
     142      this.btnOptimizeConstants.Location = new System.Drawing.Point(104, 3);
     143      this.btnOptimizeConstants.Name = "btnOptimizeConstants";
     144      this.btnOptimizeConstants.Size = new System.Drawing.Size(97, 23);
     145      this.btnOptimizeConstants.TabIndex = 2;
     146      this.btnOptimizeConstants.Text = "Optimize";
     147      this.btnOptimizeConstants.UseVisualStyleBackColor = true;
     148      this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click);
     149      //
    140150      // btnSimplify
    141151      //
    142       this.btnSimplify.AutoSize = true;
    143       this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator;
    144152      this.btnSimplify.Location = new System.Drawing.Point(3, 3);
    145153      this.btnSimplify.Name = "btnSimplify";
    146       this.btnSimplify.Size = new System.Drawing.Size(80, 24);
     154      this.btnSimplify.Size = new System.Drawing.Size(95, 23);
    147155      this.btnSimplify.TabIndex = 1;
    148156      this.btnSimplify.Text = "Simplify";
    149       this.btnSimplify.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    150157      this.btnSimplify.UseVisualStyleBackColor = true;
    151158      this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click);
    152159      //
    153       // btnOptimizeConstants
    154       //
    155       this.btnOptimizeConstants.AutoSize = true;
    156       this.btnOptimizeConstants.Enabled = false;
    157       this.btnOptimizeConstants.Image = HeuristicLab.Common.Resources.VSImageLibrary.Performance;
    158       this.btnOptimizeConstants.Location = new System.Drawing.Point(89, 3);
    159       this.btnOptimizeConstants.Name = "btnOptimizeConstants";
    160       this.btnOptimizeConstants.Size = new System.Drawing.Size(80, 24);
    161       this.btnOptimizeConstants.TabIndex = 2;
    162       this.btnOptimizeConstants.Text = "Optimize";
    163       this.btnOptimizeConstants.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    164       this.btnOptimizeConstants.UseVisualStyleBackColor = true;
    165       this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click);
     160      // treeStatusLabel
     161      //
     162      this.treeStatusLabel.AutoSize = true;
     163      this.treeStatusLabel.BackColor = System.Drawing.Color.Transparent;
     164      this.treeStatusLabel.Location = new System.Drawing.Point(6, 16);
     165      this.treeStatusLabel.Name = "treeStatusLabel";
     166      this.treeStatusLabel.Size = new System.Drawing.Size(68, 13);
     167      this.treeStatusLabel.TabIndex = 2;
     168      this.treeStatusLabel.Text = "Tree Status: ";
     169      //
     170      // treeChart
     171      //
     172      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     173            | System.Windows.Forms.AnchorStyles.Left)
     174            | System.Windows.Forms.AnchorStyles.Right)));
     175      this.treeChart.BackgroundColor = System.Drawing.Color.White;
     176      this.treeChart.LineColor = System.Drawing.Color.Black;
     177      this.treeChart.Location = new System.Drawing.Point(6, 32);
     178      this.treeChart.ModifyTree = null;
     179      this.treeChart.Name = "treeChart";
     180      this.treeChart.Size = new System.Drawing.Size(201, 332);
     181      this.treeChart.Spacing = 5;
     182      this.treeChart.SuspendRepaint = false;
     183      this.treeChart.TabIndex = 0;
     184      this.treeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
     185      this.treeChart.Tree = null;
     186      this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
    166187      //
    167188      // grpViewHost
    … …  
    175196      this.grpViewHost.TabStop = false;
    176197      this.grpViewHost.Text = "Details";
    177       //
    178       // treeChart
    179       //
    180       this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    181             | System.Windows.Forms.AnchorStyles.Left)
    182             | System.Windows.Forms.AnchorStyles.Right)));
    183       this.treeChart.BackgroundColor = System.Drawing.Color.White;
    184       this.treeChart.LineColor = System.Drawing.Color.Black;
    185       this.treeChart.Location = new System.Drawing.Point(6, 16);
    186       this.treeChart.ModifyTree = null;
    187       this.treeChart.Name = "treeChart";
    188       this.treeChart.Size = new System.Drawing.Size(201, 348);
    189       this.treeChart.Spacing = 5;
    190       this.treeChart.SuspendRepaint = false;
    191       this.treeChart.TabIndex = 0;
    192       this.treeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
    193       this.treeChart.Tree = null;
    194       this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
    195198      //
    196199      // InteractiveSymbolicDataAnalysisSolutionSimplifierView
    … …  
    210213      this.grpSimplify.PerformLayout();
    211214      this.flowLayoutPanel.ResumeLayout(false);
    212       this.flowLayoutPanel.PerformLayout();
    213215      this.grpViewHost.ResumeLayout(false);
    214216      this.ResumeLayout(false);
    … …  
    218220    #endregion
    219221
    220     private HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart treeChart;
     222    private InteractiveSymbolicExpressionTreeChart treeChart;
    221223    private System.Windows.Forms.SplitContainer splitContainer;
    222224    private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;
    … …  
    227229    protected System.Windows.Forms.Button btnOptimizeConstants;
    228230    private System.Windows.Forms.Label treeStatusValue;
     231    private System.Windows.Forms.Label treeStatusLabel;
    229232  }
    230233}

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

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3535    private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> changedNodes;
    3636    private Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts;
    37 
    3837    private enum TreeState { Valid, Invalid }
    3938    private TreeState treeState;
    4039
    41     protected InteractiveSymbolicDataAnalysisSolutionSimplifierView() {
     40    public InteractiveSymbolicDataAnalysisSolutionSimplifierView() {
    4241      InitializeComponent();
    4342      foldedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
    … …  
    5453    /// </summary>
    5554    /// <param name="tree">The symbolic expression tree</param>
    56     /// <param name="parent">The insertion point (ie, the parent node who will receive a new child)</param>
     55    /// <param name="node">The insertion point (ie, the parent node who will receive a new child)</param>
    5756    /// <param name="oldChild">The subtree to be replaced</param>
    5857    /// <param name="newChild">The replacement subtree</param>
    5958    /// <param name="removeSubtree">Flag used to indicate if whole subtrees should be removed (default behavior), or just the subtree root</param>
    60     private void Modify(ISymbolicExpressionTree tree, ISymbolicExpressionTreeNode parent,
    61       ISymbolicExpressionTreeNode oldChild, ISymbolicExpressionTreeNode newChild, bool removeSubtree = true) {
    62       if (oldChild == null && newChild == null)
    63         throw new ArgumentNullException("Cannot deduce operation type from the arguments. Please provide non null operands.");
    64       if (oldChild == null) {
    65         // insertion operation
    66         parent.AddSubtree(newChild);
    67         newChild.Parent = parent;
    68       } else if (newChild == null) {
    69         // removal operation
    70         parent.RemoveSubtree(parent.IndexOfSubtree(oldChild));
    71         if (!removeSubtree) {
     59    private void Modify(ISymbolicExpressionTree tree, ISymbolicExpressionTreeNode node, ISymbolicExpressionTreeNode oldChild, ISymbolicExpressionTreeNode newChild, bool removeSubtree = true) {
     60      if (oldChild == null && newChild == null) throw new ArgumentException();
     61      if (oldChild == null) { // insertion operation
     62        node.AddSubtree(newChild);
     63        newChild.Parent = node;
     64      } else if (newChild == null) { // removal operation
     65        node.RemoveSubtree(node.IndexOfSubtree(oldChild));
     66        changedNodes.Remove(oldChild);
     67        foldedNodes.Remove(oldChild);
     68        if (removeSubtree) {
     69          foreach (var subtree in oldChild.IterateNodesPrefix()) {
     70            changedNodes.Remove(subtree);
     71            foldedNodes.Remove(subtree);
     72          }
     73        } else {
    7274          for (int i = oldChild.SubtreeCount - 1; i >= 0; --i) {
    7375            var subtree = oldChild.GetSubtree(i);
    7476            oldChild.RemoveSubtree(i);
    75             parent.AddSubtree(subtree);
     77            node.AddSubtree(subtree);
    7678          }
    7779        }
    78       } else {
    79         // replacement operation
    80         var replacementIndex = parent.IndexOfSubtree(oldChild);
    81         parent.RemoveSubtree(replacementIndex);
    82         parent.InsertSubtree(replacementIndex, newChild);
    83         newChild.Parent = parent;
     80      } else { // replacement operation
     81        var replacementIndex = node.IndexOfSubtree(oldChild);
     82        node.RemoveSubtree(replacementIndex);
     83        node.InsertSubtree(replacementIndex, newChild);
     84        newChild.Parent = node;
    8485        if (changedNodes.ContainsKey(oldChild)) {
    8586          changedNodes.Add(newChild, changedNodes[oldChild]); // so that on double click the original node is restored
    … …  
    8990        }
    9091      }
    91       treeState = IsValid(tree) ? TreeState.Valid : TreeState.Invalid;
    92       switch (treeState) {
    93         case TreeState.Valid:
    94           this.grpViewHost.Enabled = true;
    95           UpdateModel(Content.Model.SymbolicExpressionTree);
    96           break;
    97         case TreeState.Invalid:
    98           this.grpViewHost.Enabled = false;
    99           break;
    100       }
    101     }
    102 
    103     // the optimizer always assumes 2 children for multiplication and addition nodes
    104     // thus, we enforce that the tree stays valid so that the constant optimization won't throw an exception
    105     // by returning 2 as the minimum allowed arity for addition and multiplication symbols
    106     private readonly Func<ISymbol, int> GetMinArity = symbol => {
    107       var min = symbol.MinimumArity;
    108       if (symbol is Multiplication || symbol is Division) return Math.Max(2, min);
    109       return min;
    110     };
     92      if (IsValid(tree)) {
     93        treeState = TreeState.Valid;
     94        UpdateModel(Content.Model.SymbolicExpressionTree);
     95      } else {
     96        treeState = TreeState.Invalid;
     97      }
     98    }
     99
    111100    private bool IsValid(ISymbolicExpressionTree tree) {
    112101      treeChart.Tree = tree;
    113102      treeChart.Repaint();
    114       bool valid = !tree.IterateNodesPostfix().Any(node => node.SubtreeCount < GetMinArity(node.Symbol) || node.SubtreeCount > node.Symbol.MaximumArity);
     103      bool valid = !tree.IterateNodesPostfix().Any(node => node.SubtreeCount < node.Symbol.MinimumArity || node.SubtreeCount > node.Symbol.MaximumArity);
    115104      if (valid) {
    116105        btnOptimizeConstants.Enabled = true;
    117106        btnSimplify.Enabled = true;
    118         treeStatusValue.Visible = false;
     107        treeStatusValue.Text = "Valid";
     108        treeStatusValue.ForeColor = Color.Green;
    119109      } else {
    120110        btnOptimizeConstants.Enabled = false;
    121111        btnSimplify.Enabled = false;
    122         treeStatusValue.Visible = true;
     112        treeStatusValue.Text = "Invalid";
     113        treeStatusValue.ForeColor = Color.Red;
    123114      }
    124115      this.Refresh();
    … …  
    135126      Content.ModelChanged += Content_Changed;
    136127      Content.ProblemDataChanged += Content_Changed;
    137       treeChart.Repainted += treeChart_Repainted;
    138128    }
    139129    protected override void DeregisterContentEvents() {
    … …  
    141131      Content.ModelChanged -= Content_Changed;
    142132      Content.ProblemDataChanged -= Content_Changed;
    143       treeChart.Repainted -= treeChart_Repainted;
    144133    }
    145134
    … …  
    155144    }
    156145
    157     private void treeChart_Repainted(object sender, EventArgs e) {
    158       if (nodeImpacts != null && nodeImpacts.Count > 0)
    159         PaintNodeImpacts();
    160     }
    161 
    162146    private void UpdateView() {
    163147      if (Content == null || Content.Model == null || Content.ProblemData == null) return;
    … …  
    165149      treeChart.Tree = tree.Root.SubtreeCount > 1 ? new SymbolicExpressionTree(tree.Root) : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
    166150
    167       var impactAndReplacementValues = CalculateImpactAndReplacementValues(tree);
    168       var replacementValues = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item2);
     151      var replacementValues = CalculateReplacementValues(tree);
    169152      foreach (var pair in replacementValues.Where(pair => !(pair.Key is ConstantTreeNode))) {
    170153        foldedNodes[pair.Key] = MakeConstantTreeNode(pair.Value);
    171154      }
    172       nodeImpacts = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item1);
     155
     156      nodeImpacts = CalculateImpactValues(tree);
    173157      PaintNodeImpacts();
    174158    }
    … …  
    176160    protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateReplacementValues(ISymbolicExpressionTree tree);
    177161    protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicExpressionTree tree);
    178     protected abstract Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>> CalculateImpactAndReplacementValues(ISymbolicExpressionTree tree);
    179162    protected abstract void UpdateModel(ISymbolicExpressionTree tree);
    180163
    … …  
    188171    private void treeChart_SymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
    189172      if (treeState == TreeState.Invalid) return;
    190       var visualNode = (VisualTreeNode<ISymbolicExpressionTreeNode>)sender;
    191       if (visualNode.Content == null) { throw new Exception("VisualNode content cannot be null."); }
    192       var symbExprTreeNode = (SymbolicExpressionTreeNode)visualNode.Content;
     173      var visualNode = (VisualSymbolicExpressionTreeNode)sender;
     174      var symbExprTreeNode = (SymbolicExpressionTreeNode)visualNode.SymbolicExpressionTreeNode;
     175      if (symbExprTreeNode == null) return;
    193176      var tree = Content.Model.SymbolicExpressionTree;
    194177      var parent = symbExprTreeNode.Parent;
    … …  
    209192    private void SwitchNodeWithReplacementNode(ISymbolicExpressionTreeNode parent, int subTreeIndex) {
    210193      ISymbolicExpressionTreeNode subTree = parent.GetSubtree(subTreeIndex);
     194      parent.RemoveSubtree(subTreeIndex);
    211195      if (foldedNodes.ContainsKey(subTree)) {
    212         parent.RemoveSubtree(subTreeIndex);
    213196        var replacementNode = foldedNodes[subTree];
    214197        parent.InsertSubtree(subTreeIndex, replacementNode);
    … …  
    224207      double min = impacts.Min();
    225208      foreach (ISymbolicExpressionTreeNode treeNode in Content.Model.SymbolicExpressionTree.IterateNodesPostfix()) {
    226         VisualTreeNode<ISymbolicExpressionTreeNode> visualTree = treeChart.GetVisualSymbolicExpressionTreeNode(treeNode);
     209        VisualSymbolicExpressionTreeNode visualTree = treeChart.GetVisualSymbolicExpressionTreeNode(treeNode);
    227210
    228211        if (!(treeNode is ConstantTreeNode) && nodeImpacts.ContainsKey(treeNode)) {
    229           visualTree.ToolTip = visualTree.Content.ToString();
    230212          double impact = nodeImpacts[treeNode];
    231213

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    5656      this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
    5757      this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    58       this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
    59       this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
    6058      this.SuspendLayout();
    6159      //
    … …  
    6361      //
    6462      this.insertNodeToolStripMenuItem.Name = "insertNodeToolStripMenuItem";
    65       this.insertNodeToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
     63      this.insertNodeToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
    6664      this.insertNodeToolStripMenuItem.Text = "Insert Node";
    6765      this.insertNodeToolStripMenuItem.Click += new System.EventHandler(this.insertNodeToolStripMenuItem_Click);
    … …  
    7068      //
    7169      this.changeNodeToolStripMenuItem.Name = "changeNodeToolStripMenuItem";
    72       this.changeNodeToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
     70      this.changeNodeToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
    7371      this.changeNodeToolStripMenuItem.Text = "Change Node";
    7472      this.changeNodeToolStripMenuItem.Click += new System.EventHandler(this.changeNodeToolStripMenuItem_Click);
    … …  
    7775      //
    7876      this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
    79       this.cutToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
    80       this.cutToolStripMenuItem.Text = "Cut Subtree";
     77      this.cutToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
     78      this.cutToolStripMenuItem.Text = "Cut";
    8179      this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
    8280      //
    … …  
    8785            this.removeSubtreeToolStripMenuItem});
    8886      this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
    89       this.removeToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
     87      this.removeToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
    9088      this.removeToolStripMenuItem.Text = "Remove";
    9189      this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeSubtreeToolStripMenuItem_Click);
    … …  
    108106      //
    109107      this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
    110       this.pasteToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
    111       this.pasteToolStripMenuItem.Text = "Paste Subtree";
     108      this.pasteToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
     109      this.pasteToolStripMenuItem.Text = "Paste";
    112110      this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Clicked);
    113111      //
    … …  
    120118      //
    121119      this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
    122       this.copyToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
    123       this.copyToolStripMenuItem.Text = "Copy Subtree";
     120      this.copyToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
     121      this.copyToolStripMenuItem.Text = "Copy";
    124122      this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
    125       //
    126       // toolStripSeparator1
    127       //
    128       this.toolStripSeparator1.Name = "toolStripSeparator1";
    129       this.toolStripSeparator1.Size = new System.Drawing.Size(162, 6);
    130       //
    131       // toolStripSeparator2
    132       //
    133       this.toolStripSeparator2.Name = "toolStripSeparator2";
    134       this.toolStripSeparator2.Size = new System.Drawing.Size(162, 6);
    135123      //
    136124      // contextMenuStrip
    137125      //
    138126      this.contextMenuStrip.Opened += this.contextMenuStrip_Opened;
    139       this.contextMenuStrip.Items.AddRange(new ToolStripItem[] { toolStripSeparator1,
    140                                                                  insertNodeToolStripMenuItem,
    141                                                                  removeToolStripMenuItem,
     127      this.contextMenuStrip.Items.AddRange(new ToolStripItem[] { insertNodeToolStripMenuItem,
    142128                                                                 changeNodeToolStripMenuItem,
    143                                                                  toolStripSeparator2,
    144129                                                                 copyToolStripMenuItem,
    145130                                                                 cutToolStripMenuItem,
     131                                                                 removeToolStripMenuItem,
    146132                                                                 pasteToolStripMenuItem });
    147133      //
    … …  
    153139      this.Name = "InteractiveSymbolicExpressionTreeChart";
    154140      this.ResumeLayout(false);
     141
    155142    }
    156143
    … …  
    167154    private ToolStripSeparator toolStripSeparator;
    168155    private ToolStripMenuItem copyToolStripMenuItem;
    169     private ToolStripSeparator toolStripSeparator1;
    170     private ToolStripSeparator toolStripSeparator2;
    171156  }
    172157}

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

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3333  internal sealed partial class InteractiveSymbolicExpressionTreeChart : SymbolicExpressionTreeChart {
    3434    private ISymbolicExpressionTreeNode tempNode; // node in clipboard (to be cut/copy/pasted etc)
    35     private VisualTreeNode<ISymbolicExpressionTreeNode> currSelected; // currently selected node
     35    private VisualSymbolicExpressionTreeNode currSelected; // currently selected node
    3636    private enum EditOp { NoOp, CopySubtree, CutSubtree }
    3737    private EditOp lastOp = EditOp.NoOp;
    … …  
    6565        pasteToolStripMenuItem.Visible = false;
    6666      } else {
    67         var node = currSelected.Content;
     67        var node = currSelected.SymbolicExpressionTreeNode;
    6868        insertNodeToolStripMenuItem.Visible = true;
    6969        changeNodeToolStripMenuItem.Visible = true;
    … …  
    7676        pasteToolStripMenuItem.Visible = true;
    7777        pasteToolStripMenuItem.Enabled = tempNode != null && insertNodeToolStripMenuItem.Enabled
    78                                                           && !(lastOp == EditOp.CutSubtree && tempNode.IterateNodesBreadth().Contains(node))
    79                                                           && node.SubtreeCount < node.Symbol.MaximumArity;
     78                                                          && !(lastOp == EditOp.CutSubtree
     79                                                               && tempNode.IterateNodesBreadth().Contains(currSelected.SymbolicExpressionTreeNode));
    8080      }
    8181    }
    8282
    8383    protected override void OnSymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
    84       currSelected = (VisualTreeNode<ISymbolicExpressionTreeNode>)sender; ;
     84      currSelected = (VisualSymbolicExpressionTreeNode)sender; ;
     85      if (currSelected != null) {
     86        currSelected.LineColor = Color.FromArgb(130, currSelected.LineColor);
     87        RepaintNode(currSelected);
     88      }
    8589      base.OnSymbolicExpressionTreeNodeClicked(sender, e);
    8690    }
    8791
     92    protected override void SymbolicExpressionTreeChart_MouseClick(object sender, MouseEventArgs e) {
     93      if (currSelected != null) {
     94        currSelected.LineColor = Color.FromArgb(255, currSelected.LineColor);
     95        RepaintNode(currSelected);
     96      }
     97      base.SymbolicExpressionTreeChart_MouseClick(sender, e);
     98    }
     99
    88100    protected override void OnSymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
    89101      currSelected = null;
    … …  
    92104
    93105    private void insertNodeToolStripMenuItem_Click(object sender, EventArgs e) {
    94       if (currSelected == null || currSelected.Content is SymbolicExpressionTreeTerminalNode) return;
    95       var parent = currSelected.Content;
     106      if (currSelected == null || currSelected.SymbolicExpressionTreeNode is SymbolicExpressionTreeTerminalNode) return;
     107      var parent = currSelected.SymbolicExpressionTreeNode;
    96108
    97109      using (var dialog = new InsertNodeDialog()) {
    98         dialog.SetAllowedSymbols(parent.Grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun || s is GroupSymbol))); // allow everything
     110        dialog.SetAllowedSymbols(parent.Grammar.AllowedSymbols.Where(s => s.Enabled && s.InitialFrequency > 0.0 && !(s is ProgramRootSymbol || s is StartSymbol || s is Defun)));
    99111        dialog.ShowDialog(this);
    100112        if (dialog.DialogResult != DialogResult.OK) return;
    … …  
    126138      if (currSelected == null) return;
    127139
    128       var node = (ISymbolicExpressionTreeNode)currSelected.Content.Clone();
    129       var originalNode = currSelected.Content;
     140      var node = (ISymbolicExpressionTreeNode)currSelected.SymbolicExpressionTreeNode.Clone();
     141      var originalNode = currSelected.SymbolicExpressionTreeNode;
    130142
    131143      ISymbolicExpressionTreeNode newNode = null;
    … …  
    160172        foreach (var subtree in tempNode.IterateNodesPostfix()) {
    161173          var visualNode = GetVisualSymbolicExpressionTreeNode(subtree);
    162           visualNode.LineColor = Color.Black;
    163           visualNode.TextColor = Color.Black;
     174          visualNode.LineColor = Color.FromArgb(255, visualNode.LineColor); // reset the alpha value to 255
     175          visualNode.TextColor = Color.FromArgb(255, visualNode.TextColor);
    164176          if (subtree.Parent != null) {
    165177            var visualLine = GetVisualSymbolicExpressionTreeNodeConnection(subtree.Parent, subtree);
    166             visualLine.LineColor = Color.Black;
    167           }
    168         }
    169       }
    170       tempNode = currSelected.Content;
     178            visualLine.LineColor = Color.FromArgb(255, visualLine.LineColor);
     179          }
     180        }
     181      }
     182      tempNode = currSelected.SymbolicExpressionTreeNode;
    171183      foreach (var node in tempNode.IterateNodesPostfix()) {
    172184        var visualNode = GetVisualSymbolicExpressionTreeNode(node);
    173         visualNode.LineColor = Color.LightGray;
    174         visualNode.TextColor = Color.LightGray;
     185        visualNode.LineColor = Color.FromArgb(100, visualNode.LineColor);
     186        visualNode.TextColor = Color.FromArgb(100, visualNode.TextColor);
    175187        foreach (var subtree in node.Subtrees) {
    176188          var visualLine = GetVisualSymbolicExpressionTreeNodeConnection(node, subtree);
    177           visualLine.LineColor = Color.LightGray;
    178         }
    179       }
    180       currSelected = null;
    181       RepaintNodes(); // no need to redo the layout and repaint everything since this operation does not change the tree
     189          visualLine.LineColor = Color.FromArgb(100, visualLine.LineColor);
     190        }
     191      }
     192      currSelected = null;
     193      Repaint();
    182194    }
    183195    private void removeNodeToolStripMenuItem_Click(object sender, EventArgs e) {
    184       var node = currSelected.Content;
     196      var node = currSelected.SymbolicExpressionTreeNode;
    185197      if (node == tempNode) tempNode = null;
    186198      ModifyTree(Tree, node.Parent, node, null, removeSubtree: false);
    … …  
    188200    }
    189201    private void removeSubtreeToolStripMenuItem_Click(object sender, EventArgs e) {
    190       var node = currSelected.Content;
     202      var node = currSelected.SymbolicExpressionTreeNode;
    191203      if (node.IterateNodesPostfix().Contains(tempNode)) tempNode = null;
    192204      ModifyTree(Tree, node.Parent, node, null, removeSubtree: true);
    … …  
    197209      if (!(lastOp == EditOp.CopySubtree || lastOp == EditOp.CutSubtree)) return;
    198210      // check if the copied/cut node (stored in the tempNode) can be inserted as a child of the current selected node
    199       var node = currSelected.Content;
     211      var node = currSelected.SymbolicExpressionTreeNode;
    200212      if (node is ConstantTreeNode || node is VariableTreeNode) return;
    201213      // check if the currently selected node can accept the copied node as a child
    … …  
    206218            if (tempNode.IterateNodesBreadth().Contains(node))
    207219              throw new ArgumentException();// cannot cut/paste a node into itself
    208             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     
    209221            ModifyTree(Tree, node, null, tempNode); //insert it as a child to the new parent
    210222            break;

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

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

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
    28   [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Views","Provides views for symbolic data analysis problem classes.", "3.4.6.$WCREV$")]
     28  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Views","Provides views for symbolic data analysis problem classes.", "3.4.3.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginFile("displayModelFrame.html", PluginFileType.Data)]
    … …  
    3232  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3333  [PluginDependency("HeuristicLab.Common", "3.3")]
    34   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3534  [PluginDependency("HeuristicLab.Core", "3.3")]
    3635  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    3736  [PluginDependency("HeuristicLab.Data", "3.3")]
    3837  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
    39   [PluginDependency("HeuristicLab.EPPlus", "3.1")]
    4038  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
    4139  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views", "3.4")]

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Properties/AssemblyInfo.cs.frame

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3131[assembly: AssemblyCompany("")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
    … …  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.4.0.0")]
    55 [assembly: AssemblyFileVersion("3.4.6.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.4.3.$WCREV$")]

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

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

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    4848      this.SuspendLayout();
    4949      //
    50       // symbolicExpressionTreeView
     50      // expressionTreeView
    5151      //
    5252      this.symbolicExpressionTreeView.AllowDrop = true;
    … …  
    5555      this.symbolicExpressionTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
    5656      this.symbolicExpressionTreeView.Location = new System.Drawing.Point(0, 0);
    57       this.symbolicExpressionTreeView.Name = "symbolicExpressionTreeView";
     57      this.symbolicExpressionTreeView.Name = "expressionTreeView";
    5858      this.symbolicExpressionTreeView.ReadOnly = false;
    5959      this.symbolicExpressionTreeView.Size = new System.Drawing.Size(352, 413);
    6060      this.symbolicExpressionTreeView.TabIndex = 0;
    6161      //
    62       // TextualSymbolicDataAnalysisModelView
     62      // SymbolicExpressionModelView
    6363      //
    6464      this.AllowDrop = true;
     65      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    6566      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    6667      this.Controls.Add(this.symbolicExpressionTreeView);
    67       this.Name = "TextualSymbolicDataAnalysisModelView";
     68      this.Name = "SymbolicExpressionModelView";
    6869      this.Size = new System.Drawing.Size(352, 413);
    6970      this.ResumeLayout(false);

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    6767      // oldValueTextBox
    6868      //
    69       this.oldValueTextBox.Location = new System.Drawing.Point(106, 6);
     69      this.oldValueTextBox.Location = new System.Drawing.Point(123, 6);
    7070      this.oldValueTextBox.Name = "oldValueTextBox";
    7171      this.oldValueTextBox.ReadOnly = true;
    … …  
    7575      // newValueTextBox
    7676      //
    77       this.newValueTextBox.Location = new System.Drawing.Point(106, 32);
     77      this.newValueTextBox.Location = new System.Drawing.Point(123, 42);
    7878      this.newValueTextBox.Name = "newValueTextBox";
    7979      this.newValueTextBox.Size = new System.Drawing.Size(131, 20);
    … …  
    8686      //
    8787      this.newValueLabel.AutoSize = true;
    88       this.newValueLabel.Location = new System.Drawing.Point(12, 35);
     88      this.newValueLabel.Location = new System.Drawing.Point(12, 45);
    8989      this.newValueLabel.Name = "newValueLabel";
    9090      this.newValueLabel.Size = new System.Drawing.Size(59, 13);
    … …  
    101101      //
    102102      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    103       this.okButton.Location = new System.Drawing.Point(81, 66);
     103      this.okButton.Location = new System.Drawing.Point(15, 79);
    104104      this.okButton.Name = "okButton";
    105105      this.okButton.Size = new System.Drawing.Size(75, 23);
    … …  
    113113      this.cancelButton.CausesValidation = false;
    114114      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    115       this.cancelButton.Location = new System.Drawing.Point(162, 66);
     115      this.cancelButton.Location = new System.Drawing.Point(179, 79);
    116116      this.cancelButton.Name = "cancelButton";
    117117      this.cancelButton.Size = new System.Drawing.Size(75, 23);
    … …  
    127127      this.AutoSize = true;
    128128      this.CancelButton = this.cancelButton;
    129       this.ClientSize = new System.Drawing.Size(248, 101);
     129      this.ClientSize = new System.Drawing.Size(269, 116);
    130130      this.ControlBox = false;
    131131      this.Controls.Add(this.cancelButton);

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    6363      //
    6464      this.nodeSymbolLabel.AutoSize = true;
    65       this.nodeSymbolLabel.Location = new System.Drawing.Point(19, 13);
     65      this.nodeSymbolLabel.Location = new System.Drawing.Point(13, 13);
    6666      this.nodeSymbolLabel.Name = "nodeSymbolLabel";
    6767      this.nodeSymbolLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    7373      this.allowedSymbolsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    7474      this.allowedSymbolsCombo.FormattingEnabled = true;
    75       this.allowedSymbolsCombo.Location = new System.Drawing.Point(101, 10);
     75      this.allowedSymbolsCombo.Location = new System.Drawing.Point(120, 10);
    7676      this.allowedSymbolsCombo.Name = "allowedSymbolsCombo";
    77       this.allowedSymbolsCombo.Size = new System.Drawing.Size(127, 21);
     77      this.allowedSymbolsCombo.Size = new System.Drawing.Size(108, 21);
    7878      this.allowedSymbolsCombo.TabIndex = 1;
    7979      this.allowedSymbolsCombo.SelectedIndexChanged += new System.EventHandler(this.allowedSymbolsCombo_SelectedIndexChanged);
    … …  
    8383      //
    8484      this.variableWeightLabel.AutoSize = true;
    85       this.variableWeightLabel.Location = new System.Drawing.Point(19, 40);
     85      this.variableWeightLabel.Location = new System.Drawing.Point(13, 44);
    8686      this.variableWeightLabel.Name = "variableWeightLabel";
    8787      this.variableWeightLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    9393      //
    9494      this.variableNameLabel.AutoSize = true;
    95       this.variableNameLabel.Location = new System.Drawing.Point(19, 66);
     95      this.variableNameLabel.Location = new System.Drawing.Point(13, 74);
    9696      this.variableNameLabel.Name = "variableNameLabel";
    9797      this.variableNameLabel.Size = new System.Drawing.Size(35, 13);
    … …  
    104104      this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    105105      this.variableNamesCombo.FormattingEnabled = true;
    106       this.variableNamesCombo.Location = new System.Drawing.Point(101, 63);
     106      this.variableNamesCombo.Location = new System.Drawing.Point(120, 71);
    107107      this.variableNamesCombo.Name = "variableNamesCombo";
    108       this.variableNamesCombo.Size = new System.Drawing.Size(127, 21);
     108      this.variableNamesCombo.Size = new System.Drawing.Size(108, 21);
    109109      this.variableNamesCombo.TabIndex = 5;
    110110      this.variableNamesCombo.Visible = false;
    … …  
    112112      // variableWeightTextBox
    113113      //
    114       this.variableWeightTextBox.Location = new System.Drawing.Point(101, 37);
     114      this.variableWeightTextBox.Location = new System.Drawing.Point(120, 41);
    115115      this.variableWeightTextBox.Name = "variableWeightTextBox";
    116       this.variableWeightTextBox.Size = new System.Drawing.Size(127, 20);
     116      this.variableWeightTextBox.Size = new System.Drawing.Size(108, 20);
    117117      this.variableWeightTextBox.TabIndex = 6;
    118118      this.variableWeightTextBox.Text = "0.0";
    … …  
    122122      // constantValueTextBox
    123123      //
    124       this.constantValueTextBox.Location = new System.Drawing.Point(101, 37);
     124      this.constantValueTextBox.Location = new System.Drawing.Point(120, 41);
    125125      this.constantValueTextBox.Name = "constantValueTextBox";
    126       this.constantValueTextBox.Size = new System.Drawing.Size(127, 20);
     126      this.constantValueTextBox.Size = new System.Drawing.Size(108, 20);
    127127      this.constantValueTextBox.TabIndex = 7;
    128128      this.constantValueTextBox.Text = "0.0";
    … …  
    133133      //
    134134      this.constantValueLabel.AutoSize = true;
    135       this.constantValueLabel.Location = new System.Drawing.Point(19, 40);
     135      this.constantValueLabel.Location = new System.Drawing.Point(13, 44);
    136136      this.constantValueLabel.Name = "constantValueLabel";
    137137      this.constantValueLabel.Size = new System.Drawing.Size(34, 13);
    … …  
    149149      //
    150150      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    151       this.okButton.Location = new System.Drawing.Point(72, 98);
     151      this.okButton.Location = new System.Drawing.Point(12, 112);
    152152      this.okButton.Name = "okButton";
    153153      this.okButton.Size = new System.Drawing.Size(75, 23);
    … …  
    160160      //
    161161      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    162       this.cancelButton.Location = new System.Drawing.Point(153, 98);
     162      this.cancelButton.Location = new System.Drawing.Point(153, 112);
    163163      this.cancelButton.Name = "cancelButton";
    164164      this.cancelButton.Size = new System.Drawing.Size(75, 23);
    … …  
    173173      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    174174      this.CancelButton = this.cancelButton;
    175       this.ClientSize = new System.Drawing.Size(241, 133);
     175      this.ClientSize = new System.Drawing.Size(240, 147);
    176176      this.ControlBox = false;
    177177      this.Controls.Add(this.cancelButton);

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.Designer.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    6161      //
    6262      this.originalValueLabel.AutoSize = true;
    63       this.originalValueLabel.Location = new System.Drawing.Point(6, 42);
     63      this.originalValueLabel.Location = new System.Drawing.Point(12, 48);
    6464      this.originalValueLabel.Name = "originalValueLabel";
    6565      this.originalValueLabel.Size = new System.Drawing.Size(72, 13);
    … …  
    6969      // oldValueTextBox
    7070      //
    71       this.oldValueTextBox.Location = new System.Drawing.Point(101, 39);
     71      this.oldValueTextBox.Location = new System.Drawing.Point(123, 45);
    7272      this.oldValueTextBox.Name = "oldValueTextBox";
    7373      this.oldValueTextBox.ReadOnly = true;
    … …  
    7777      // newValueTextBox
    7878      //
    79       this.newValueTextBox.Location = new System.Drawing.Point(101, 65);
     79      this.newValueTextBox.Location = new System.Drawing.Point(123, 82);
    8080      this.newValueTextBox.Name = "newValueTextBox";
    8181      this.newValueTextBox.Size = new System.Drawing.Size(131, 20);
    … …  
    8888      //
    8989      this.newValueLabel.AutoSize = true;
    90       this.newValueLabel.Location = new System.Drawing.Point(6, 68);
     90      this.newValueLabel.Location = new System.Drawing.Point(12, 85);
    9191      this.newValueLabel.Name = "newValueLabel";
    9292      this.newValueLabel.Size = new System.Drawing.Size(59, 13);
    … …  
    103103      //
    104104      this.variableNameLabel.AutoSize = true;
    105       this.variableNameLabel.Location = new System.Drawing.Point(6, 15);
     105      this.variableNameLabel.Location = new System.Drawing.Point(12, 12);
    106106      this.variableNameLabel.Name = "variableNameLabel";
    107107      this.variableNameLabel.Size = new System.Drawing.Size(76, 13);
    … …  
    114114      this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    115115      this.variableNamesCombo.FormattingEnabled = true;
    116       this.variableNamesCombo.Location = new System.Drawing.Point(101, 12);
     116      this.variableNamesCombo.Location = new System.Drawing.Point(123, 9);
    117117      this.variableNamesCombo.Name = "variableNamesCombo";
    118118      this.variableNamesCombo.Size = new System.Drawing.Size(131, 21);
    … …  
    126126      //
    127127      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    128       this.okButton.Location = new System.Drawing.Point(75, 98);
     128      this.okButton.Location = new System.Drawing.Point(15, 119);
    129129      this.okButton.Name = "okButton";
    130130      this.okButton.Size = new System.Drawing.Size(75, 23);
    … …  
    138138      this.cancelButton.CausesValidation = false;
    139139      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    140       this.cancelButton.Location = new System.Drawing.Point(156, 98);
     140      this.cancelButton.Location = new System.Drawing.Point(179, 119);
    141141      this.cancelButton.Name = "cancelButton";
    142142      this.cancelButton.Size = new System.Drawing.Size(75, 23);
    … …  
    152152      this.AutoSize = true;
    153153      this.CancelButton = this.cancelButton;
    154       this.ClientSize = new System.Drawing.Size(244, 134);
     154      this.ClientSize = new System.Drawing.Size(269, 154);
    155155      this.ControlBox = false;
    156156      this.Controls.Add(this.cancelButton);

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.cs

    r11202 r11203  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.