Changeset 11638 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Timestamp:
- 12/03/14 17:04:46 (10 years ago)
- Location:
- branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged: 11332,11344,11346,11523,11541,11623
- Property svn:mergeinfo changed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Exporters/SymbolicSolutionExcelExporter.cs
r11208 r11638 30 30 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views { 31 31 public class SymbolicSolutionExcelExporter : IDataAnalysisSolutionExporter { 32 pr ivateconst string TRAININGSTART = "TrainingStart";33 pr ivateconst string TRAININGEND = "TrainingEnd";34 pr ivateconst string TESTSTART = "TestStart";35 pr ivateconst string TESTEND = "TestEnd";32 protected const string TRAININGSTART = "TrainingStart"; 33 protected const string TRAININGEND = "TrainingEnd"; 34 protected const string TESTSTART = "TestStart"; 35 protected const string TESTEND = "TestEnd"; 36 36 37 37 … … 44 44 } 45 45 46 public v oid Export(IDataAnalysisSolution solution, string fileName) {46 public virtual void Export(IDataAnalysisSolution solution, string fileName) { 47 47 var symbSolution = solution as ISymbolicDataAnalysisSolution; 48 48 if (symbSolution == null) throw new NotSupportedException("This solution cannot be exported to Excel"); … … 216 216 } 217 217 218 pr ivatestring Indirect(string column, bool training) {218 protected string Indirect(string column, bool training) { 219 219 if (training) { 220 220 return string.Format("INDIRECT(\"'Estimated Values'!{0}\"&{1}+2&\":{0}\"&{2}+1)", column, TRAININGSTART, TRAININGEND); … … 260 260 } 261 261 262 pr ivatevoid AddModelTreePicture(ExcelWorksheet modelWorksheet, ISymbolicDataAnalysisModel model) {262 protected void AddModelTreePicture(ExcelWorksheet modelWorksheet, ISymbolicDataAnalysisModel model) { 263 263 SymbolicExpressionTreeChart modelTreePicture = new SymbolicExpressionTreeChart(); 264 264 modelTreePicture.Tree = model.SymbolicExpressionTree; … … 289 289 estimatedWorksheet.Cells[1, 1, 1, 10].AutoFitColumns(); 290 290 291 // fill in id, target variable and unbounded estimated values 291 292 int targetIndex = solution.ProblemData.Dataset.VariableNames.ToList().FindIndex(x => x.Equals(solution.ProblemData.TargetVariable)) + 1; 292 293 for (int i = 0; i < rows; i++) { 293 estimatedWorksheet.Cells[i + 2, 1].Value = i; 294 estimatedWorksheet.Cells[i + 2, 2].Formula = datasetWorksheet.Cells[i + 2, targetIndex].FullAddress; 295 estimatedWorksheet.Cells[i + 2, 9].Formula = string.Format(preparedFormula, i + 2); 294 estimatedWorksheet.Cells[i + 2, 1].Value = i; // id 295 estimatedWorksheet.Cells[i + 2, 2].Formula = datasetWorksheet.Cells[i + 2, targetIndex].FullAddress; // target variable 296 estimatedWorksheet.Cells[i + 2, 9].Formula = string.Format(preparedFormula, i + 2); // unbounded estimated values 296 297 } 297 298 estimatedWorksheet.Cells["B2:B" + (rows + 1)].Style.Numberformat.Format = "0.000"; … … 313 314 } 314 315 315 pr ivatestring PrepareFormula(string[] formulaParts) {316 protected string PrepareFormula(string[] formulaParts) { 316 317 string preparedFormula = formulaParts[0]; 317 318 foreach (var part in formulaParts.Skip(2)) { … … 323 324 } 324 325 325 pr ivatevoid WriteInputSheet(ExcelWorksheet inputsWorksheet, ExcelWorksheet datasetWorksheet, IEnumerable<string> list, Dataset dataset) {326 protected void WriteInputSheet(ExcelWorksheet inputsWorksheet, ExcelWorksheet datasetWorksheet, IEnumerable<string> list, Dataset dataset) { 326 327 //remark the performance of EPPlus drops dramatically 327 328 //if the data is not written row wise (from left to right) due the internal indices used. … … 337 338 } 338 339 339 pr ivatevoid WriteDatasetToExcel(ExcelWorksheet datasetWorksheet, IDataAnalysisProblemData problemData) {340 protected void WriteDatasetToExcel(ExcelWorksheet datasetWorksheet, IDataAnalysisProblemData problemData) { 340 341 //remark the performance of EPPlus drops dramatically 341 342 //if the data is not written row wise (from left to right) due the internal indices used. -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r11503 r11638 11 11 <RootNamespace>HeuristicLab.Problems.DataAnalysis.Symbolic.Views</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4</AssemblyName> 13 <TargetFrameworkVersion>v4. 0</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 14 14 <TargetFrameworkProfile> 15 15 </TargetFrameworkProfile> … … 46 46 <WarningLevel>4</WarningLevel> 47 47 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 48 <Prefer32Bit>false</Prefer32Bit> 48 49 </PropertyGroup> 49 50 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> … … 55 56 <WarningLevel>4</WarningLevel> 56 57 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 58 <Prefer32Bit>false</Prefer32Bit> 57 59 </PropertyGroup> 58 60 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> … … 64 66 <ErrorReport>prompt</ErrorReport> 65 67 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 68 <Prefer32Bit>false</Prefer32Bit> 66 69 </PropertyGroup> 67 70 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> … … 73 76 <ErrorReport>prompt</ErrorReport> 74 77 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 78 <Prefer32Bit>false</Prefer32Bit> 75 79 </PropertyGroup> 76 80 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> … … 82 86 <ErrorReport>prompt</ErrorReport> 83 87 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 88 <Prefer32Bit>false</Prefer32Bit> 84 89 </PropertyGroup> 85 90 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> … … 91 96 <ErrorReport>prompt</ErrorReport> 92 97 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 98 <Prefer32Bit>false</Prefer32Bit> 93 99 </PropertyGroup> 94 100 <ItemGroup> … … 217 223 <Compile Include="MenuItems\OptimizeDataAnalysisRunsMenuItem.cs" /> 218 224 <Compile Include="Plugin.cs" /> 219 <Compile Include="SlidingWindowDataView.cs"> 220 <SubType>UserControl</SubType> 221 </Compile> 225 <Compile Include="SlidingWindowDataView.cs" /> 222 226 <Compile Include="SlidingWindowDataView.Designer.cs"> 223 227 <DependentUpon>SlidingWindowDataView.cs</DependentUpon> … … 241 245 <DependentUpon>GraphicalSymbolicDataAnalysisModelView.cs</DependentUpon> 242 246 </Compile> 243 <Compile Include="Symbols\ConstantView.cs"> 244 <SubType>UserControl</SubType> 245 </Compile> 247 <Compile Include="Symbols\ConstantView.cs" /> 246 248 <Compile Include="Symbols\ConstantView.Designer.cs"> 247 249 <DependentUpon>ConstantView.cs</DependentUpon> 248 250 </Compile> 249 <Compile Include="Symbols\LaggedVariableView.cs"> 250 <SubType>UserControl</SubType> 251 </Compile> 251 <Compile Include="Symbols\LaggedVariableView.cs" /> 252 252 <Compile Include="Symbols\LaggedVariableView.Designer.cs"> 253 253 <DependentUpon>LaggedVariableView.cs</DependentUpon> 254 254 </Compile> 255 <Compile Include="Symbols\TimeLagView.cs"> 256 <SubType>UserControl</SubType> 257 </Compile> 255 <Compile Include="Symbols\TimeLagView.cs" /> 258 256 <Compile Include="Symbols\TimeLagView.Designer.cs"> 259 257 <DependentUpon>TimeLagView.cs</DependentUpon> 260 258 </Compile> 261 <Compile Include="Symbols\VariableConditionView.cs"> 262 <SubType>UserControl</SubType> 263 </Compile> 259 <Compile Include="Symbols\VariableConditionView.cs" /> 264 260 <Compile Include="Symbols\VariableConditionView.Designer.cs"> 265 261 <DependentUpon>VariableConditionView.cs</DependentUpon> 266 262 </Compile> 267 <Compile Include="Symbols\VariableView.cs"> 268 <SubType>UserControl</SubType> 269 </Compile> 263 <Compile Include="Symbols\VariableView.cs" /> 270 264 <Compile Include="Symbols\VariableView.Designer.cs"> 271 265 <DependentUpon>VariableView.cs</DependentUpon> 272 266 </Compile> 273 <Compile Include="Tracking\FragmentGraphView.cs"> 274 <SubType>UserControl</SubType> 275 </Compile> 267 <Compile Include="Tracking\FragmentGraphView.cs" /> 276 268 <Compile Include="Tracking\FragmentGraphView.Designer.cs"> 277 269 <DependentUpon>FragmentGraphView.cs</DependentUpon> 278 270 </Compile> 279 <Compile Include="Tracking\SymboldDataAnalysisGenealogyView.cs"> 280 <SubType>UserControl</SubType> 281 </Compile> 271 <Compile Include="Tracking\SymboldDataAnalysisGenealogyView.cs" /> 282 272 <Compile Include="Tracking\SymboldDataAnalysisGenealogyView.Designer.cs"> 283 273 <DependentUpon>SymboldDataAnalysisGenealogyView.cs</DependentUpon> -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs
r11208 r11638 54 54 private void RegisterVariableNamesViewContentEvents() { 55 55 variableNamesView.Content.ItemsAdded += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 56 variableNamesView.Content.ItemsRemoved += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_ Changed);56 variableNamesView.Content.ItemsRemoved += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Removed); 57 57 variableNamesView.Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 58 58 variableNamesView.Content.CollectionReset += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); … … 64 64 private void DeregisterVariableNamesViewContentEvents() { 65 65 variableNamesView.Content.ItemsAdded -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 66 variableNamesView.Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_ Changed);66 variableNamesView.Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Removed); 67 67 variableNamesView.Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 68 68 variableNamesView.Content.CollectionReset -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); … … 153 153 } 154 154 155 private void VariableNames_Removed(object sender, CollectionItemsChangedEventArgs<StringValue> e) { 156 foreach (var newVar in e.Items) 157 newVar.ValueChanged -= new EventHandler(Variable_ValueChanged); 158 UpdateContent(); 159 } 160 155 161 private void Variable_ValueChanged(object sender, EventArgs e) { 156 162 UpdateContent(); -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs
r11208 r11638 55 55 private void RegisterVariableNamesViewContentEvents() { 56 56 variableNamesView.Content.ItemsAdded += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 57 variableNamesView.Content.ItemsRemoved += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_ Changed);57 variableNamesView.Content.ItemsRemoved += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Removed); 58 58 variableNamesView.Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 59 59 variableNamesView.Content.CollectionReset += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); … … 66 66 private void DeregisterVariableNamesViewContentEvents() { 67 67 variableNamesView.Content.ItemsAdded -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 68 variableNamesView.Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_ Changed);68 variableNamesView.Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Removed); 69 69 variableNamesView.Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); 70 70 variableNamesView.Content.CollectionReset -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed); … … 118 118 } 119 119 120 private void VariableNames_Removed(object sender, CollectionItemsChangedEventArgs<StringValue> e) { 121 foreach (var newVar in e.Items) 122 newVar.ValueChanged -= new EventHandler(Variable_ValueChanged); 123 UpdateContent(); 124 } 125 120 126 private void Variable_ValueChanged(object sender, EventArgs e) { 121 127 UpdateContent(); -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.Designer.cs
r10746 r11638 45 45 this.Name = "FragmentGraphView"; 46 46 this.Size = new System.Drawing.Size(1144, 682); 47 this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.FragmentGraphView_KeyPress); 47 48 this.ResumeLayout(false); 48 49 -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs
r11318 r11638 24 24 using System.Drawing; 25 25 using System.Linq; 26 using System.Windows.Forms; 26 27 using HeuristicLab.Core.Views; 27 28 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; … … 71 72 var tile = new SymbolicExpressionTreeTile(chart); 72 73 tile.LayoutEngine = symbolicExpressionEngine; 73 tile.Label = "Generation " + node. Data.Rank + Environment.NewLine +74 "Quality " + String.Format("{0:0.000}", node. Data.Quality);75 tile.Root = node.Data. Data.Root;74 tile.Label = "Generation " + node.Rank + Environment.NewLine + 75 "Quality " + String.Format("{0:0.000}", node.Quality); 76 tile.Root = node.Data.Root; 76 77 var tileNode = new TileLayoutNode { Tile = tile }; 77 78 nodeToTileMap.Add(node, tileNode); … … 115 116 var aSize = aTile.Size; 116 117 var aPos = aTile.Position; 117 var graphNode = node.Data;118 var tree = node.Data; 118 119 119 120 if (node.SubtreeIndex > 0) { 120 var subtree = graphNode.Data.Root.NodeAt(node.SubtreeIndex);121 var subtree = tree.Root.NodeAt(node.SubtreeIndex); 121 122 foreach (var s in subtree.IterateNodesPrefix()) { 122 123 var primitive = aTile.GetPrimitive(s); … … 130 131 } 131 132 if (node.FragmentIndex > 0) { 132 var subtree = graphNode.Data.Root.NodeAt(node.FragmentIndex);133 var subtree = tree.Root.NodeAt(node.FragmentIndex); 133 134 foreach (var s in subtree.IterateNodesPrefix()) { 134 135 var primitive = aTile.GetPrimitive(s); … … 147 148 var index = node.SubtreeIndex + (parent.FragmentIndex - parent.SubtreeIndex); 148 149 // some mutations create discontinuities which invalidate the index 149 if (index >= 0 && index < graphNode.Data.Length) {150 var subtree = graphNode.Data.NodeAt(index);150 if (index >= 0 && index < tree.Length) { 151 var subtree = tree.NodeAt(index); 151 152 var primitive = aTile.GetPrimitive(subtree); 152 153 primitive.Brush = new SolidBrush(Color.LightCoral); … … 198 199 } 199 200 201 private void FragmentGraphView_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) { 202 if (e.KeyChar == 'i') { 203 // highlight node impacts 204 } 205 } 206 200 207 #region Event Handlers (child controls) 201 208
Note: See TracChangeset
for help on using the changeset viewer.