Changeset 8430 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification
- Timestamp:
- 08/08/12 14:04:17 (12 years ago)
- Location:
- branches/HeuristicLab.TimeSeries
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.TimeSeries
- Property svn:ignore
-
old new 20 20 bin 21 21 protoc.exe 22 _ReSharper.HeuristicLab.TimeSeries-3.3
-
- Property svn:ignore
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views merged eligible /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views merged eligible /trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged eligible /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Views 5815-6180 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views 6284-6795 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Views 6828 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Views 6829-6865 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Views 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.Designer.cs
r7268 r8430 71 71 // 72 72 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 73 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;73 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 74 74 this.Controls.Add(this.SamplesComboBox); 75 75 this.Name = "ClassificationEnsembleSolutionEstimatedClassValuesView"; -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.cs
r7268 r8430 73 73 } 74 74 75 int[] indi zes;75 int[] indices; 76 76 double[] estimatedClassValues; 77 77 78 78 switch (SamplesComboBox.SelectedItem.ToString()) { 79 79 case SamplesComboBoxAllSamples: { 80 indi zes = Enumerable.Range(0, Content.ProblemData.Dataset.Rows).ToArray();80 indices = Enumerable.Range(0, Content.ProblemData.Dataset.Rows).ToArray(); 81 81 estimatedClassValues = Content.EstimatedClassValues.ToArray(); 82 82 break; 83 83 } 84 84 case SamplesComboBoxTrainingSamples: { 85 indi zes = Content.ProblemData.TrainingIndizes.ToArray();85 indices = Content.ProblemData.TrainingIndices.ToArray(); 86 86 estimatedClassValues = Content.EstimatedTrainingClassValues.ToArray(); 87 87 break; 88 88 } 89 89 case SamplesComboBoxTestSamples: { 90 indi zes = Content.ProblemData.TestIndizes.ToArray();90 indices = Content.ProblemData.TestIndices.ToArray(); 91 91 estimatedClassValues = Content.EstimatedTestClassValues.ToArray(); 92 92 break; … … 98 98 int classValuesCount = Content.ProblemData.ClassValues.Count; 99 99 int solutionsCount = Content.ClassificationSolutions.Count(); 100 string[,] values = new string[indi zes.Length, 5 + classValuesCount + solutionsCount];100 string[,] values = new string[indices.Length, 5 + classValuesCount + solutionsCount]; 101 101 double[] target = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray(); 102 List<List<double?>> estimatedValuesVector = GetEstimatedValues(SamplesComboBox.SelectedItem.ToString(), indi zes,102 List<List<double?>> estimatedValuesVector = GetEstimatedValues(SamplesComboBox.SelectedItem.ToString(), indices, 103 103 Content.ClassificationSolutions); 104 104 105 for (int i = 0; i < indi zes.Length; i++) {106 int row = indi zes[i];105 for (int i = 0; i < indices.Length; i++) { 106 int row = indices[i]; 107 107 values[i, 0] = row.ToString(); 108 108 values[i, 1] = target[i].ToString(); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionModelView.Designer.cs
r7268 r8430 50 50 // 51 51 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 52 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;52 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 53 53 this.Name = "RegressionEnsembleSolutionModelView"; 54 54 this.ResumeLayout(false); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.Designer.cs
r5829 r8430 65 65 // 66 66 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 67 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;67 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 68 68 this.Controls.Add(this.label1); 69 69 this.Controls.Add(this.cmbSamples); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.cs
r7268 r8430 107 107 double[] predictedValues; 108 108 if (cmbSamples.SelectedItem.ToString() == TrainingSamples) { 109 rows = Content.ProblemData.TrainingIndi zes;109 rows = Content.ProblemData.TrainingIndices; 110 110 predictedValues = Content.EstimatedTrainingClassValues.ToArray(); 111 111 } else if (cmbSamples.SelectedItem.ToString() == TestSamples) { 112 rows = Content.ProblemData.TestIndi zes;112 rows = Content.ProblemData.TestIndices; 113 113 predictedValues = Content.EstimatedTestClassValues.ToArray(); 114 114 } else throw new InvalidOperationException(); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionEstimatedClassValuesView.Designer.cs
r7268 r8430 50 50 this.AllowDrop = true; 51 51 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 52 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;52 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 53 53 this.Name = "EstimatedValuesView"; 54 54 this.Size = new System.Drawing.Size(310, 285); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionEstimatedClassValuesView.cs
r7268 r8430 96 96 var estimatedTraining = Content.EstimatedTrainingClassValues.GetEnumerator(); 97 97 estimatedTraining.MoveNext(); 98 foreach (var trainingRow in Content.ProblemData.TrainingIndi zes) {98 foreach (var trainingRow in Content.ProblemData.TrainingIndices) { 99 99 values[trainingRow, 3] = estimatedTraining.Current.ToString(); 100 100 estimatedTraining.MoveNext(); … … 102 102 var estimatedTest = Content.EstimatedTestClassValues.GetEnumerator(); 103 103 estimatedTest.MoveNext(); 104 foreach (var testRow in Content.ProblemData.TestIndi zes) {104 foreach (var testRow in Content.ProblemData.TestIndices) { 105 105 values[testRow, 4] = estimatedTest.Current.ToString(); 106 106 estimatedTest.MoveNext(); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.Designer.cs
r5829 r8430 76 76 // 77 77 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 78 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;78 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 79 79 this.Controls.Add(this.label1); 80 80 this.Controls.Add(this.cmbSamples); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs
r7268 r8430 101 101 102 102 if (cmbSamples.SelectedItem.ToString() == TrainingSamples) { 103 rows = Content.ProblemData.TrainingIndi zes;103 rows = Content.ProblemData.TrainingIndices; 104 104 } else if (cmbSamples.SelectedItem.ToString() == TestSamples) { 105 rows = Content.ProblemData.TestIndi zes;105 rows = Content.ProblemData.TestIndices; 106 106 } else throw new InvalidOperationException(); 107 107 -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionEstimatedClassValuesView.Designer.cs
r7268 r8430 50 50 this.AllowDrop = true; 51 51 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 52 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;52 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 53 53 this.Name = "EstimatedValuesView"; 54 54 this.Size = new System.Drawing.Size(310, 285); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.Designer.cs
r5829 r8430 80 80 // 81 81 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 82 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;82 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 83 83 this.Controls.Add(this.label1); 84 84 this.Controls.Add(this.JitterTrackBar); -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs
r7268 r8430 137 137 var targetValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToList(); 138 138 139 foreach (int row in Content.ProblemData.TrainingIndi zes) {139 foreach (int row in Content.ProblemData.TrainingIndices) { 140 140 double estimatedValue = estimatedValues[row]; 141 141 double targetValue = targetValues[row]; … … 150 150 } 151 151 152 foreach (int row in Content.ProblemData.TestIndi zes) {152 foreach (int row in Content.ProblemData.TestIndices) { 153 153 double estimatedValue = estimatedValues[row]; 154 154 double targetValue = targetValues[row];
Note: See TracChangeset
for help on using the changeset viewer.