Changeset 13086


Ignore:
Timestamp:
10/29/15 18:45:15 (6 years ago)
Author:
gkronber
Message:

#1998: made compatibility changes necessary because of trunk developments (compile fail)

Location:
branches/ClassificationModelComparison
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR.cs

    r10569 r13086  
    7777
    7878    public static IClassificationSolution CreateOneRSolution(IClassificationProblemData problemData, int minBucketSize, IRandom random) {
    79       Dataset dataset = problemData.Dataset;
     79      var dataset = problemData.Dataset;
    8080      var trainingIndices = problemData.TrainingIndices;
    8181      int rowCount = trainingIndices.Count();
  • branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR/OneRClassificationModel.cs

    r9135 r13086  
    8484    // uses sorting to return the values in the order of rows, instead of using nested for loops
    8585    // to avoid O(n²) runtime
    86     public IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows) {
     86    public IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) {
    8787      var values = dataset.GetDoubleValues(Variable, rows).ToArray();
    8888      var rowsArray = rows.ToArray();
  • branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/ZeroR.cs

    r10568 r13086  
    5656
    5757    public static IClassificationSolution CreateZeroRSolution(IClassificationProblemData problemData) {
    58       Dataset dataset = problemData.Dataset;
     58      var dataset = problemData.Dataset;
    5959      string target = problemData.TargetVariable;
    6060      var targetValues = dataset.GetDoubleValues(target, problemData.TrainingIndices);
  • branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionComparisonView.cs

    r10560 r13086  
    8181
    8282          IClassificationProblemData problemData = Content.ProblemData;
    83           Dataset dataset = problemData.Dataset;
     83          var dataset = problemData.Dataset;
    8484          solutions = new List<IClassificationSolution>() { Content };
    8585          solutions.AddRange(GenerateClassificationSolutions(problemData));
  • branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r13082 r13086  
    154154      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    155155    </Reference>
     156    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     157      <SpecificVersion>False</SpecificVersion>
     158      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     159      <Private>False</Private>
     160    </Reference>
     161    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     162      <SpecificVersion>False</SpecificVersion>
     163      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
     164      <Private>False</Private>
     165    </Reference>
    156166    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    157167    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
     
    424434      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
    425435      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
    426     </ProjectReference>
    427     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
    428       <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
    429       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
    430     </ProjectReference>
    431     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    432       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    433       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    434436    </ProjectReference>
    435437    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
  • branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ConstantClassificationModel.cs

    r9119 r13086  
    5151    }
    5252
    53     public IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows) {
     53    public IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) {
    5454      return rows.Select(row => Constant);
    5555    }
Note: See TracChangeset for help on using the changeset viewer.