Changeset 15638
- Timestamp:
- 01/22/18 16:07:05 (7 years ago)
- Location:
- trunk/sources
- Files:
-
- 1 added
- 2 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.Designer.cs
r15616 r15638 20 20 #endregion 21 21 namespace HeuristicLab.Problems.DataAnalysis.Views { 22 partial class RegressionSolutionVariableImpactsView {22 partial class ClassificationSolutionVariableImpactsView { 23 23 /// <summary> 24 24 /// Required designer variable. … … 70 70 this.dataPartitionComboBox.FormattingEnabled = true; 71 71 this.dataPartitionComboBox.Items.AddRange(new object[] { 72 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.Training,73 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.Test,74 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.All});72 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.Training, 73 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.Test, 74 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.All}); 75 75 this.dataPartitionComboBox.Location = new System.Drawing.Point(197, 3); 76 76 this.dataPartitionComboBox.Name = "dataPartitionComboBox"; … … 101 101 this.replacementComboBox.FormattingEnabled = true; 102 102 this.replacementComboBox.Items.AddRange(new object[] { 103 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Median,104 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Average,105 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Noise,106 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Shuffle});103 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum.Median, 104 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum.Average, 105 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum.Noise, 106 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum.Shuffle}); 107 107 this.replacementComboBox.Location = new System.Drawing.Point(197, 30); 108 108 this.replacementComboBox.Name = "replacementComboBox"; … … 124 124 this.factorVarReplComboBox.FormattingEnabled = true; 125 125 this.factorVarReplComboBox.Items.AddRange(new object[] { 126 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Best,127 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Mode,128 HeuristicLab.Problems.DataAnalysis. RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Shuffle});126 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Best, 127 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Mode, 128 HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Shuffle}); 129 129 this.factorVarReplComboBox.Location = new System.Drawing.Point(197, 57); 130 130 this.factorVarReplComboBox.Name = "factorVarReplComboBox"; … … 133 133 this.factorVarReplComboBox.SelectedIndexChanged += new System.EventHandler(this.replacementComboBox_SelectedIndexChanged); 134 134 // 135 // RegressionSolutionVariableImpactsView135 // ClassificationSolutionVariableImpactsView 136 136 // 137 137 this.AllowDrop = true; … … 144 144 this.Controls.Add(this.dataPartitionComboBox); 145 145 this.Controls.Add(this.variableImactsArrayView); 146 this.Name = " RegressionSolutionVariableImpactsView";146 this.Name = "ClassificationSolutionVariableImpactsView"; 147 147 this.Size = new System.Drawing.Size(369, 365); 148 148 this.ResumeLayout(false); -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs
r15616 r15638 24 24 using HeuristicLab.Data; 25 25 using HeuristicLab.MainForm; 26 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;27 26 28 27 namespace HeuristicLab.Problems.DataAnalysis.Views { 29 28 [View("Variable Impacts")] 30 [Content(typeof(I RegressionSolution))]31 public partial class RegressionSolutionVariableImpactsView : DataAnalysisSolutionEvaluationView {29 [Content(typeof(IClassificationSolution))] 30 public partial class ClassificationSolutionVariableImpactsView : DataAnalysisSolutionEvaluationView { 32 31 33 public new I RegressionSolution Content {34 get { return (I RegressionSolution)base.Content; }32 public new IClassificationSolution Content { 33 get { return (IClassificationSolution)base.Content; } 35 34 set { 36 35 base.Content = value; … … 38 37 } 39 38 40 public RegressionSolutionVariableImpactsView()39 public ClassificationSolutionVariableImpactsView() 41 40 : base() { 42 41 InitializeComponent(); … … 83 82 variableImactsArrayView.Caption = Content.Name + " Variable Impacts"; 84 83 var replMethod = 85 ( RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum)84 (ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum) 86 85 replacementComboBox.Items[replacementComboBox.SelectedIndex]; 87 86 var factorReplMethod = 88 ( RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum)87 (ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum) 89 88 factorVarReplComboBox.Items[factorVarReplComboBox.SelectedIndex]; 90 89 var dataPartition = 91 ( RegressionSolutionVariableImpactsCalculator.DataPartitionEnum)dataPartitionComboBox.SelectedItem;90 (ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum)dataPartitionComboBox.SelectedItem; 92 91 93 92 Task.Factory.StartNew(() => { … … 95 94 mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name); 96 95 97 var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod);96 var impacts = ClassificationSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod); 98 97 var impactArray = new DoubleArray(impacts.Select(i => i.Item2).ToArray()); 99 98 impactArray.ElementNames = impacts.Select(i => i.Item1); -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r15372 r15638 120 120 </ItemGroup> 121 121 <ItemGroup> 122 <Compile Include="Classification\ClassificationSolutionVariableImpactsView.cs"> 123 <SubType>UserControl</SubType> 124 </Compile> 125 <Compile Include="Classification\ClassificationSolutionVariableImpactsView.Designer.cs"> 126 <DependentUpon>ClassificationSolutionVariableImpactsView.cs</DependentUpon> 127 </Compile> 122 128 <Compile Include="Controls\DensityChart.cs"> 123 129 <SubType>UserControl</SubType> -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj
r14857 r15638 131 131 <Compile Include="Implementation\Classification\ClassificationEnsembleProblemData.cs" /> 132 132 <Compile Include="Implementation\Classification\ClassificationSolutionBase.cs" /> 133 <Compile Include="Implementation\Classification\ClassificationSolutionVariableImpactsCalculator.cs" /> 133 134 <Compile Include="Implementation\Classification\ConstantClassificationSolution.cs" /> 134 135 <Compile Include="Implementation\Classification\DiscriminantFunctionClassificationSolutionBase.cs" />
Note: See TracChangeset
for help on using the changeset viewer.