Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/18/12 16:15:04 (11 years ago)
Author:
sforsten
Message:

#1998:

  • added ZeroR and OneR classifiers
  • added ConstantClassificationModel/-Solution and OneRClassificationModel/-Solution
Location:
branches/ClassificationModelComparison
Files:
7 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/ClassificationModelComparison/ClassificationModelComparison.sln

    r9071 r9074  
    99EndProject
    1010Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis-3.4", "HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj", "{2E782078-FA81-4B70-B56F-74CE38DAC6C8}"
     11EndProject
     12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis-3.4", "HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj", "{DF87C13E-A889-46FF-8153-66DCAA8C5674}"
    1113EndProject
    1214Global
     
    3234    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|x86.ActiveCfg = Release|x86
    3335    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|x86.Build.0 = Release|x86
     36    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     37    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.Build.0 = Debug|Any CPU
     38    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.ActiveCfg = Debug|x64
     39    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.Build.0 = Debug|x64
     40    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x86.ActiveCfg = Debug|x86
     41    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x86.Build.0 = Debug|x86
     42    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.ActiveCfg = Release|Any CPU
     43    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.Build.0 = Release|Any CPU
     44    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.ActiveCfg = Release|x64
     45    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.Build.0 = Release|x64
     46    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.ActiveCfg = Release|x86
     47    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.Build.0 = Release|x86
    3448  EndGlobalSection
    3549  GlobalSection(SolutionProperties) = preSolution
  • branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r9071 r9074  
    161161      <Private>False</Private>
    162162    </Reference>
    163     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    164       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    165       <Private>False</Private>
    166     </Reference>
    167163    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
    168164      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     
    294290    </Compile>
    295291    <Compile Include="Linear\AlglibUtil.cs" />
     292    <Compile Include="Linear\OneR.cs" />
     293    <Compile Include="Linear\OneR\OneRClassificationModel.cs" />
     294    <Compile Include="Linear\OneR\OneRClassificationSolution.cs" />
    296295    <Compile Include="Linear\Scaling.cs" />
    297296    <Compile Include="Linear\LinearDiscriminantAnalysis.cs" />
     
    302301    <Compile Include="Linear\MultinomialLogitClassificationSolution.cs" />
    303302    <Compile Include="Linear\MultinomialLogitModel.cs" />
     303    <Compile Include="Linear\ZeroR.cs" />
    304304    <Compile Include="Nca\Initialization\INcaInitializer.cs" />
    305305    <Compile Include="Nca\Initialization\LdaInitializer.cs" />
     
    368368    </BootstrapperPackage>
    369369  </ItemGroup>
     370  <ItemGroup>
     371    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     372      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     373      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     374    </ProjectReference>
     375  </ItemGroup>
    370376  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    371377  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r8861 r9074  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     60    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     68    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     78    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     86    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    96       <HintPath>..\..\bin\ALGLIB-3.6.0.dll</HintPath>
    97       <Private>False</Private>
    98     </Reference>
    99     <Reference Include="HeuristicLab.ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    100       <HintPath>..\..\bin\HeuristicLab.ALGLIB-3.6.0.dll</HintPath>
     95    <Reference Include="ALGLIB-3.6.0">
     96      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
     99    <Reference Include="HeuristicLab.ALGLIB-3.6.0">
     100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.ALGLIB-3.6.0.dll</HintPath>
     101      <Private>False</Private>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Collections-3.3">
     104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     105      <Private>False</Private>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Common-3.3">
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Common.Resources-3.3">
     112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Core-3.3">
     116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Data-3.3">
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Optimization-3.3">
     124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Parameters-3.3">
     128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Persistence-3.3">
     132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     133      <Private>False</Private>
     134    </Reference>
     135    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     136      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     137      <Private>False</Private>
     138    </Reference>
     139    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     140      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    101141      <Private>False</Private>
    102142    </Reference>
     
    127167    <Compile Include="Implementation\Classification\ClassificationEnsembleProblemData.cs" />
    128168    <Compile Include="Implementation\Classification\ClassificationSolutionBase.cs" />
     169    <Compile Include="Implementation\Classification\ConstantClassificationSolution.cs" />
    129170    <Compile Include="Implementation\Classification\DiscriminantFunctionClassificationSolutionBase.cs" />
     171    <Compile Include="Implementation\Classification\ConstantClassificationModel.cs" />
    130172    <Compile Include="Implementation\Clustering\ClusteringProblem.cs" />
    131173    <Compile Include="Implementation\Clustering\ClusteringProblemData.cs" />
     
    238280    </BootstrapperPackage>
    239281  </ItemGroup>
    240   <ItemGroup>
    241     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    242       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    243       <Name>HeuristicLab.Collections-3.3</Name>
    244       <Private>False</Private>
    245     </ProjectReference>
    246     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    247       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    248       <Name>HeuristicLab.Common.Resources-3.3</Name>
    249       <Private>False</Private>
    250     </ProjectReference>
    251     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    252       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    253       <Name>HeuristicLab.Common-3.3</Name>
    254       <Private>False</Private>
    255     </ProjectReference>
    256     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    257       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    258       <Name>HeuristicLab.Core-3.3</Name>
    259       <Private>False</Private>
    260     </ProjectReference>
    261     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    262       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    263       <Name>HeuristicLab.Data-3.3</Name>
    264       <Private>False</Private>
    265     </ProjectReference>
    266     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    267       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    268       <Name>HeuristicLab.Optimization-3.3</Name>
    269       <Private>False</Private>
    270     </ProjectReference>
    271     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    272       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    273       <Name>HeuristicLab.Parameters-3.3</Name>
    274       <Private>False</Private>
    275     </ProjectReference>
    276     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    277       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    278       <Name>HeuristicLab.Persistence-3.3</Name>
    279       <Private>False</Private>
    280     </ProjectReference>
    281     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    282       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    283       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    284       <Private>False</Private>
    285     </ProjectReference>
    286     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    287       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    288       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    289       <Private>False</Private>
    290     </ProjectReference>
    291   </ItemGroup>
    292282  <ItemGroup />
    293283  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.