Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (13 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources

    • Property svn:ignore

      •  

        old new  
         1*.docstates
         2*.psess
        13*.resharper
        24*.suo
         5*.vsp
        36Google.ProtocolBuffers-0.9.1.dll
         7HeuristicLab 3.3.5.1.ReSharper.user
         8HeuristicLab 3.3.6.0.ReSharper.user
        49HeuristicLab.4.5.resharper.user
        510HeuristicLab.resharper.user
        … …  
        813_ReSharper.HeuristicLab
        914_ReSharper.HeuristicLab 3.3
         15_ReSharper.HeuristicLab.ExtLibs
         16bin
        1017protoc.exe
        11 HeuristicLab 3.3.5.1.ReSharper.user
        12 *.psess
        13 *.vsp
        14 *.docstates
        15 bin
        16 HeuristicLab 3.3.6.0.ReSharper.user
         18HeuristicLab.ExtLibs.6.0.ReSharper.user
    • Property svn:mergeinfo changed
      /branches/Restructure trunk solution (added)merged: 6828
      /branches/Trunk (added)merged: 6829,​6831-6833,​6842-6848,​6850,​6865

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4

    • Property svn:ignore

      •  

        old new  
        44HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
        55*.vs10x
         6Plugin.cs

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r6802 r6866  
    4343    <DebugType>full</DebugType>
    4444    <Optimize>false</Optimize>
    45     <OutputPath>bin\Debug\</OutputPath>
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4646    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4747    <ErrorReport>prompt</ErrorReport>
    … …  
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>bin\Release\</OutputPath>
     54    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
    5757    <WarningLevel>4</WarningLevel>
    58     <DocumentationFile>bin\Release\HeuristicLab.Algorithms.DataAnalysis-3.4.xml</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5960    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6061  </PropertyGroup>
    6162  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6263    <DebugSymbols>true</DebugSymbols>
    63     <OutputPath>bin\x86\Debug\</OutputPath>
     64    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6465    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6566    <DebugType>full</DebugType>
    … …  
    6970  </PropertyGroup>
    7071  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    71     <OutputPath>bin\x86\Release\</OutputPath>
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7273    <DefineConstants>TRACE</DefineConstants>
    73     <DocumentationFile>bin\x86\Release\HeuristicLab.Algorithms.DataAnalysis-3.4.xml</DocumentationFile>
     74    <DocumentationFile>
     75    </DocumentationFile>
    7476    <Optimize>true</Optimize>
    7577    <DebugType>pdbonly</DebugType>
    … …  
    8082  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8183    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>bin\x64\Debug\</OutputPath>
     84    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8385    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8486    <DebugType>full</DebugType>
    … …  
    8890  </PropertyGroup>
    8991  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    90     <OutputPath>bin\x64\Release\</OutputPath>
     92    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9193    <DefineConstants>TRACE</DefineConstants>
    92     <DocumentationFile>bin\x64\Release\HeuristicLab.Algorithms.DataAnalysis-3.3.xml</DocumentationFile>
     94    <DocumentationFile>
     95    </DocumentationFile>
    9396    <Optimize>true</Optimize>
    9497    <DebugType>pdbonly</DebugType>
    … …  
    98101  </PropertyGroup>
    99102  <ItemGroup>
     103    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     104      <HintPath>..\..\bin\ALGLIB-3.1.0.dll</HintPath>
     105    </Reference>
     106    <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <HintPath>..\..\bin\LibSVM-1.6.3.dll</HintPath>
     108    </Reference>
    100109    <Reference Include="System" />
    101110    <Reference Include="System.Core">
    … …  
    110119      <SubType>Code</SubType>
    111120    </Compile>
    112     <Compile Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs" />
    113121    <Compile Include="FixedDataAnalysisAlgorithm.cs" />
    114122    <Compile Include="Interfaces\INearestNeighbourClassificationSolution.cs" />
    … …  
    157165    <Compile Include="NeuralNetwork\NeuralNetworkRegression.cs" />
    158166    <Compile Include="NeuralNetwork\NeuralNetworkRegressionSolution.cs" />
     167    <Compile Include="Plugin.cs" />
    159168    <Compile Include="Properties\AssemblyInfo.cs" />
    160169    <Compile Include="RandomForest\RandomForestClassificationSolution.cs" />
    … …  
    180189      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    181190      <Name>HeuristicLab.Collections-3.3</Name>
     191      <Private>False</Private>
    182192    </ProjectReference>
    183193    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    184194      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    185195      <Name>HeuristicLab.Common.Resources-3.3</Name>
     196      <Private>False</Private>
    186197    </ProjectReference>
    187198    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    188199      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    189200      <Name>HeuristicLab.Common-3.3</Name>
     201      <Private>False</Private>
    190202    </ProjectReference>
    191203    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    192204      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    193205      <Name>HeuristicLab.Core-3.3</Name>
     206      <Private>False</Private>
    194207    </ProjectReference>
    195208    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    196209      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    197210      <Name>HeuristicLab.Data-3.3</Name>
     211      <Private>False</Private>
    198212    </ProjectReference>
    199213    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    200214      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    201215      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    202     </ProjectReference>
    203     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    204       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    205       <Name>ALGLIB-3.1.0</Name>
    206     </ProjectReference>
    207     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    208       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    209       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    210     </ProjectReference>
    211     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
    212       <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
    213       <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
    214     </ProjectReference>
    215     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
    216       <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    217       <Name>LibSVM-1.6.3</Name>
     216      <Private>False</Private>
    218217    </ProjectReference>
    219218    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    220219      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    221220      <Name>HeuristicLab.Optimization-3.3</Name>
     221      <Private>False</Private>
    222222    </ProjectReference>
    223223    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    224224      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    225225      <Name>HeuristicLab.Parameters-3.3</Name>
     226      <Private>False</Private>
    226227    </ProjectReference>
    227228    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    228229      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    229230      <Name>HeuristicLab.Persistence-3.3</Name>
     231      <Private>False</Private>
    230232    </ProjectReference>
    231233    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    232234      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    233235      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     236      <Private>False</Private>
    234237    </ProjectReference>
    235238    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
    236239      <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>
    237240      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
     241      <Private>False</Private>
    238242    </ProjectReference>
    239243    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
    240244      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
    241245      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
     246      <Private>False</Private>
    242247    </ProjectReference>
    243248    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj">
    244249      <Project>{07486E68-1517-4B9D-A58D-A38E99AE71AB}</Project>
    245250      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4</Name>
     251      <Private>False</Private>
    246252    </ProjectReference>
    247253    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    248254      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    249255      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     256      <Private>False</Private>
    250257    </ProjectReference>
    251258    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    252259      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    253260      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     261      <Private>False</Private>
    254262    </ProjectReference>
    255263  </ItemGroup>
    256264  <ItemGroup>
    257265    <None Include="HeuristicLab.snk" />
    258     <None Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs.frame" />
    259     <None Include="Properties\AssemblyInfo.frame" />
     266    <None Include="Plugin.cs.frame" />
     267    <None Include="Properties\AssemblyInfo.cs.frame" />
    260268  </ItemGroup>
    261269  <ItemGroup>
    … …  
    292300
    293301call PreBuildEvent.cmd
    294 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisPlugin.cs"</PreBuildEvent>
     302</PreBuildEvent>
    295303  </PropertyGroup>
    296304</Project>
Note: See TracChangeset for help on using the changeset viewer.