Changeset 11205 for branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Timestamp:
- 07/18/14 13:44:53 (10 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 1 deleted
- 33 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll 10 11 HeuristicLab 3.3.5.1.ReSharper.user 11 12 HeuristicLab 3.3.6.0.ReSharper.user 12 13 HeuristicLab.4.5.resharper.user 13 14 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development 14 16 HeuristicLab.resharper.user 15 17 ProtoGen.exe … … 17 19 _ReSharper.HeuristicLab 18 20 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests 19 22 _ReSharper.HeuristicLab.ExtLibs 20 23 bin 21 24 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r11203 r11205 97 97 <Private>False</Private> 98 98 </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> 99 104 <Reference Include="System" /> 100 105 <Reference Include="System.Core"> … … 103 108 <Reference Include="System.Drawing" /> 104 109 <Reference Include="System.Windows.Forms" /> 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> 110 </ItemGroup> 111 <ItemGroup> 112 <Compile Include="Exporters\SymbolicSolutionExcelExporter.cs" /> 116 113 <Compile Include="InteractiveSymbolicExpressionTreeChart.cs"> 117 114 <SubType>UserControl</SubType> … … 211 208 </ProjectReference> 212 209 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj"> 213 <Project>{0 E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>210 <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project> 214 211 <Name>HeuristicLab.Common.Resources-3.3</Name> 215 212 <Private>False</Private> … … 260 257 <Private>False</Private> 261 258 </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>272 259 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 273 260 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> … … 275 262 <Private>False</Private> 276 263 </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>287 264 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 288 265 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> … … 298 275 <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project> 299 276 <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>305 277 <Private>False</Private> 306 278 </ProjectReference> -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 0Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 19 19 */ 20 20 #endregion 21 21 22 22 23 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views { … … 46 47 private void InitializeComponent() { 47 48 this.components = new System.ComponentModel.Container(); 49 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InteractiveSymbolicDataAnalysisSolutionSimplifierView)); 48 50 this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 49 51 this.splitContainer = new System.Windows.Forms.SplitContainer(); … … 51 53 this.treeStatusValue = new System.Windows.Forms.Label(); 52 54 this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); 55 this.btnSimplify = new System.Windows.Forms.Button(); 53 56 this.btnOptimizeConstants = new System.Windows.Forms.Button(); 54 this.btnSimplify = new System.Windows.Forms.Button(); 55 this.treeStatusLabel = new System.Windows.Forms.Label(); 57 this.grpViewHost = new System.Windows.Forms.GroupBox(); 56 58 this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart(); 57 this.grpViewHost = new System.Windows.Forms.GroupBox();58 59 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); 59 60 this.splitContainer.Panel1.SuspendLayout(); … … 103 104 this.grpSimplify.Controls.Add(this.treeStatusValue); 104 105 this.grpSimplify.Controls.Add(this.flowLayoutPanel); 105 this.grpSimplify.Controls.Add(this.treeStatusLabel);106 106 this.grpSimplify.Controls.Add(this.treeChart); 107 107 this.grpSimplify.Dock = System.Windows.Forms.DockStyle.Fill; … … 115 115 // treeStatusValue 116 116 // 117 this.treeStatusValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 117 118 this.treeStatusValue.AutoSize = true; 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);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); 121 122 this.treeStatusValue.Name = "treeStatusValue"; 122 this.treeStatusValue.Size = new System.Drawing.Size( 30, 13);123 this.treeStatusValue.Size = new System.Drawing.Size(63, 13); 123 124 this.treeStatusValue.TabIndex = 3; 124 this.treeStatusValue.Text = "Valid"; 125 this.treeStatusValue.Text = "Invalid Tree"; 126 this.treeStatusValue.Visible = false; 125 127 // 126 128 // flowLayoutPanel … … 136 138 this.flowLayoutPanel.WrapContents = false; 137 139 // 140 // btnSimplify 141 // 142 this.btnSimplify.AutoSize = true; 143 this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator; 144 this.btnSimplify.Location = new System.Drawing.Point(3, 3); 145 this.btnSimplify.Name = "btnSimplify"; 146 this.btnSimplify.Size = new System.Drawing.Size(80, 24); 147 this.btnSimplify.TabIndex = 1; 148 this.btnSimplify.Text = "Simplify"; 149 this.btnSimplify.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; 150 this.btnSimplify.UseVisualStyleBackColor = true; 151 this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click); 152 // 138 153 // btnOptimizeConstants 139 154 // 140 this.btnOptimizeConstants.A nchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));155 this.btnOptimizeConstants.AutoSize = true; 141 156 this.btnOptimizeConstants.Enabled = false; 142 this.btnOptimizeConstants.Location = new System.Drawing.Point(104, 3); 157 this.btnOptimizeConstants.Image = HeuristicLab.Common.Resources.VSImageLibrary.Performance; 158 this.btnOptimizeConstants.Location = new System.Drawing.Point(89, 3); 143 159 this.btnOptimizeConstants.Name = "btnOptimizeConstants"; 144 this.btnOptimizeConstants.Size = new System.Drawing.Size( 97, 23);160 this.btnOptimizeConstants.Size = new System.Drawing.Size(80, 24); 145 161 this.btnOptimizeConstants.TabIndex = 2; 146 162 this.btnOptimizeConstants.Text = "Optimize"; 163 this.btnOptimizeConstants.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; 147 164 this.btnOptimizeConstants.UseVisualStyleBackColor = true; 148 165 this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click); 149 //150 // btnSimplify151 //152 this.btnSimplify.Location = new System.Drawing.Point(3, 3);153 this.btnSimplify.Name = "btnSimplify";154 this.btnSimplify.Size = new System.Drawing.Size(95, 23);155 this.btnSimplify.TabIndex = 1;156 this.btnSimplify.Text = "Simplify";157 this.btnSimplify.UseVisualStyleBackColor = true;158 this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click);159 //160 // treeStatusLabel161 //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 // treeChart171 //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);187 166 // 188 167 // grpViewHost … … 196 175 this.grpViewHost.TabStop = false; 197 176 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); 198 195 // 199 196 // InteractiveSymbolicDataAnalysisSolutionSimplifierView … … 213 210 this.grpSimplify.PerformLayout(); 214 211 this.flowLayoutPanel.ResumeLayout(false); 212 this.flowLayoutPanel.PerformLayout(); 215 213 this.grpViewHost.ResumeLayout(false); 216 214 this.ResumeLayout(false); … … 220 218 #endregion 221 219 222 private InteractiveSymbolicExpressionTreeChart treeChart;220 private HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart treeChart; 223 221 private System.Windows.Forms.SplitContainer splitContainer; 224 222 private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost; … … 229 227 protected System.Windows.Forms.Button btnOptimizeConstants; 230 228 private System.Windows.Forms.Label treeStatusValue; 231 private System.Windows.Forms.Label treeStatusLabel;232 229 } 233 230 } -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 35 35 private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> changedNodes; 36 36 private Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts; 37 37 38 private enum TreeState { Valid, Invalid } 38 39 private TreeState treeState; 39 40 40 p ublicInteractiveSymbolicDataAnalysisSolutionSimplifierView() {41 protected InteractiveSymbolicDataAnalysisSolutionSimplifierView() { 41 42 InitializeComponent(); 42 43 foldedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>(); … … 53 54 /// </summary> 54 55 /// <param name="tree">The symbolic expression tree</param> 55 /// <param name=" node">The insertion point (ie, the parent node who will receive a new child)</param>56 /// <param name="parent">The insertion point (ie, the parent node who will receive a new child)</param> 56 57 /// <param name="oldChild">The subtree to be replaced</param> 57 58 /// <param name="newChild">The replacement subtree</param> 58 59 /// <param name="removeSubtree">Flag used to indicate if whole subtrees should be removed (default behavior), or just the subtree root</param> 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 { 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) { 74 72 for (int i = oldChild.SubtreeCount - 1; i >= 0; --i) { 75 73 var subtree = oldChild.GetSubtree(i); 76 74 oldChild.RemoveSubtree(i); 77 node.AddSubtree(subtree);75 parent.AddSubtree(subtree); 78 76 } 79 77 } 80 } else { // replacement operation 81 var replacementIndex = node.IndexOfSubtree(oldChild); 82 node.RemoveSubtree(replacementIndex); 83 node.InsertSubtree(replacementIndex, newChild); 84 newChild.Parent = node; 78 } else { 79 // replacement operation 80 var replacementIndex = parent.IndexOfSubtree(oldChild); 81 parent.RemoveSubtree(replacementIndex); 82 parent.InsertSubtree(replacementIndex, newChild); 83 newChild.Parent = parent; 85 84 if (changedNodes.ContainsKey(oldChild)) { 86 85 changedNodes.Add(newChild, changedNodes[oldChild]); // so that on double click the original node is restored … … 90 89 } 91 90 } 92 if (IsValid(tree)) { 93 treeState = TreeState.Valid; 94 UpdateModel(Content.Model.SymbolicExpressionTree); 95 } else { 96 treeState = TreeState.Invalid; 97 } 98 } 99 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 }; 100 111 private bool IsValid(ISymbolicExpressionTree tree) { 101 112 treeChart.Tree = tree; 102 113 treeChart.Repaint(); 103 bool valid = !tree.IterateNodesPostfix().Any(node => node.SubtreeCount < node.Symbol.MinimumArity|| node.SubtreeCount > node.Symbol.MaximumArity);114 bool valid = !tree.IterateNodesPostfix().Any(node => node.SubtreeCount < GetMinArity(node.Symbol) || node.SubtreeCount > node.Symbol.MaximumArity); 104 115 if (valid) { 105 116 btnOptimizeConstants.Enabled = true; 106 117 btnSimplify.Enabled = true; 107 treeStatusValue.Text = "Valid"; 108 treeStatusValue.ForeColor = Color.Green; 118 treeStatusValue.Visible = false; 109 119 } else { 110 120 btnOptimizeConstants.Enabled = false; 111 121 btnSimplify.Enabled = false; 112 treeStatusValue.Text = "Invalid"; 113 treeStatusValue.ForeColor = Color.Red; 122 treeStatusValue.Visible = true; 114 123 } 115 124 this.Refresh(); … … 126 135 Content.ModelChanged += Content_Changed; 127 136 Content.ProblemDataChanged += Content_Changed; 137 treeChart.Repainted += treeChart_Repainted; 128 138 } 129 139 protected override void DeregisterContentEvents() { … … 131 141 Content.ModelChanged -= Content_Changed; 132 142 Content.ProblemDataChanged -= Content_Changed; 143 treeChart.Repainted -= treeChart_Repainted; 133 144 } 134 145 … … 144 155 } 145 156 157 private void treeChart_Repainted(object sender, EventArgs e) { 158 if (nodeImpacts != null && nodeImpacts.Count > 0) 159 PaintNodeImpacts(); 160 } 161 146 162 private void UpdateView() { 147 163 if (Content == null || Content.Model == null || Content.ProblemData == null) return; … … 149 165 treeChart.Tree = tree.Root.SubtreeCount > 1 ? new SymbolicExpressionTree(tree.Root) : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0)); 150 166 151 var replacementValues = CalculateReplacementValues(tree); 167 var impactAndReplacementValues = CalculateImpactAndReplacementValues(tree); 168 var replacementValues = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item2); 152 169 foreach (var pair in replacementValues.Where(pair => !(pair.Key is ConstantTreeNode))) { 153 170 foldedNodes[pair.Key] = MakeConstantTreeNode(pair.Value); 154 171 } 155 156 nodeImpacts = CalculateImpactValues(tree); 172 nodeImpacts = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item1); 157 173 PaintNodeImpacts(); 158 174 } … … 160 176 protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateReplacementValues(ISymbolicExpressionTree tree); 161 177 protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicExpressionTree tree); 178 protected abstract Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>> CalculateImpactAndReplacementValues(ISymbolicExpressionTree tree); 162 179 protected abstract void UpdateModel(ISymbolicExpressionTree tree); 163 180 … … 171 188 private void treeChart_SymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) { 172 189 if (treeState == TreeState.Invalid) return; 173 var visualNode = (Visual SymbolicExpressionTreeNode)sender;174 var symbExprTreeNode = (SymbolicExpressionTreeNode)visualNode.SymbolicExpressionTreeNode;175 if (symbExprTreeNode == null) 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; 176 193 var tree = Content.Model.SymbolicExpressionTree; 177 194 var parent = symbExprTreeNode.Parent; … … 192 209 private void SwitchNodeWithReplacementNode(ISymbolicExpressionTreeNode parent, int subTreeIndex) { 193 210 ISymbolicExpressionTreeNode subTree = parent.GetSubtree(subTreeIndex); 194 parent.RemoveSubtree(subTreeIndex);195 211 if (foldedNodes.ContainsKey(subTree)) { 212 parent.RemoveSubtree(subTreeIndex); 196 213 var replacementNode = foldedNodes[subTree]; 197 214 parent.InsertSubtree(subTreeIndex, replacementNode); … … 207 224 double min = impacts.Min(); 208 225 foreach (ISymbolicExpressionTreeNode treeNode in Content.Model.SymbolicExpressionTree.IterateNodesPostfix()) { 209 Visual SymbolicExpressionTreeNodevisualTree = treeChart.GetVisualSymbolicExpressionTreeNode(treeNode);226 VisualTreeNode<ISymbolicExpressionTreeNode> visualTree = treeChart.GetVisualSymbolicExpressionTreeNode(treeNode); 210 227 211 228 if (!(treeNode is ConstantTreeNode) && nodeImpacts.ContainsKey(treeNode)) { 229 visualTree.ToolTip = visualTree.Content.ToString(); 212 230 double impact = nodeImpacts[treeNode]; 213 231 -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 56 56 this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); 57 57 this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 58 this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); 59 this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); 58 60 this.SuspendLayout(); 59 61 // … … 61 63 // 62 64 this.insertNodeToolStripMenuItem.Name = "insertNodeToolStripMenuItem"; 63 this.insertNodeToolStripMenuItem.Size = new System.Drawing.Size(1 47, 22);65 this.insertNodeToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 64 66 this.insertNodeToolStripMenuItem.Text = "Insert Node"; 65 67 this.insertNodeToolStripMenuItem.Click += new System.EventHandler(this.insertNodeToolStripMenuItem_Click); … … 68 70 // 69 71 this.changeNodeToolStripMenuItem.Name = "changeNodeToolStripMenuItem"; 70 this.changeNodeToolStripMenuItem.Size = new System.Drawing.Size(1 47, 22);72 this.changeNodeToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 71 73 this.changeNodeToolStripMenuItem.Text = "Change Node"; 72 74 this.changeNodeToolStripMenuItem.Click += new System.EventHandler(this.changeNodeToolStripMenuItem_Click); … … 75 77 // 76 78 this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; 77 this.cutToolStripMenuItem.Size = new System.Drawing.Size(1 47, 22);78 this.cutToolStripMenuItem.Text = "Cut ";79 this.cutToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 80 this.cutToolStripMenuItem.Text = "Cut Subtree"; 79 81 this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); 80 82 // … … 85 87 this.removeSubtreeToolStripMenuItem}); 86 88 this.removeToolStripMenuItem.Name = "removeToolStripMenuItem"; 87 this.removeToolStripMenuItem.Size = new System.Drawing.Size(1 47, 22);89 this.removeToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 88 90 this.removeToolStripMenuItem.Text = "Remove"; 89 91 this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeSubtreeToolStripMenuItem_Click); … … 106 108 // 107 109 this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; 108 this.pasteToolStripMenuItem.Size = new System.Drawing.Size(1 47, 22);109 this.pasteToolStripMenuItem.Text = "Paste ";110 this.pasteToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 111 this.pasteToolStripMenuItem.Text = "Paste Subtree"; 110 112 this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Clicked); 111 113 // … … 118 120 // 119 121 this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; 120 this.copyToolStripMenuItem.Size = new System.Drawing.Size(1 47, 22);121 this.copyToolStripMenuItem.Text = "Copy ";122 this.copyToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 123 this.copyToolStripMenuItem.Text = "Copy Subtree"; 122 124 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); 123 135 // 124 136 // contextMenuStrip 125 137 // 126 138 this.contextMenuStrip.Opened += this.contextMenuStrip_Opened; 127 this.contextMenuStrip.Items.AddRange(new ToolStripItem[] { insertNodeToolStripMenuItem, 139 this.contextMenuStrip.Items.AddRange(new ToolStripItem[] { toolStripSeparator1, 140 insertNodeToolStripMenuItem, 141 removeToolStripMenuItem, 128 142 changeNodeToolStripMenuItem, 143 toolStripSeparator2, 129 144 copyToolStripMenuItem, 130 145 cutToolStripMenuItem, 131 removeToolStripMenuItem,132 146 pasteToolStripMenuItem }); 133 147 // … … 139 153 this.Name = "InteractiveSymbolicExpressionTreeChart"; 140 154 this.ResumeLayout(false); 141 142 155 } 143 156 … … 154 167 private ToolStripSeparator toolStripSeparator; 155 168 private ToolStripMenuItem copyToolStripMenuItem; 169 private ToolStripSeparator toolStripSeparator1; 170 private ToolStripSeparator toolStripSeparator2; 156 171 } 157 172 } -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 33 33 internal sealed partial class InteractiveSymbolicExpressionTreeChart : SymbolicExpressionTreeChart { 34 34 private ISymbolicExpressionTreeNode tempNode; // node in clipboard (to be cut/copy/pasted etc) 35 private Visual SymbolicExpressionTreeNodecurrSelected; // currently selected node35 private VisualTreeNode<ISymbolicExpressionTreeNode> currSelected; // currently selected node 36 36 private enum EditOp { NoOp, CopySubtree, CutSubtree } 37 37 private EditOp lastOp = EditOp.NoOp; … … 65 65 pasteToolStripMenuItem.Visible = false; 66 66 } else { 67 var node = currSelected. SymbolicExpressionTreeNode;67 var node = currSelected.Content; 68 68 insertNodeToolStripMenuItem.Visible = true; 69 69 changeNodeToolStripMenuItem.Visible = true; … … 76 76 pasteToolStripMenuItem.Visible = true; 77 77 pasteToolStripMenuItem.Enabled = tempNode != null && insertNodeToolStripMenuItem.Enabled 78 && !(lastOp == EditOp.CutSubtree 79 && tempNode.IterateNodesBreadth().Contains(currSelected.SymbolicExpressionTreeNode));78 && !(lastOp == EditOp.CutSubtree && tempNode.IterateNodesBreadth().Contains(node)) 79 && node.SubtreeCount < node.Symbol.MaximumArity; 80 80 } 81 81 } 82 82 83 83 protected override void OnSymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) { 84 currSelected = (VisualSymbolicExpressionTreeNode)sender; ; 85 if (currSelected != null) { 86 currSelected.LineColor = Color.FromArgb(130, currSelected.LineColor); 87 RepaintNode(currSelected); 88 } 84 currSelected = (VisualTreeNode<ISymbolicExpressionTreeNode>)sender; ; 89 85 base.OnSymbolicExpressionTreeNodeClicked(sender, e); 90 86 } 91 87 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 100 88 protected override void OnSymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) { 101 89 currSelected = null; … … 104 92 105 93 private void insertNodeToolStripMenuItem_Click(object sender, EventArgs e) { 106 if (currSelected == null || currSelected. SymbolicExpressionTreeNodeis SymbolicExpressionTreeTerminalNode) return;107 var parent = currSelected. SymbolicExpressionTreeNode;94 if (currSelected == null || currSelected.Content is SymbolicExpressionTreeTerminalNode) return; 95 var parent = currSelected.Content; 108 96 109 97 using (var dialog = new InsertNodeDialog()) { 110 dialog.SetAllowedSymbols(parent.Grammar. AllowedSymbols.Where(s => s.Enabled && s.InitialFrequency > 0.0 && !(s is ProgramRootSymbol || s is StartSymbol || s is Defun)));98 dialog.SetAllowedSymbols(parent.Grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun || s is GroupSymbol))); // allow everything 111 99 dialog.ShowDialog(this); 112 100 if (dialog.DialogResult != DialogResult.OK) return; … … 138 126 if (currSelected == null) return; 139 127 140 var node = (ISymbolicExpressionTreeNode)currSelected. SymbolicExpressionTreeNode.Clone();141 var originalNode = currSelected. SymbolicExpressionTreeNode;128 var node = (ISymbolicExpressionTreeNode)currSelected.Content.Clone(); 129 var originalNode = currSelected.Content; 142 130 143 131 ISymbolicExpressionTreeNode newNode = null; … … 172 160 foreach (var subtree in tempNode.IterateNodesPostfix()) { 173 161 var visualNode = GetVisualSymbolicExpressionTreeNode(subtree); 174 visualNode.LineColor = Color. FromArgb(255, visualNode.LineColor); // reset the alpha value to 255175 visualNode.TextColor = Color. FromArgb(255, visualNode.TextColor);162 visualNode.LineColor = Color.Black; 163 visualNode.TextColor = Color.Black; 176 164 if (subtree.Parent != null) { 177 165 var visualLine = GetVisualSymbolicExpressionTreeNodeConnection(subtree.Parent, subtree); 178 visualLine.LineColor = Color. FromArgb(255, visualLine.LineColor);179 } 180 } 181 } 182 tempNode = currSelected. SymbolicExpressionTreeNode;166 visualLine.LineColor = Color.Black; 167 } 168 } 169 } 170 tempNode = currSelected.Content; 183 171 foreach (var node in tempNode.IterateNodesPostfix()) { 184 172 var visualNode = GetVisualSymbolicExpressionTreeNode(node); 185 visualNode.LineColor = Color. FromArgb(100, visualNode.LineColor);186 visualNode.TextColor = Color. FromArgb(100, visualNode.TextColor);173 visualNode.LineColor = Color.LightGray; 174 visualNode.TextColor = Color.LightGray; 187 175 foreach (var subtree in node.Subtrees) { 188 176 var visualLine = GetVisualSymbolicExpressionTreeNodeConnection(node, subtree); 189 visualLine.LineColor = Color. FromArgb(100, visualLine.LineColor);190 } 191 } 192 currSelected = null; 193 Repaint ();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 194 182 } 195 183 private void removeNodeToolStripMenuItem_Click(object sender, EventArgs e) { 196 var node = currSelected. SymbolicExpressionTreeNode;184 var node = currSelected.Content; 197 185 if (node == tempNode) tempNode = null; 198 186 ModifyTree(Tree, node.Parent, node, null, removeSubtree: false); … … 200 188 } 201 189 private void removeSubtreeToolStripMenuItem_Click(object sender, EventArgs e) { 202 var node = currSelected. SymbolicExpressionTreeNode;190 var node = currSelected.Content; 203 191 if (node.IterateNodesPostfix().Contains(tempNode)) tempNode = null; 204 192 ModifyTree(Tree, node.Parent, node, null, removeSubtree: true); … … 209 197 if (!(lastOp == EditOp.CopySubtree || lastOp == EditOp.CutSubtree)) return; 210 198 // check if the copied/cut node (stored in the tempNode) can be inserted as a child of the current selected node 211 var node = currSelected. SymbolicExpressionTreeNode;199 var node = currSelected.Content; 212 200 if (node is ConstantTreeNode || node is VariableTreeNode) return; 213 201 // check if the currently selected node can accept the copied node as a child … … 218 206 if (tempNode.IterateNodesBreadth().Contains(node)) 219 207 throw new ArgumentException();// cannot cut/paste a node into itself 220 ModifyTree(Tree, tempNode.Parent, tempNode, null); //remove node from its original parent 208 ModifyTree(Tree, tempNode.Parent, tempNode, null); //remove node from its original parent 221 209 ModifyTree(Tree, node, null, tempNode); //insert it as a child to the new parent 222 210 break; -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views { 28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Views","Provides views for symbolic data analysis problem classes.", "3.4. 3.$WCREV$")]28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Views","Provides views for symbolic data analysis problem classes.", "3.4.6.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginFile("displayModelFrame.html", PluginFileType.Data)] … … 32 32 [PluginDependency("HeuristicLab.Collections", "3.3")] 33 33 [PluginDependency("HeuristicLab.Common", "3.3")] 34 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 34 35 [PluginDependency("HeuristicLab.Core", "3.3")] 35 36 [PluginDependency("HeuristicLab.Core.Views", "3.3")] 36 37 [PluginDependency("HeuristicLab.Data", "3.3")] 37 38 [PluginDependency("HeuristicLab.Data.Views", "3.3")] 39 [PluginDependency("HeuristicLab.EPPlus", "3.1")] 38 40 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")] 39 41 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views", "3.4")] -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Properties/AssemblyInfo.cs.frame
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 31 31 [assembly: AssemblyCompany("")] 32 32 [assembly: AssemblyProduct("HeuristicLab")] 33 [assembly: AssemblyCopyright("(c) 2002-201 2HEAL")]33 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")] 34 34 [assembly: AssemblyTrademark("")] 35 35 [assembly: AssemblyCulture("")] … … 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.4.0.0")] 55 [assembly: AssemblyFileVersion("3.4. 3.$WCREV$")]55 [assembly: AssemblyFileVersion("3.4.6.$WCREV$")] -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 48 48 this.SuspendLayout(); 49 49 // 50 // expressionTreeView50 // symbolicExpressionTreeView 51 51 // 52 52 this.symbolicExpressionTreeView.AllowDrop = true; … … 55 55 this.symbolicExpressionTreeView.Dock = System.Windows.Forms.DockStyle.Fill; 56 56 this.symbolicExpressionTreeView.Location = new System.Drawing.Point(0, 0); 57 this.symbolicExpressionTreeView.Name = " expressionTreeView";57 this.symbolicExpressionTreeView.Name = "symbolicExpressionTreeView"; 58 58 this.symbolicExpressionTreeView.ReadOnly = false; 59 59 this.symbolicExpressionTreeView.Size = new System.Drawing.Size(352, 413); 60 60 this.symbolicExpressionTreeView.TabIndex = 0; 61 61 // 62 // SymbolicExpressionModelView62 // TextualSymbolicDataAnalysisModelView 63 63 // 64 64 this.AllowDrop = true; 65 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);66 65 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 67 66 this.Controls.Add(this.symbolicExpressionTreeView); 68 this.Name = " SymbolicExpressionModelView";67 this.Name = "TextualSymbolicDataAnalysisModelView"; 69 68 this.Size = new System.Drawing.Size(352, 413); 70 69 this.ResumeLayout(false); -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 67 67 // oldValueTextBox 68 68 // 69 this.oldValueTextBox.Location = new System.Drawing.Point(1 23, 6);69 this.oldValueTextBox.Location = new System.Drawing.Point(106, 6); 70 70 this.oldValueTextBox.Name = "oldValueTextBox"; 71 71 this.oldValueTextBox.ReadOnly = true; … … 75 75 // newValueTextBox 76 76 // 77 this.newValueTextBox.Location = new System.Drawing.Point(1 23, 42);77 this.newValueTextBox.Location = new System.Drawing.Point(106, 32); 78 78 this.newValueTextBox.Name = "newValueTextBox"; 79 79 this.newValueTextBox.Size = new System.Drawing.Size(131, 20); … … 86 86 // 87 87 this.newValueLabel.AutoSize = true; 88 this.newValueLabel.Location = new System.Drawing.Point(12, 45);88 this.newValueLabel.Location = new System.Drawing.Point(12, 35); 89 89 this.newValueLabel.Name = "newValueLabel"; 90 90 this.newValueLabel.Size = new System.Drawing.Size(59, 13); … … 101 101 // 102 102 this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; 103 this.okButton.Location = new System.Drawing.Point( 15, 79);103 this.okButton.Location = new System.Drawing.Point(81, 66); 104 104 this.okButton.Name = "okButton"; 105 105 this.okButton.Size = new System.Drawing.Size(75, 23); … … 113 113 this.cancelButton.CausesValidation = false; 114 114 this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; 115 this.cancelButton.Location = new System.Drawing.Point(1 79, 79);115 this.cancelButton.Location = new System.Drawing.Point(162, 66); 116 116 this.cancelButton.Name = "cancelButton"; 117 117 this.cancelButton.Size = new System.Drawing.Size(75, 23); … … 127 127 this.AutoSize = true; 128 128 this.CancelButton = this.cancelButton; 129 this.ClientSize = new System.Drawing.Size(2 69, 116);129 this.ClientSize = new System.Drawing.Size(248, 101); 130 130 this.ControlBox = false; 131 131 this.Controls.Add(this.cancelButton); -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 63 63 // 64 64 this.nodeSymbolLabel.AutoSize = true; 65 this.nodeSymbolLabel.Location = new System.Drawing.Point(1 3, 13);65 this.nodeSymbolLabel.Location = new System.Drawing.Point(19, 13); 66 66 this.nodeSymbolLabel.Name = "nodeSymbolLabel"; 67 67 this.nodeSymbolLabel.Size = new System.Drawing.Size(41, 13); … … 73 73 this.allowedSymbolsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 74 74 this.allowedSymbolsCombo.FormattingEnabled = true; 75 this.allowedSymbolsCombo.Location = new System.Drawing.Point(1 20, 10);75 this.allowedSymbolsCombo.Location = new System.Drawing.Point(101, 10); 76 76 this.allowedSymbolsCombo.Name = "allowedSymbolsCombo"; 77 this.allowedSymbolsCombo.Size = new System.Drawing.Size(1 08, 21);77 this.allowedSymbolsCombo.Size = new System.Drawing.Size(127, 21); 78 78 this.allowedSymbolsCombo.TabIndex = 1; 79 79 this.allowedSymbolsCombo.SelectedIndexChanged += new System.EventHandler(this.allowedSymbolsCombo_SelectedIndexChanged); … … 83 83 // 84 84 this.variableWeightLabel.AutoSize = true; 85 this.variableWeightLabel.Location = new System.Drawing.Point(1 3, 44);85 this.variableWeightLabel.Location = new System.Drawing.Point(19, 40); 86 86 this.variableWeightLabel.Name = "variableWeightLabel"; 87 87 this.variableWeightLabel.Size = new System.Drawing.Size(41, 13); … … 93 93 // 94 94 this.variableNameLabel.AutoSize = true; 95 this.variableNameLabel.Location = new System.Drawing.Point(1 3, 74);95 this.variableNameLabel.Location = new System.Drawing.Point(19, 66); 96 96 this.variableNameLabel.Name = "variableNameLabel"; 97 97 this.variableNameLabel.Size = new System.Drawing.Size(35, 13); … … 104 104 this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 105 105 this.variableNamesCombo.FormattingEnabled = true; 106 this.variableNamesCombo.Location = new System.Drawing.Point(1 20, 71);106 this.variableNamesCombo.Location = new System.Drawing.Point(101, 63); 107 107 this.variableNamesCombo.Name = "variableNamesCombo"; 108 this.variableNamesCombo.Size = new System.Drawing.Size(1 08, 21);108 this.variableNamesCombo.Size = new System.Drawing.Size(127, 21); 109 109 this.variableNamesCombo.TabIndex = 5; 110 110 this.variableNamesCombo.Visible = false; … … 112 112 // variableWeightTextBox 113 113 // 114 this.variableWeightTextBox.Location = new System.Drawing.Point(1 20, 41);114 this.variableWeightTextBox.Location = new System.Drawing.Point(101, 37); 115 115 this.variableWeightTextBox.Name = "variableWeightTextBox"; 116 this.variableWeightTextBox.Size = new System.Drawing.Size(1 08, 20);116 this.variableWeightTextBox.Size = new System.Drawing.Size(127, 20); 117 117 this.variableWeightTextBox.TabIndex = 6; 118 118 this.variableWeightTextBox.Text = "0.0"; … … 122 122 // constantValueTextBox 123 123 // 124 this.constantValueTextBox.Location = new System.Drawing.Point(1 20, 41);124 this.constantValueTextBox.Location = new System.Drawing.Point(101, 37); 125 125 this.constantValueTextBox.Name = "constantValueTextBox"; 126 this.constantValueTextBox.Size = new System.Drawing.Size(1 08, 20);126 this.constantValueTextBox.Size = new System.Drawing.Size(127, 20); 127 127 this.constantValueTextBox.TabIndex = 7; 128 128 this.constantValueTextBox.Text = "0.0"; … … 133 133 // 134 134 this.constantValueLabel.AutoSize = true; 135 this.constantValueLabel.Location = new System.Drawing.Point(1 3, 44);135 this.constantValueLabel.Location = new System.Drawing.Point(19, 40); 136 136 this.constantValueLabel.Name = "constantValueLabel"; 137 137 this.constantValueLabel.Size = new System.Drawing.Size(34, 13); … … 149 149 // 150 150 this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; 151 this.okButton.Location = new System.Drawing.Point( 12, 112);151 this.okButton.Location = new System.Drawing.Point(72, 98); 152 152 this.okButton.Name = "okButton"; 153 153 this.okButton.Size = new System.Drawing.Size(75, 23); … … 160 160 // 161 161 this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; 162 this.cancelButton.Location = new System.Drawing.Point(153, 112);162 this.cancelButton.Location = new System.Drawing.Point(153, 98); 163 163 this.cancelButton.Name = "cancelButton"; 164 164 this.cancelButton.Size = new System.Drawing.Size(75, 23); … … 173 173 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 174 174 this.CancelButton = this.cancelButton; 175 this.ClientSize = new System.Drawing.Size(24 0, 147);175 this.ClientSize = new System.Drawing.Size(241, 133); 176 176 this.ControlBox = false; 177 177 this.Controls.Add(this.cancelButton); -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.Designer.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 61 61 // 62 62 this.originalValueLabel.AutoSize = true; 63 this.originalValueLabel.Location = new System.Drawing.Point( 12, 48);63 this.originalValueLabel.Location = new System.Drawing.Point(6, 42); 64 64 this.originalValueLabel.Name = "originalValueLabel"; 65 65 this.originalValueLabel.Size = new System.Drawing.Size(72, 13); … … 69 69 // oldValueTextBox 70 70 // 71 this.oldValueTextBox.Location = new System.Drawing.Point(1 23, 45);71 this.oldValueTextBox.Location = new System.Drawing.Point(101, 39); 72 72 this.oldValueTextBox.Name = "oldValueTextBox"; 73 73 this.oldValueTextBox.ReadOnly = true; … … 77 77 // newValueTextBox 78 78 // 79 this.newValueTextBox.Location = new System.Drawing.Point(1 23, 82);79 this.newValueTextBox.Location = new System.Drawing.Point(101, 65); 80 80 this.newValueTextBox.Name = "newValueTextBox"; 81 81 this.newValueTextBox.Size = new System.Drawing.Size(131, 20); … … 88 88 // 89 89 this.newValueLabel.AutoSize = true; 90 this.newValueLabel.Location = new System.Drawing.Point( 12, 85);90 this.newValueLabel.Location = new System.Drawing.Point(6, 68); 91 91 this.newValueLabel.Name = "newValueLabel"; 92 92 this.newValueLabel.Size = new System.Drawing.Size(59, 13); … … 103 103 // 104 104 this.variableNameLabel.AutoSize = true; 105 this.variableNameLabel.Location = new System.Drawing.Point( 12, 12);105 this.variableNameLabel.Location = new System.Drawing.Point(6, 15); 106 106 this.variableNameLabel.Name = "variableNameLabel"; 107 107 this.variableNameLabel.Size = new System.Drawing.Size(76, 13); … … 114 114 this.variableNamesCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 115 115 this.variableNamesCombo.FormattingEnabled = true; 116 this.variableNamesCombo.Location = new System.Drawing.Point(1 23, 9);116 this.variableNamesCombo.Location = new System.Drawing.Point(101, 12); 117 117 this.variableNamesCombo.Name = "variableNamesCombo"; 118 118 this.variableNamesCombo.Size = new System.Drawing.Size(131, 21); … … 126 126 // 127 127 this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; 128 this.okButton.Location = new System.Drawing.Point( 15, 119);128 this.okButton.Location = new System.Drawing.Point(75, 98); 129 129 this.okButton.Name = "okButton"; 130 130 this.okButton.Size = new System.Drawing.Size(75, 23); … … 138 138 this.cancelButton.CausesValidation = false; 139 139 this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; 140 this.cancelButton.Location = new System.Drawing.Point(1 79, 119);140 this.cancelButton.Location = new System.Drawing.Point(156, 98); 141 141 this.cancelButton.Name = "cancelButton"; 142 142 this.cancelButton.Size = new System.Drawing.Size(75, 23); … … 152 152 this.AutoSize = true; 153 153 this.CancelButton = this.cancelButton; 154 this.ClientSize = new System.Drawing.Size(2 69, 154);154 this.ClientSize = new System.Drawing.Size(244, 134); 155 155 this.ControlBox = false; 156 156 this.Controls.Add(this.cancelButton); -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.cs
r11203 r11205 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.