Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4565 for trunk


Ignore:
Timestamp:
10/06/10 22:36:41 (14 years ago)
Author:
mkommend
Message:

Moved DataAnalysis.Classification from branch to trunk (ticket #939).

Location:
trunk/sources
Files:
1 deleted
6 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r4512 r4565  
    305305EndProject
    306306Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab-3.3.Tests", "HeuristicLab\3.3\Tests\HeuristicLab-3.3.Tests.csproj", "{66DABFD5-5BD2-4478-8DF9-C589F569F7A2}"
     307EndProject
     308Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Classification-3.3", "HeuristicLab.Problems.DataAnalysis.Classification\3.3\HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj", "{D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}"
     309EndProject
     310Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3", "HeuristicLab.Problems.DataAnalysis.Classification.Views\3.3\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj", "{7F038E9A-B91E-4F49-8C27-D47BC86F1220}"
    307311EndProject
    308312Global
    … …  
    13751379    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|x86.ActiveCfg = Release|x86
    13761380    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|x86.Build.0 = Release|x86
     1381    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1382    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1383    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Debug|x64.ActiveCfg = Debug|x64
     1384    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Debug|x64.Build.0 = Debug|x64
     1385    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Debug|x86.ActiveCfg = Debug|x86
     1386    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Debug|x86.Build.0 = Debug|x86
     1387    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1388    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Release|Any CPU.Build.0 = Release|Any CPU
     1389    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Release|x64.ActiveCfg = Release|x64
     1390    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Release|x64.Build.0 = Release|x64
     1391    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Release|x86.ActiveCfg = Release|x86
     1392    {D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}.Release|x86.Build.0 = Release|x86
     1393    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1394    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1395    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Debug|x64.ActiveCfg = Debug|x64
     1396    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Debug|x64.Build.0 = Debug|x64
     1397    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Debug|x86.ActiveCfg = Debug|x86
     1398    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Debug|x86.Build.0 = Debug|x86
     1399    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1400    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Release|Any CPU.Build.0 = Release|Any CPU
     1401    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Release|x64.ActiveCfg = Release|x64
     1402    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Release|x64.Build.0 = Release|x64
     1403    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Release|x86.ActiveCfg = Release|x86
     1404    {7F038E9A-B91E-4F49-8C27-D47BC86F1220}.Release|x86.Build.0 = Release|x86
    13771405  EndGlobalSection
    13781406  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj

    r4417 r4565  
    100100  </PropertyGroup>
    101101  <ItemGroup>
    102     <Reference Include="HeuristicLab.Common-3.3">
    103       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    104     </Reference>
    105     <Reference Include="HeuristicLab.Core-3.3">
    106       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    107     </Reference>
    108     <Reference Include="HeuristicLab.Data-3.3">
    109       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    110     </Reference>
    111     <Reference Include="HeuristicLab.MainForm-3.3">
    112       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
    113     </Reference>
    114     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    115       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    116     </Reference>
    117     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    118       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    119     </Reference>
    120     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.3">
    121       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis-3.3.dll</HintPath>
    122     </Reference>
    123     <Reference Include="HeuristicLab.Problems.DataAnalysis.Regression-3.3">
    124       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll</HintPath>
    125     </Reference>
    126102    <Reference Include="System" />
    127103    <Reference Include="System.Core" />
    … …  
    162138  </ItemGroup>
    163139  <ItemGroup>
     140    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     141      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     142      <Name>HeuristicLab.Common-3.3</Name>
     143    </ProjectReference>
     144    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     145      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     146      <Name>HeuristicLab.Core-3.3</Name>
     147    </ProjectReference>
     148    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     149      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     150      <Name>HeuristicLab.Data-3.3</Name>
     151    </ProjectReference>
     152    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     153      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     154      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     155    </ProjectReference>
     156    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     157      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     158      <Name>HeuristicLab.MainForm-3.3</Name>
     159    </ProjectReference>
     160    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     161      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     162      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     163    </ProjectReference>
    164164    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Classification\3.3\HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj">
    165165      <Project>{D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}</Project>
    166166      <Name>HeuristicLab.Problems.DataAnalysis.Classification-3.3</Name>
     167    </ProjectReference>
     168    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
     169      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
     170      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     171    </ProjectReference>
     172    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
     173      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
     174      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
    167175    </ProjectReference>
    168176  </ItemGroup>

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/HeuristicLabProblemsDataAnalysisClassificationViewsPlugin.cs.frame

    r4542 r4565  
    2525  [Plugin("HeuristicLab.Problems.DataAnalysis.Classification.Views", "3.3.1.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Common", "3.3")]
     28  [PluginDependency("HeuristicLab.Core", "3.3")]
     29  [PluginDependency("HeuristicLab.Data", "3.3")]
     30  [PluginDependency("HeuristicLab.MainForm", "3.3")]
     31  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
     32  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.3")]
     33  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Classification", "3.3")]
     34  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Regression", "3.3")]
    2735  public class HeuristicLabProblemsDataAnalysisClassificationViewsPlugin : PluginBase {
    2836  }

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj

    r4417 r4565  
    103103  </PropertyGroup>
    104104  <ItemGroup>
    105     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    106     <Reference Include="HeuristicLab.Collections-3.3">
    107       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    108     </Reference>
    109     <Reference Include="HeuristicLab.Common-3.3">
    110       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    111     </Reference>
    112     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    113     <Reference Include="HeuristicLab.Core-3.3">
    114       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Data-3.3">
    117       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    120     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    121     <Reference Include="HeuristicLab.Optimization-3.3">
    122       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    123     </Reference>
    124     <Reference Include="HeuristicLab.Parameters-3.3">
    125       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
    126     </Reference>
    127     <Reference Include="HeuristicLab.Persistence-3.3">
    128       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    129     </Reference>
    130     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    131       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    132     </Reference>
    133     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.3">
    134       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis-3.3.dll</HintPath>
    135     </Reference>
    136     <Reference Include="HeuristicLab.Problems.DataAnalysis.Regression-3.3">
    137       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll</HintPath>
    138     </Reference>
    139105    <Reference Include="System" />
    140106    <Reference Include="System.Core" />
    … …  
    147113    <Compile Include="Interfaces\IClassificationSolution.cs" />
    148114    <Compile Include="SingleObjectiveClassificationProblem.cs" />
    149     <Compile Include="ProblemBase\Problem.cs" />
    150115    <Compile Include="Interfaces\ISymbolicClassificationEvaluator.cs" />
    151116    <Compile Include="Properties\AssemblyInfo.cs" />
    152     <Compile Include="ProblemBase\SingleObjectiveProblem.cs" />
    153117    <Compile Include="Interfaces\ISymbolicClassificationAnalyzer.cs" />
    154118    <Compile Include="Symbolic\Analyzer\ValidationBestSymbolicClassificationSolutionAnalyzer.cs" />
    … …  
    164128    <None Include="Properties\AssemblyInfo.frame" />
    165129  </ItemGroup>
    166   <ItemGroup />
     130  <ItemGroup>
     131    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     132      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     133      <Name>HeuristicLab.Analysis-3.3</Name>
     134    </ProjectReference>
     135    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     136      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     137      <Name>HeuristicLab.Collections-3.3</Name>
     138    </ProjectReference>
     139    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     140      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     141      <Name>HeuristicLab.Common-3.3</Name>
     142    </ProjectReference>
     143    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     144      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     145      <Name>HeuristicLab.Core-3.3</Name>
     146    </ProjectReference>
     147    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     148      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     149      <Name>HeuristicLab.Data-3.3</Name>
     150    </ProjectReference>
     151    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
     152      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
     153      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     154    </ProjectReference>
     155    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     156      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     157      <Name>HeuristicLab.Operators-3.3</Name>
     158    </ProjectReference>
     159    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     160      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     161      <Name>HeuristicLab.Optimization-3.3</Name>
     162    </ProjectReference>
     163    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     164      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     165      <Name>HeuristicLab.Parameters-3.3</Name>
     166    </ProjectReference>
     167    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     168      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     169      <Name>HeuristicLab.Persistence-3.3</Name>
     170    </ProjectReference>
     171    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     172      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     173      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     174    </ProjectReference>
     175    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
     176      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
     177      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     178    </ProjectReference>
     179    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
     180      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
     181      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     182    </ProjectReference>
     183  </ItemGroup>
    167184  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    168185  <PropertyGroup>

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/HeuristicLabProblemsDataAnalysisClassificationPlugin.cs.frame

    r4542 r4565  
    2525  [Plugin("HeuristicLab.Problems.DataAnalysis.Classification", "3.3.1.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Analysis", "3.3")]
     28  [PluginDependency("HeuristicLab.Common", "3.3")]
     29  [PluginDependency("HeuristicLab.Core", "3.3")]
     30  [PluginDependency("HeuristicLab.Collections", "3.3")]
     31  [PluginDependency("HeuristicLab.Data", "3.3")]
     32  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
     33  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     34  [PluginDependency("HeuristicLab.Operators", "3.3")]
     35  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     36  [PluginDependency("HeuristicLab.Parameters", "3.3")]
     37  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.3")]
     38  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Regression", "3.3")]
    2739  public class HeuristicLabProblemsDataAnalysisClassificationPlugin : PluginBase {
    2840  }

  • trunk/sources/HeuristicLab/3.3/Files.txt

    r4411 r4565  
    4646HeuristicLab.Problems.ArtificialAnt.Views\3.3:HeuristicLab.Problems.ArtificialAnt.Views-3.3.dll
    4747HeuristicLab.Problems.DataAnalysis\3.3:HeuristicLab.Problems.DataAnalysis-3.3.dll
     48HeuristicLab.Problems.DataAnalysis.Classification\3.3:HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll
     49HeuristicLab.Problems.DataAnalysis.Classification.Views\3.3:HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll
    4850HeuristicLab.Problems.DataAnalysis.Regression\3.3:HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll
    4951HeuristicLab.Problems.DataAnalysis.Views\3.3:HeuristicLab.Problems.DataAnalysis.Views-3.3.dll
Note: See TracChangeset for help on using the changeset viewer.