Changeset 11205 for branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
- Timestamp:
- 07/18/14 13:44:53 (10 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 15 edited
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.Classification.Views
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj
r11203 r11205 152 152 <Private>False</Private> 153 153 </ProjectReference> 154 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj"> 155 <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project> 156 <Name>HeuristicLab.Common.Resources-3.3</Name> 157 <Private>False</Private> 158 </ProjectReference> 154 159 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 155 160 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierView.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.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierView.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.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierViewBase.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.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierViewBase.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. … … 59 59 return model; 60 60 } 61 62 61 protected override Dictionary<ISymbolicExpressionTreeNode, double> CalculateReplacementValues(ISymbolicExpressionTree tree) { 63 62 return tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix().ToDictionary( … … 68 67 69 68 protected override Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicExpressionTree tree) { 70 return tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix().ToDictionary( 71 n => n, 72 n => calculator.CalculateImpactValue(Content.Model, n, Content.ProblemData, Content.ProblemData.TrainingIndices, Content.TrainingAccuracy) 73 ); 69 var values = CalculateImpactAndReplacementValues(tree); 70 return values.ToDictionary(x => x.Key, x => x.Value.Item1); 71 } 72 73 protected override Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>> CalculateImpactAndReplacementValues(ISymbolicExpressionTree tree) { 74 var impactAndReplacementValues = new Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>>(); 75 foreach (var node in tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix()) { 76 double impactValue, replacementValue; 77 calculator.CalculateImpactAndReplacementValues(Content.Model, node, Content.ProblemData, Content.ProblemData.TrainingIndices, out impactValue, out replacementValue); 78 impactAndReplacementValues.Add(node, new Tuple<double, double>(impactValue, replacementValue)); 79 } 80 return impactAndReplacementValues; 74 81 } 75 82 -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/InteractiveSymbolicDiscriminantFunctionClassificationSolutionSimplifierView.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.Classification.Views/3.4/InteractiveSymbolicDiscriminantFunctionClassificationSolutionSimplifierView.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.Classification.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.Classification.Views { 28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views","Provides views for symbolic classification problem classes.", "3.4. 3.$WCREV$")]28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views","Provides views for symbolic classification problem classes.", "3.4.6.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Common", "3.3")] 31 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 31 32 [PluginDependency("HeuristicLab.Core", "3.3")] 32 33 [PluginDependency("HeuristicLab.Core.Views", "3.3")] -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.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.Classification.Views/3.4/SymbolicClassificationSolutionView.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. … … 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SymbolicDiscriminantFunctionClassificationSolutionView)); 47 this.exportButton = new System.Windows.Forms.Button(); 48 this.exportFileDialog = new System.Windows.Forms.SaveFileDialog(); 48 49 this.btnSimplify = new System.Windows.Forms.Button(); 49 50 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); … … 55 56 this.SuspendLayout(); 56 57 // 57 // splitContainer58 // flowLayoutPanel 58 59 // 59 // 60 // splitContainer.Panel1 61 // 62 this.splitContainer.Panel1.Controls.Add(this.btnSimplify); 60 this.flowLayoutPanel.Controls.Add(this.btnSimplify); 61 this.flowLayoutPanel.Controls.Add(this.exportButton); 63 62 // 64 63 // btnSimplify 65 64 // 66 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 67 this.btnSimplify.Location = new System.Drawing.Point(172, 4); 65 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 66 this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator; 67 this.btnSimplify.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 68 68 this.btnSimplify.Name = "btnSimplify"; 69 this.btnSimplify.Size = new System.Drawing.Size(75, 23); 70 this.btnSimplify.TabIndex = 6; 71 this.btnSimplify.Text = "Simplify"; 69 this.btnSimplify.Size = new System.Drawing.Size(105, 24); 70 this.btnSimplify.TabIndex = 7; 71 this.btnSimplify.Text = "Simplify Model"; 72 this.btnSimplify.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 72 73 this.btnSimplify.UseVisualStyleBackColor = true; 73 74 this.btnSimplify.Click += new System.EventHandler(this.btn_SimplifyModel_Click); 75 this.toolTip.SetToolTip(this.btnSimplify, "Simplify solution"); 74 76 // 75 // SymbolicDiscriminantFunctionClassificationSolutionView 77 // exportButton 78 // 79 this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 80 this.exportButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Statistics; 81 this.exportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 82 this.exportButton.Name = "exportButton"; 83 this.exportButton.Size = new System.Drawing.Size(105, 24); 84 this.exportButton.TabIndex = 8; 85 this.exportButton.Text = "Export to Excel "; 86 this.exportButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 87 this.exportButton.UseVisualStyleBackColor = true; 88 this.exportButton.Click += new System.EventHandler(this.exportButton_Click); 89 this.toolTip.SetToolTip(this.exportButton, "Exports the symbolic regression solution to Excel."); 90 // 91 // SymbolicClassificationSolutionView 76 92 // 77 93 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); … … 88 104 #endregion 89 105 106 protected System.Windows.Forms.SaveFileDialog exportFileDialog; 107 protected System.Windows.Forms.Button exportButton; 90 108 protected System.Windows.Forms.Button btnSimplify; 91 109 } -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicClassificationSolutionView.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. … … 21 21 22 22 using System; 23 using System.ComponentModel; 24 using System.Linq; 23 25 using System.Windows.Forms; 24 26 using HeuristicLab.MainForm; 27 using HeuristicLab.Problems.DataAnalysis.Symbolic.Views; 25 28 using HeuristicLab.Problems.DataAnalysis.Views; 26 29 … … 38 41 } 39 42 43 protected override void SetEnabledStateOfControls() { 44 base.SetEnabledStateOfControls(); 45 btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples 46 exportButton.Enabled = Content != null && !Locked; 47 } 48 40 49 private void btn_SimplifyModel_Click(object sender, EventArgs e) { 41 50 var view = new InteractiveSymbolicClassificationSolutionSimplifierView(); … … 43 52 view.Show(); 44 53 } 54 55 private void exportButton_Click(object sender, EventArgs e) { 56 var exporter = new SymbolicSolutionExcelExporter(); 57 exportFileDialog.Filter = exporter.FileTypeFilter; 58 if (exportFileDialog.ShowDialog(this) == DialogResult.OK) { 59 60 var name = exportFileDialog.FileName; 61 using (BackgroundWorker bg = new BackgroundWorker()) { 62 MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Exportion solution to " + name + "."); 63 bg.DoWork += (o, a) => exporter.Export(Content, name); 64 bg.RunWorkerCompleted += (o, a) => MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this); 65 bg.RunWorkerAsync(); 66 } 67 } 68 } 45 69 } 46 70 } -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.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. … … 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SymbolicDiscriminantFunctionClassificationSolutionView)); 47 this.exportButton = new System.Windows.Forms.Button(); 48 this.exportFileDialog = new System.Windows.Forms.SaveFileDialog(); 48 49 this.btnSimplify = new System.Windows.Forms.Button(); 49 50 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); … … 55 56 this.SuspendLayout(); 56 57 // 57 // splitContainer58 // flowLayoutPanel 58 59 // 59 // 60 // splitContainer.Panel1 61 // 62 this.splitContainer.Panel1.Controls.Add(this.btnSimplify); 60 this.flowLayoutPanel.Controls.Add(this.btnSimplify); 61 this.flowLayoutPanel.Controls.Add(this.exportButton); 63 62 // 64 63 // btnSimplify 65 64 // 66 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 67 this.btnSimplify.Location = new System.Drawing.Point(172, 4); 65 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 66 this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator; 67 this.btnSimplify.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 68 68 this.btnSimplify.Name = "btnSimplify"; 69 this.btnSimplify.Size = new System.Drawing.Size(75, 23); 70 this.btnSimplify.TabIndex = 6; 71 this.btnSimplify.Text = "Simplify"; 69 this.btnSimplify.Size = new System.Drawing.Size(105, 24); 70 this.btnSimplify.TabIndex = 7; 71 this.btnSimplify.Text = "Simplify Model"; 72 this.btnSimplify.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 72 73 this.btnSimplify.UseVisualStyleBackColor = true; 73 74 this.btnSimplify.Click += new System.EventHandler(this.btn_SimplifyModel_Click); 75 this.toolTip.SetToolTip(this.btnSimplify, "Simplify solution"); 76 // 77 // exportButton 78 // 79 this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 80 this.exportButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Statistics; 81 this.exportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 82 this.exportButton.Name = "exportButton"; 83 this.exportButton.Size = new System.Drawing.Size(105, 24); 84 this.exportButton.TabIndex = 8; 85 this.exportButton.Text = "Export to Excel "; 86 this.exportButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 87 this.exportButton.UseVisualStyleBackColor = true; 88 this.exportButton.Click += new System.EventHandler(this.exportButton_Click); 89 this.toolTip.SetToolTip(this.exportButton, "Exports the symbolic regression solution to Excel."); 74 90 // 75 91 // SymbolicDiscriminantFunctionClassificationSolutionView … … 88 104 #endregion 89 105 106 protected System.Windows.Forms.SaveFileDialog exportFileDialog; 107 protected System.Windows.Forms.Button exportButton; 90 108 protected System.Windows.Forms.Button btnSimplify; 91 109 } -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.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. … … 21 21 22 22 using System; 23 using System.ComponentModel; 24 using System.Linq; 23 25 using System.Windows.Forms; 24 26 using HeuristicLab.MainForm; 27 using HeuristicLab.Problems.DataAnalysis.Symbolic.Views; 25 28 using HeuristicLab.Problems.DataAnalysis.Views; 26 29 … … 38 41 } 39 42 43 protected override void SetEnabledStateOfControls() { 44 base.SetEnabledStateOfControls(); 45 btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples 46 exportButton.Enabled = Content != null && !Locked; 47 } 48 40 49 private void btn_SimplifyModel_Click(object sender, EventArgs e) { 41 50 var view = new InteractiveSymbolicDiscriminantFunctionClassificationSolutionSimplifierView(); … … 43 52 view.Show(); 44 53 } 54 55 private void exportButton_Click(object sender, EventArgs e) { 56 var exporter = new SymbolicSolutionExcelExporter(); 57 exportFileDialog.Filter = exporter.FileTypeFilter; 58 if (exportFileDialog.ShowDialog(this) == DialogResult.OK) { 59 60 var name = exportFileDialog.FileName; 61 using (BackgroundWorker bg = new BackgroundWorker()) { 62 MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Exportion solution to " + name + "."); 63 bg.DoWork += (o, a) => exporter.Export(Content, name); 64 bg.RunWorkerCompleted += (o, a) => MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this); 65 bg.RunWorkerAsync(); 66 } 67 } 68 } 45 69 } 46 70 }
Note: See TracChangeset
for help on using the changeset viewer.