Changeset 4394

Timestamp:

09/15/10 13:08:12 (14 years ago)

Author:

mkommend

Message:

updated classification views (ticket #939)

Location:

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classfication.Views/3.3

Files:

• ConfusionMatrixView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj (moved) (moved from branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classfication.Views/3.3/HeuristicLab.Problems.DataAnalysis.Classification.Views.csproj) (3 diffs)
• RocCurvesView.Designer.cs (added)
• RocCurvesView.cs (added)
• SymbolicClassificationSolutionView.cs (modified) (5 diffs)

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classfication.Views/3.3/ConfusionMatrixView.Designer.cs

@@ -45 +45 @@
       // cmbSamples
       // 
+      this.cmbSamples.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.cmbSamples.FormattingEnabled = true;
       this.cmbSamples.Location = new System.Drawing.Point(56, 3);

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classfication.Views/3.3/HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj

@@ -113 +113 @@
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=AMD64" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Regression-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -133 +134 @@
     <Compile Include="HeuristicLabProblemsDataAnalysisClassificationViewsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RocCurvesView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RocCurvesView.Designer.cs">
+      <DependentUpon>RocCurvesView.cs</DependentUpon>
+    </Compile>
     <Compile Include="SymbolicClassificationSolutionView.cs">
       <SubType>UserControl</SubType>
@@ -146 +153 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Classification\3.3\HeuristicLab.Problems.DataAnalysis.Classification.csproj">
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Classification\3.3\HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj">
       <Project>{D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Classification</Name>
+      <Name>HeuristicLab.Problems.DataAnalysis.Classification-3.3</Name>
     </ProjectReference>
   </ItemGroup>

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classfication.Views/3.3/SymbolicClassificationSolutionView.cs

@@ -26 +26 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -69 +70 @@
       CustomLabel trainingLabel = new CustomLabel();
       trainingLabel.Text = TrainingLabelText;
-      trainingLabel.GridTicks = GridTickTypes.TickMark;
       trainingLabel.FromPosition = TrainingAxisValue - TrainingTestBorder;
       trainingLabel.ToPosition = TrainingAxisValue + TrainingTestBorder;
@@ -76 +76 @@
       CustomLabel testLabel = new CustomLabel();
       testLabel.Text = TestLabelText;
-      testLabel.GridTicks = GridTickTypes.TickMark;
       testLabel.FromPosition = TestAxisValue - TrainingTestBorder;
       testLabel.ToPosition = TestAxisValue + TrainingTestBorder;
@@ -160 +159 @@
         row++;
       }
+      UpdateCursorInterval();
     }
 
@@ -245 +245 @@
       Content.Thresholds = thresholds;
     }
+
+    private void UpdateCursorInterval() {
+      Series series = chart.Series[0];
+      double[] xValues = (from point in series.Points
+                          where !point.IsEmpty
+                          select point.XValue)
+                    .DefaultIfEmpty(1.0)
+                    .ToArray();
+      double[] yValues = (from point in series.Points
+                          where !point.IsEmpty
+                          select point.YValues[0])
+                    .DefaultIfEmpty(1.0)
+                    .ToArray();
+
+      double xRange = xValues.Max() - xValues.Min();
+      double yRange = yValues.Max() - yValues.Min();
+      if (xRange.IsAlmost(0.0)) xRange = 1.0;
+      if (yRange.IsAlmost(0.0)) yRange = 1.0;
+      double xDigits = (int)Math.Log10(xRange) - 3;
+      double yDigits = (int)Math.Log10(yRange) - 3;
+      double xZoomInterval = Math.Pow(10, xDigits);
+      double yZoomInterval = Math.Pow(10, yDigits);
+      this.chart.ChartAreas[0].CursorX.Interval = xZoomInterval;
+      this.chart.ChartAreas[0].CursorY.Interval = yZoomInterval;
+    }
   }
 }