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:
3 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.Symbolic/3.4

    • Property svn:ignore

      •  

        old new  
        44obj
        55*.vs10x
         6Plugin.cs

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r6732 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    121121    <Compile Include="Analyzers\SymbolicDataAnalysisVariableFrequencyAnalyzer.cs" />
    122122    <Compile Include="Analyzers\SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs" />
     123    <Compile Include="Plugin.cs" />
    123124    <Compile Include="SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs" />
    124125    <Compile Include="Formatters\SymbolicDataAnalysisExpressionLatexFormatter.cs" />
    … …  
    176177    <Compile Include="Symbols\VariableTreeNode.cs" />
    177178    <None Include="HeuristicLab.snk" />
    178     <None Include="HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs.frame" />
    179     <None Include="Properties\AssemblyInfo.frame" />
     179    <None Include="Plugin.cs.frame" />
     180    <None Include="Properties\AssemblyInfo.cs.frame" />
    180181    <Compile Include="Evaluators\SymbolicDataAnalysisMultiObjectiveEvaluator.cs" />
    181182    <Compile Include="Evaluators\SymbolicDataAnalysisSingleObjectiveEvaluator.cs" />
    182183    <Compile Include="Evaluators\SymbolicDataAnalysisEvaluator.cs" />
    183     <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs" />
    184184    <Compile Include="Interfaces\ISymbolicDataAnalysisInterpreterOperator.cs" />
    185185    <Compile Include="Interfaces\ISymbolicDataAnalysisMultiObjectiveEvaluator.cs" />
    … …  
    196196      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    197197      <Name>HeuristicLab.Analysis-3.3</Name>
     198      <Private>False</Private>
    198199    </ProjectReference>
    199200    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    200201      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    201202      <Name>HeuristicLab.Collections-3.3</Name>
     203      <Private>False</Private>
    202204    </ProjectReference>
    203205    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    204206      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    205207      <Name>HeuristicLab.Common.Resources-3.3</Name>
     208      <Private>False</Private>
    206209    </ProjectReference>
    207210    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    208211      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    209212      <Name>HeuristicLab.Common-3.3</Name>
     213      <Private>False</Private>
    210214    </ProjectReference>
    211215    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    212216      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    213217      <Name>HeuristicLab.Core-3.3</Name>
     218      <Private>False</Private>
    214219    </ProjectReference>
    215220    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    216221      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    217222      <Name>HeuristicLab.Data-3.3</Name>
     223      <Private>False</Private>
    218224    </ProjectReference>
    219225    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    220226      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    221227      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    222     </ProjectReference>
    223     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    224       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    225       <Name>ALGLIB-3.1.0</Name>
    226     </ProjectReference>
    227     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    228       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    229       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
     228      <Private>False</Private>
    230229    </ProjectReference>
    231230    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    232231      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    233232      <Name>HeuristicLab.Operators-3.3</Name>
     233      <Private>False</Private>
    234234    </ProjectReference>
    235235    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    236236      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    237237      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     238      <Private>False</Private>
    238239    </ProjectReference>
    239240    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    240241      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    241242      <Name>HeuristicLab.Optimization-3.3</Name>
     243      <Private>False</Private>
    242244    </ProjectReference>
    243245    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    244246      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    245247      <Name>HeuristicLab.Parameters-3.3</Name>
     248      <Private>False</Private>
    246249    </ProjectReference>
    247250    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    248251      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    249252      <Name>HeuristicLab.Persistence-3.3</Name>
     253      <Private>False</Private>
    250254    </ProjectReference>
    251255    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    252256      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    253257      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     258      <Private>False</Private>
    254259    </ProjectReference>
    255260    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    256261      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    257262      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     263      <Private>False</Private>
    258264    </ProjectReference>
    259265    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    260266      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    261267      <Name>HeuristicLab.Random-3.3</Name>
     268      <Private>False</Private>
    262269    </ProjectReference>
    263270  </ItemGroup>
    … …  
    295302
    296303call PreBuildEvent.cmd
    297 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs"</PreBuildEvent>
     304</PreBuildEvent>
    298305  </PropertyGroup>
    299306</Project>
Note: See TracChangeset for help on using the changeset viewer.