Changeset 11203 for branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4
- Timestamp:
- 07/18/14 12:35:00 (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.dll11 10 HeuristicLab 3.3.5.1.ReSharper.user 12 11 HeuristicLab 3.3.6.0.ReSharper.user 13 12 HeuristicLab.4.5.resharper.user 14 13 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development16 14 HeuristicLab.resharper.user 17 15 ProtoGen.exe … … 19 17 _ReSharper.HeuristicLab 20 18 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests22 19 _ReSharper.HeuristicLab.ExtLibs 23 20 bin 24 21 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj
r11202 r11203 157 157 <Private>False</Private> 158 158 </ProjectReference> 159 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">160 <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>161 <Name>HeuristicLab.Common.Resources-3.3</Name>162 <Private>False</Private>163 </ProjectReference>164 159 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 165 160 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> … … 289 284 --> 290 285 <PropertyGroup> 291 286 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 292 287 set ProjectDir=$(ProjectDir) 293 288 set SolutionDir=$(SolutionDir) … … 296 291 call PreBuildEvent.cmd 297 292 </PreBuildEvent> 298 293 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 299 294 export ProjectDir=$(ProjectDir) 300 295 export SolutionDir=$(SolutionDir) -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 56 56 57 57 protected override Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicExpressionTree tree) { 58 var values = CalculateImpactAndReplacementValues(tree); 59 return values.ToDictionary(x => x.Key, x => x.Value.Item1); 60 } 61 62 protected override Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>> CalculateImpactAndReplacementValues(ISymbolicExpressionTree tree) { 63 var impactAndReplacementValues = new Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>>(); 64 foreach (var node in tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix()) { 65 double impactValue, replacementValue; 66 calculator.CalculateImpactAndReplacementValues(Content.Model, node, Content.ProblemData, Content.ProblemData.TrainingIndices, out impactValue, out replacementValue); 67 impactAndReplacementValues.Add(node, new Tuple<double, double>(impactValue, replacementValue)); 68 } 69 return impactAndReplacementValues; 58 return tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix().ToDictionary( 59 n => n, 60 n => calculator.CalculateImpactValue(Content.Model, n, Content.ProblemData, Content.ProblemData.TrainingIndices, Content.TrainingRSquared) 61 ); 70 62 } 71 63 -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Plugin.cs.frame
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 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.Regression.Views { 28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views", "Provides views for symbolic regression problem classes.", "3.4. 6.$WCREV$")]28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views", "Provides views for symbolic regression problem classes.", "3.4.3.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.dll",PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")] 31 31 [PluginDependency("HeuristicLab.Collections", "3.3")] 32 32 [PluginDependency("HeuristicLab.Common", "3.3")] 33 [PluginDependency("HeuristicLab.Common.Resources", "3.3")]34 33 [PluginDependency("HeuristicLab.Core", "3.3")] 35 34 [PluginDependency("HeuristicLab.Core.Views", "3.3")] -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Properties/AssemblyInfo.cs.frame
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 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 4HEAL")]33 [assembly: AssemblyCopyright("(c) 2002-2012 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. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.4.3.$WCREV$")] -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 60 60 double rmse, cvRmsError; 61 61 var problemData = (IRegressionProblemData)ProblemData.Clone(); 62 if(!problemData.TrainingIndices.Any()) return null; // don't create an LR model if the problem does not have a training set (e.g. loaded into an existing model)63 62 64 63 //clear checked inputVariables -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 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 this.exportButton = new System.Windows.Forms.Button();48 this.exportFileDialog = new System.Windows.Forms.SaveFileDialog();49 47 this.btnSimplify = new System.Windows.Forms.Button(); 50 this.transformModelButton = new System.Windows.Forms.Button();51 48 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); 52 49 this.splitContainer.Panel1.SuspendLayout(); … … 57 54 this.SuspendLayout(); 58 55 // 59 // flowLayoutPanel56 // splitContainer 60 57 // 61 this.flowLayoutPanel.Controls.Add(this.btnSimplify); 62 this.flowLayoutPanel.Controls.Add(this.exportButton); 63 this.flowLayoutPanel.Controls.Add(this.transformModelButton); 58 // 59 // splitContainer.Panel1 60 // 61 this.splitContainer.Panel1.Controls.Add(this.btnSimplify); 62 this.splitContainer.Size = new System.Drawing.Size(480, 275); 63 this.splitContainer.SplitterDistance = 255; 64 // 65 // itemsGroupBox 66 // 67 this.itemsGroupBox.Size = new System.Drawing.Size(486, 294); 68 // 69 // itemsListView 70 // 71 this.itemsListView.Size = new System.Drawing.Size(249, 238); 72 // 73 // detailsGroupBox 74 // 75 this.detailsGroupBox.Size = new System.Drawing.Size(215, 246); 76 // 77 // addButton 78 // 79 this.toolTip.SetToolTip(this.addButton, "Add"); 80 // 81 // removeButton 82 // 83 this.toolTip.SetToolTip(this.removeButton, "Remove"); 84 // 85 // viewHost 86 // 87 this.viewHost.Size = new System.Drawing.Size(203, 221); 64 88 // 65 89 // btnSimplify 66 90 // 67 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 68 this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator; 69 this.btnSimplify.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 91 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 92 this.btnSimplify.Location = new System.Drawing.Point(177, 4); 70 93 this.btnSimplify.Name = "btnSimplify"; 71 this.btnSimplify.TabIndex = 7; 72 this.btnSimplify.Size = new System.Drawing.Size(105, 24); 73 this.btnSimplify.Text = "Simplify Model"; 74 this.btnSimplify.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 94 this.btnSimplify.Size = new System.Drawing.Size(75, 23); 95 this.btnSimplify.TabIndex = 6; 96 this.btnSimplify.Text = "Simplify"; 75 97 this.btnSimplify.UseVisualStyleBackColor = true; 76 98 this.btnSimplify.Click += new System.EventHandler(this.btn_SimplifyModel_Click); 77 this.toolTip.SetToolTip(this.btnSimplify, "Simplify solution");78 //79 // exportButton80 //81 this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));82 this.exportButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Statistics;83 this.exportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;84 this.exportButton.Name = "exportButton";85 this.exportButton.Size = new System.Drawing.Size(105, 24);86 this.exportButton.TabIndex = 8;87 this.exportButton.Text = "Export to Excel ";88 this.exportButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight;89 this.exportButton.UseVisualStyleBackColor = true;90 this.exportButton.Click += new System.EventHandler(this.exportButton_Click);91 this.toolTip.SetToolTip(this.exportButton, "Exports the symbolic regression solution to Excel.");92 //93 // transformModelButton94 //95 this.transformModelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));96 this.transformModelButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Event;97 this.transformModelButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;98 this.transformModelButton.Name = "transformModelButton";99 this.transformModelButton.Size = new System.Drawing.Size(135, 24);100 this.transformModelButton.TabIndex = 9;101 this.transformModelButton.Text = "Backtransform Model";102 this.transformModelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight;103 this.transformModelButton.UseVisualStyleBackColor = true;104 this.transformModelButton.Click += new System.EventHandler(this.transformModelButton_Click);105 this.toolTip.SetToolTip(this.transformModelButton, "Backtransform model based on the stored transformations.");106 99 // 107 100 // SymbolicRegressionSolutionView 108 101 // 102 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 109 103 this.Name = "SymbolicRegressionSolutionView"; 110 104 this.Size = new System.Drawing.Size(486, 294); … … 120 114 121 115 #endregion 122 protected System.Windows.Forms.SaveFileDialog exportFileDialog; 123 protected System.Windows.Forms.Button exportButton; 124 protected System.Windows.Forms.Button btnSimplify; 125 protected System.Windows.Forms.Button transformModelButton; 116 private System.Windows.Forms.Button btnSimplify; 126 117 } 127 118 } -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 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;25 23 using System.Windows.Forms; 26 24 using HeuristicLab.MainForm; 27 using HeuristicLab.Problems.DataAnalysis.Symbolic.Views;28 25 using HeuristicLab.Problems.DataAnalysis.Views; 29 26 … … 41 38 } 42 39 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 samples46 exportButton.Enabled = Content != null && !Locked;47 transformModelButton.Visible = Content != null && Content.ProblemData.Transformations.Any();48 transformModelButton.Enabled = Content != null && !Locked;49 }50 51 40 private void btn_SimplifyModel_Click(object sender, EventArgs e) { 52 varview = new InteractiveSymbolicRegressionSolutionSimplifierView();41 InteractiveSymbolicRegressionSolutionSimplifierView view = new InteractiveSymbolicRegressionSolutionSimplifierView(); 53 42 view.Content = (SymbolicRegressionSolution)this.Content.Clone(); 54 43 view.Show(); 55 44 } 56 57 private void exportButton_Click(object sender, EventArgs e) {58 var exporter = new SymbolicSolutionExcelExporter();59 exportFileDialog.Filter = exporter.FileTypeFilter;60 if (exportFileDialog.ShowDialog(this) == DialogResult.OK) {61 var name = exportFileDialog.FileName;62 using (BackgroundWorker bg = new BackgroundWorker()) {63 MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Exporting solution to " + name + ".");64 bg.DoWork += (o, a) => exporter.Export(Content, name);65 bg.RunWorkerCompleted += (o, a) => MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);66 bg.RunWorkerAsync();67 }68 }69 }70 71 private void transformModelButton_Click(object sender, EventArgs e) {72 var mapper = new TransformationToSymbolicTreeMapper();73 var transformator = new SymbolicExpressionTreeBacktransformator(mapper);74 75 var transformations = Content.ProblemData.Transformations;76 var targetVar = Content.ProblemData.TargetVariable;77 78 var transformedModel = (ISymbolicRegressionModel)transformator.Backtransform(Content.Model, transformations, targetVar);79 var transformedSolution = new SymbolicRegressionSolution(transformedModel, (IRegressionProblemData)Content.ProblemData.Clone());80 81 MainFormManager.MainForm.ShowContent(transformedSolution);82 }83 45 } 84 46 } -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/VariableTrackbar.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/VariableTrackbar.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 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.