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
4 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.Optimization/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r6694 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>
    5555    <WarningLevel>4</WarningLevel>
    56     <DocumentationFile>bin\Release\HeuristicLab.Optimization-3.3.XML</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x86\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
    … …  
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    69     <OutputPath>bin\x86\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    71     <DocumentationFile>bin\x86\Release\HeuristicLab.Optimization-3.3.XML</DocumentationFile>
     72    <DocumentationFile>
     73    </DocumentationFile>
    7274    <Optimize>true</Optimize>
    7375    <DebugType>pdbonly</DebugType>
    … …  
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x64\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
    … …  
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    88     <OutputPath>bin\x64\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    90     <DocumentationFile>bin\x64\Release\HeuristicLab.Optimization-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    111114  </ItemGroup>
    112115  <ItemGroup>
     116    <Compile Include="Plugin.cs" />
    113117    <Compile Include="RunCollectionDiscretizer.cs" />
    114118    <Compile Include="RunCollectionGroupCreater.cs" />
    … …  
    116120    <Compile Include="RunCollectionValueRemover.cs" />
    117121    <Compile Include="IRunCollectionModifier.cs" />
    118     <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
     122    <None Include="Plugin.cs.frame" />
    119123    <Compile Include="Algorithms\Algorithm.cs" />
    120124    <Compile Include="BatchRun.cs" />
    … …  
    192196    <Compile Include="Algorithms\UserDefinedAlgorithm.cs" />
    193197    <Compile Include="Algorithms\EngineAlgorithm.cs" />
    194     <Compile Include="HeuristicLabOptimizationPlugin.cs" />
    195198    <Compile Include="Properties\AssemblyInfo.cs" />
    196199    <Compile Include="ResultCollection.cs" />
    … …  
    199202  <ItemGroup>
    200203    <None Include="HeuristicLab.snk" />
    201     <None Include="Properties\AssemblyInfo.frame" />
     204    <None Include="Properties\AssemblyInfo.cs.frame" />
    202205  </ItemGroup>
    203206  <ItemGroup>
    … …  
    205208      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    206209      <Name>HeuristicLab.Collections-3.3</Name>
     210      <Private>False</Private>
    207211    </ProjectReference>
    208212    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    209213      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    210214      <Name>HeuristicLab.Common.Resources-3.3</Name>
     215      <Private>False</Private>
    211216    </ProjectReference>
    212217    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    213218      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    214219      <Name>HeuristicLab.Common-3.3</Name>
     220      <Private>False</Private>
    215221    </ProjectReference>
    216222    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    217223      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    218224      <Name>HeuristicLab.Core-3.3</Name>
     225      <Private>False</Private>
    219226    </ProjectReference>
    220227    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    221228      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    222229      <Name>HeuristicLab.Data-3.3</Name>
     230      <Private>False</Private>
    223231    </ProjectReference>
    224232    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    225233      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    226234      <Name>HeuristicLab.Parameters-3.3</Name>
     235      <Private>False</Private>
    227236    </ProjectReference>
    228237    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    229238      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    230239      <Name>HeuristicLab.Persistence-3.3</Name>
     240      <Private>False</Private>
    231241    </ProjectReference>
    232242    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    233243      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    234244      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     245      <Private>False</Private>
    235246    </ProjectReference>
    236247  </ItemGroup>
    … …  
    268279
    269280call PreBuildEvent.cmd
    270 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabOptimizationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabOptimizationPlugin.cs"</PreBuildEvent>
     281</PreBuildEvent>
    271282  </PropertyGroup>
    272283</Project>

  • trunk/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

Note: See TracChangeset for help on using the changeset viewer.