Changeset 14241


Ignore:
Timestamp:
08/08/16 10:22:47 (3 years ago)
Author:
gkronber
Message:

#2650: added support for factor variables in specific solution comparison view for symbolic classification solutions

Location:
branches/symbreg-factors-2650
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj

    r14125 r14241  
    119119  </ItemGroup>
    120120  <ItemGroup>
     121    <Compile Include="SolutionComparisonView.cs">
     122      <SubType>UserControl</SubType>
     123    </Compile>
     124    <Compile Include="SolutionComparisonView.Designer.cs">
     125      <DependentUpon>SolutionComparisonView.cs</DependentUpon>
     126    </Compile>
    121127    <Compile Include="InteractiveSymbolicClassificationSolutionSimplifierView.cs">
    122128      <SubType>UserControl</SubType>
     
    157163  </ItemGroup>
    158164  <ItemGroup>
     165    <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
     166      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
     167      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
     168    </ProjectReference>
    159169    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    160170      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
  • branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionComparisonView.cs

    r14240 r14241  
    8080
    8181          IClassificationProblemData problemData = Content.ProblemData;
    82           var dataset = problemData.Dataset;
    8382          solutions = new List<IClassificationSolution>() { Content };
    84           solutions.AddRange(GenerateClassificationSolutions(problemData));
     83          solutions.AddRange(GenerateClassificationSolutions().OrderBy(s=>s.Name));
    8584
    8685          dataGridView.ColumnCount = 4;
     
    105104            var trainingIndizes = problemData.TrainingIndices;
    106105            var originalTrainingValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, trainingIndizes);
    107             var estimatedTrainingValues = solution.Model.GetEstimatedClassValues(dataset, trainingIndizes);
     106            var estimatedTrainingValues = solution.EstimatedTrainingClassValues;
    108107
    109108            var testIndices = problemData.TestIndices;
    110109            var originalTestValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, testIndices);
    111             var estimatedTestValues = solution.Model.GetEstimatedClassValues(dataset, testIndices);
     110            var estimatedTestValues = solution.EstimatedTestClassValues;
    112111
    113112            OnlineCalculatorError errorState;
     
    126125    }
    127126
    128     private IEnumerable<IClassificationSolution> GenerateClassificationSolutions(IClassificationProblemData problemData) {
     127    protected virtual IEnumerable<IClassificationSolution> GenerateClassificationSolutions() {
     128      var problemData = Content.ProblemData;
    129129      var newSolutions = new List<IClassificationSolution>();
    130130      var zeroR = ZeroR.CreateZeroRSolution(problemData);
     
    133133      try {
    134134        var oneR = OneR.CreateOneRSolution(problemData);
    135         oneR.Name = "OneR Classification Solution";
     135        oneR.Name = "OneR Classification Solution (all variables)";
    136136        newSolutions.Add(oneR);
    137137      } catch (NotSupportedException) { } catch (ArgumentException) { }
    138138      try {
    139139        var lda = LinearDiscriminantAnalysis.CreateLinearDiscriminantAnalysisSolution(problemData);
    140         lda.Name = "Linear Discriminant Analysis Solution";
     140        lda.Name = "Linear Discriminant Analysis Solution (all variables)";
    141141        newSolutions.Add(lda);
    142142      } catch (NotSupportedException) { } catch (ArgumentException) { }
Note: See TracChangeset for help on using the changeset viewer.