Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/01/11 17:48:53 (13 years ago)
Author:
mkommend
Message:

#1479: Integrated trunk changes.

Location:
branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views
Files:
11 edited
20 copied

Legend:

Unmodified
Added
Removed

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame

    r6099 r6618  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Views {
    28   [Plugin("HeuristicLab.Problems.DataAnalysis.Views", "3.3.4.$WCREV$")]
     28  [Plugin("HeuristicLab.Problems.DataAnalysis.Views", "3.3.5.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.ALGLIB","3.1.0.0")]

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.3/Properties/AssemblyInfo.frame

    r6099 r6618  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.cs

    r6239 r6618  
    7878          dataGridView.ColumnCount = 1;
    7979        } else {
    80           dataGridView.ColumnCount = Content.ProblemData.Classes;
    81           dataGridView.RowCount = Content.ProblemData.Classes;
     80          dataGridView.ColumnCount = Content.ProblemData.Classes + 1;
     81          dataGridView.RowCount = Content.ProblemData.Classes + 1;
    8282
    8383          int i = 0;
    … …  
    8787            i++;
    8888          }
     89          dataGridView.Columns[i].HeaderText = "Actual not classified";
     90          dataGridView.Rows[i].HeaderCell.Value = "Predicted not classified";
     91
    8992          dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
    9093          dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders);
    … …  
    100103        if (Content == null) return;
    101104
    102         double[,] confusionMatrix = new double[Content.ProblemData.Classes, Content.ProblemData.Classes];
     105        double[,] confusionMatrix = new double[Content.ProblemData.Classes + 1, Content.ProblemData.Classes + 1];
    103106        IEnumerable<int> rows;
    104107
    … …  
    109112        } else if (cmbSamples.SelectedItem.ToString() == TestSamples) {
    110113          rows = Content.ProblemData.TestIndizes;
    111           predictedValues = Content.EstimatedTestClassValues.ToArray();         
     114          predictedValues = Content.EstimatedTestClassValues.ToArray();
    112115        } else throw new InvalidOperationException();
    113116
    … …  
    124127          double targetValue = targetValues[i];
    125128          double predictedValue = predictedValues[i];
    126           int targetIndex = classValueIndexMapping[targetValue];
    127           int predictedIndex = classValueIndexMapping[predictedValue];
     129          int targetIndex;
     130          int predictedIndex;
     131          if (!classValueIndexMapping.TryGetValue(targetValue, out targetIndex)) {
     132            targetIndex = Content.ProblemData.Classes;
     133          }
     134          if (!classValueIndexMapping.TryGetValue(predictedValue, out predictedIndex)) {
     135            predictedIndex = Content.ProblemData.Classes;
     136          }
    128137
    129138          confusionMatrix[predictedIndex, targetIndex] += 1;

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r6238 r6618  
    110110  </ItemGroup>
    111111  <ItemGroup>
    112     <Compile Include="ClassificationSolutionView.cs">
    113       <SubType>UserControl</SubType>
    114     </Compile>
    115     <Compile Include="ClassificationSolutionView.Designer.cs">
     112    <Compile Include="Classification\ClassificationEnsembleSolutionModelView.cs">
     113      <SubType>UserControl</SubType>
     114    </Compile>
     115    <Compile Include="Classification\ClassificationEnsembleSolutionModelView.Designer.cs">
     116      <DependentUpon>ClassificationEnsembleSolutionModelView.cs</DependentUpon>
     117    </Compile>
     118    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
     122      <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     123    </Compile>
     124    <Compile Include="Solution Views\ClassificationSolutionView.cs">
     125      <SubType>UserControl</SubType>
     126    </Compile>
     127    <Compile Include="Solution Views\ClassificationSolutionView.Designer.cs">
    116128      <DependentUpon>ClassificationSolutionView.cs</DependentUpon>
    117129    </Compile>
    … …  
    152164      <DependentUpon>ClusteringSolutionEstimatedClusterView.cs</DependentUpon>
    153165    </Compile>
    154     <Compile Include="ClusteringSolutionView.cs">
    155       <SubType>UserControl</SubType>
    156     </Compile>
    157     <Compile Include="ClusteringSolutionView.Designer.cs">
     166    <Compile Include="Solution Views\ClusteringSolutionView.cs">
     167      <SubType>UserControl</SubType>
     168    </Compile>
     169    <Compile Include="Solution Views\ClusteringSolutionView.Designer.cs">
    158170      <DependentUpon>ClusteringSolutionView.cs</DependentUpon>
    159171    </Compile>
    160     <Compile Include="DiscriminantFunctionClassificationSolutionView.cs">
    161       <SubType>UserControl</SubType>
    162     </Compile>
    163     <Compile Include="DiscriminantFunctionClassificationSolutionView.Designer.cs">
     172    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.cs">
     173      <SubType>UserControl</SubType>
     174    </Compile>
     175    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.Designer.cs">
     176      <DependentUpon>ClassificationEnsembleSolutionView.cs</DependentUpon>
     177    </Compile>
     178    <Compile Include="Solution Views\DiscriminantFunctionClassificationSolutionView.cs">
     179      <SubType>UserControl</SubType>
     180    </Compile>
     181    <Compile Include="Solution Views\DiscriminantFunctionClassificationSolutionView.Designer.cs">
    164182      <DependentUpon>DiscriminantFunctionClassificationSolutionView.cs</DependentUpon>
    165183    </Compile>
    166     <Compile Include="Interfaces\IDataAnalysisSolutionEvaluationView.cs" />
    167184    <Compile Include="Interfaces\IDiscriminantFunctionClassificationSolutionEvaluationView.cs" />
    168185    <Compile Include="Interfaces\IClusteringSolutionEvaluationView.cs" />
    169186    <Compile Include="Interfaces\IClassificationSolutionEvaluationView.cs" />
    170     <Compile Include="DataAnalysisSolutionView.cs">
    171       <SubType>UserControl</SubType>
    172     </Compile>
    173     <Compile Include="DataAnalysisSolutionView.Designer.cs">
     187    <Compile Include="Solution Views\DataAnalysisSolutionView.cs">
     188      <SubType>UserControl</SubType>
     189    </Compile>
     190    <Compile Include="Solution Views\DataAnalysisSolutionView.Designer.cs">
    174191      <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
    175192    </Compile>
    … …  
    181198    </Compile>
    182199    <Compile Include="Interfaces\IRegressionSolutionEvaluationView.cs" />
    183     <Compile Include="RegressionSolutionView.cs">
    184       <SubType>UserControl</SubType>
    185     </Compile>
    186     <Compile Include="RegressionSolutionView.Designer.cs">
     200    <Compile Include="MenuItems\CreateEnsembleMenuItem.cs" />
     201    <Compile Include="Solution Views\RegressionEnsembleSolutionView.cs">
     202      <SubType>UserControl</SubType>
     203    </Compile>
     204    <Compile Include="Solution Views\RegressionEnsembleSolutionView.Designer.cs">
     205      <DependentUpon>RegressionEnsembleSolutionView.cs</DependentUpon>
     206    </Compile>
     207    <Compile Include="Solution Views\RegressionSolutionView.cs">
     208      <SubType>UserControl</SubType>
     209    </Compile>
     210    <Compile Include="Solution Views\RegressionSolutionView.Designer.cs">
    187211      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
    188212    </Compile>
    … …  
    269293      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    270294      <Name>HeuristicLab.Optimization-3.3</Name>
     295    </ProjectReference>
     296    <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
     297      <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project>
     298      <Name>HeuristicLab.Optimizer-3.3</Name>
    271299    </ProjectReference>
    272300    <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame

    r5869 r6618  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Views {
    28   [Plugin("HeuristicLab.Problems.DataAnalysis.Views", "Provides views for base classes for data analysis tasks.", "3.4.0.$WCREV$")]
     28  [Plugin("HeuristicLab.Problems.DataAnalysis.Views", "Provides views for base classes for data analysis tasks.", "3.4.1.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.ALGLIB","3.1.0.0")]
    … …  
    3939  [PluginDependency("HeuristicLab.Optimization","3.3")]
    4040  [PluginDependency("HeuristicLab.Optimization.Views","3.3")]
     41  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
    4142  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4243  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IClassificationSolutionEvaluationView.cs

    r5829 r6618  
    2222
    2323namespace HeuristicLab.Problems.DataAnalysis.Views {
    24   public interface IClassificationSolutionEvaluationView : IDataAnalysisSolutionEvaluationView {
     24  public interface IClassificationSolutionEvaluationView {
    2525    new IClassificationSolution Content { get; set; }
    2626  }

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IClusteringSolutionEvaluationView.cs

    r5829 r6618  
    2222
    2323namespace HeuristicLab.Problems.DataAnalysis.Views {
    24   public interface IClusteringSolutionEvaluationView : IDataAnalysisSolutionEvaluationView {
     24  public interface IClusteringSolutionEvaluationView {
    2525    new IClusteringSolution Content { get; set; }
    2626  }

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IDiscriminantFunctionClassificationSolutionEvaluationView.cs

    r5829 r6618  
    2222
    2323namespace HeuristicLab.Problems.DataAnalysis.Views {
    24   public interface IDiscriminantFunctionClassificationSolutionEvaluationView : IDataAnalysisSolutionEvaluationView {
     24  public interface IDiscriminantFunctionClassificationSolutionEvaluationView {
    2525    new IDiscriminantFunctionClassificationSolution Content { get; set; }
    2626  }

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IRegressionSolutionEvaluationView.cs

    r5829 r6618  
    2222
    2323namespace HeuristicLab.Problems.DataAnalysis.Views {
    24   public interface IRegressionSolutionEvaluationView : IDataAnalysisSolutionEvaluationView {
     24  public interface IRegressionSolutionEvaluationView {
    2525    new IRegressionSolution Content { get; set; }
    2626  }

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/Properties/AssemblyInfo.frame

    r5869 r6618  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.4.0.0")]
    55 [assembly: AssemblyFileVersion("3.4.0.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.4.1.$WCREV$")]

  • branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

    r6377 r6618  
    198198      // strip range is [start .. end] inclusive, but we evaluate [start..end[ (end is exclusive)
    199199      // the strip should be by one longer (starting at start - 0.5 and ending at end + 0.5)
    200       stripLine.StripWidth = end - start; 
     200      stripLine.StripWidth = end - start;
    201201      stripLine.IntervalOffset = start - 0.5; // start slightly to the left of the first point to clearly indicate the first point in the partition
    202202      this.chart.ChartAreas[0].AxisX.StripLines.Add(stripLine);
Note: See TracChangeset for help on using the changeset viewer.