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.Problems.DataAnalysis.Classification/3.3

    • Property svn:ignore

      •  

        old new  
        55HeuristicLabProblemsDataAnalysisClassificationPlugin.cs
        66*.vs10x
         7Plugin.cs

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

    r5271 r6866  
    2121    <DebugType>full</DebugType>
    2222    <Optimize>false</Optimize>
    23     <OutputPath>bin\Debug\</OutputPath>
     23    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2424    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2525    <ErrorReport>prompt</ErrorReport>
    … …  
    2929    <DebugType>pdbonly</DebugType>
    3030    <Optimize>true</Optimize>
    31     <OutputPath>bin\Release\</OutputPath>
     31    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3232    <DefineConstants>TRACE</DefineConstants>
    3333    <ErrorReport>prompt</ErrorReport>
    … …  
    4242  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4343    <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>bin\x64\Debug\</OutputPath>
     44    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4545    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4646    <DebugType>full</DebugType>
    … …  
    5757  </PropertyGroup>
    5858  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    59     <OutputPath>bin\x64\Release\</OutputPath>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6060    <DefineConstants>TRACE</DefineConstants>
    6161    <Optimize>true</Optimize>
    6262    <DebugType>pdbonly</DebugType>
    6363    <PlatformTarget>x64</PlatformTarget>
    64     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     64    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6565    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6666    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    7474  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    7575    <DebugSymbols>true</DebugSymbols>
    76     <OutputPath>bin\x86\Debug\</OutputPath>
     76    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7777    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7878    <DebugType>full</DebugType>
    … …  
    8989  </PropertyGroup>
    9090  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    91     <OutputPath>bin\x86\Release\</OutputPath>
     91    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9292    <DefineConstants>TRACE</DefineConstants>
    9393    <Optimize>true</Optimize>
    9494    <DebugType>pdbonly</DebugType>
    9595    <PlatformTarget>x86</PlatformTarget>
    96     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     96    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9797    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9898    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    112112  <ItemGroup>
    113113    <Compile Include="ClassificationProblemData.cs" />
    114     <Compile Include="HeuristicLabProblemsDataAnalysisClassificationPlugin.cs" />
    115114    <Compile Include="Interfaces\IClassificationSolution.cs" />
     115    <Compile Include="Plugin.cs" />
    116116    <Compile Include="SingleObjectiveClassificationProblem.cs" />
    117117    <Compile Include="Interfaces\ISymbolicClassificationEvaluator.cs" />
    … …  
    127127  </ItemGroup>
    128128  <ItemGroup>
    129     <None Include="HeuristicLabProblemsDataAnalysisClassificationPlugin.cs.frame" />
     129    <None Include="Plugin.cs.frame" />
    130130    <None Include="HeuristicLab.snk" />
    131     <None Include="Properties\AssemblyInfo.frame" />
     131    <None Include="Properties\AssemblyInfo.cs.frame" />
    132132  </ItemGroup>
    133133  <ItemGroup>
    … …  
    135135      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    136136      <Name>HeuristicLab.Analysis-3.3</Name>
     137      <Private>False</Private>
    137138    </ProjectReference>
    138139    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    139140      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    140141      <Name>HeuristicLab.Collections-3.3</Name>
     142      <Private>False</Private>
    141143    </ProjectReference>
    142144    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    143145      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    144146      <Name>HeuristicLab.Common-3.3</Name>
     147      <Private>False</Private>
    145148    </ProjectReference>
    146149    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    147150      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    148151      <Name>HeuristicLab.Core-3.3</Name>
     152      <Private>False</Private>
    149153    </ProjectReference>
    150154    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    151155      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    152156      <Name>HeuristicLab.Data-3.3</Name>
     157      <Private>False</Private>
    153158    </ProjectReference>
    154159    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    155160      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    156161      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     162      <Private>False</Private>
    157163    </ProjectReference>
    158164    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    159165      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    160166      <Name>HeuristicLab.Operators-3.3</Name>
     167      <Private>False</Private>
    161168    </ProjectReference>
    162169    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    163170      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    164171      <Name>HeuristicLab.Optimization-3.3</Name>
     172      <Private>False</Private>
    165173    </ProjectReference>
    166174    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    167175      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    168176      <Name>HeuristicLab.Parameters-3.3</Name>
     177      <Private>False</Private>
    169178    </ProjectReference>
    170179    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    171180      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    172181      <Name>HeuristicLab.Persistence-3.3</Name>
     182      <Private>False</Private>
    173183    </ProjectReference>
    174184    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    175185      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    176186      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     187      <Private>False</Private>
    177188    </ProjectReference>
    178189    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    179190      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    180191      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     192      <Private>False</Private>
    181193    </ProjectReference>
    182194    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    183195      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    184196      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     197      <Private>False</Private>
    185198    </ProjectReference>
    186199  </ItemGroup>
    … …  
    193206
    194207call PreBuildEvent.cmd
    195 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25HeuristicLabProblemsDataAnalysisClassificationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisClassificationPlugin.cs"</PreBuildEvent>
     208</PreBuildEvent>
    196209  </PropertyGroup>
    197210  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.