Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/04/15 10:18:39 (9 years ago)
Author:
abeham
Message:

#1985:

  • Restored compilable state of TimeLimitRunOptimizer branch
  • Updated changes from trunk
Location:
branches/TimeLimitRunOptimizer
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/TimeLimitRunOptimizer

    • Property svn:ignore set to
      *.suo

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/HLScript/HeuristicLab.Optimizationmergedeligible
      /stable/HeuristicLab.Optimizationmergedeligible
      /trunk/sources/HeuristicLab.Optimizationmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Optimization10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Optimization5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Optimization6917-7005
      /branches/Classification-Extensions/HeuristicLab.Optimization11687-11761
      /branches/CloningRefactoring/HeuristicLab.Optimization4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Optimization5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimization5815-6180
      /branches/DataAnalysis/HeuristicLab.Optimization4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Optimization10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Optimization6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization5060
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimization6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.Optimization10202-10483
      /branches/NET40/sources/HeuristicLab.Optimization5138-5162
      /branches/ParallelEngine/HeuristicLab.Optimization5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization7568-7810
      /branches/ProgrammableProblem/HeuristicLab.Optimization11573-11959
      /branches/QAPAlgorithms/HeuristicLab.Optimization6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Optimization6828
      /branches/RuntimeOptimizer/HeuristicLab.Optimization8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization7787-8333
      /branches/SlaveShutdown/HeuristicLab.Optimization8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimization10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Optimization5370-5682
      /branches/Trunk/HeuristicLab.Optimization6829-6865
      /branches/UnloadJobs/HeuristicLab.Optimization9168-9215
      /branches/VNS/HeuristicLab.Optimization5594-5752
      /branches/histogram/HeuristicLab.Optimization5959-6341

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r9079 r12118  
    1111    <RootNamespace>HeuristicLab.Optimization</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Optimization-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    4646    <WarningLevel>4</WarningLevel>
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4849  </PropertyGroup>
    4950  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    5051    <DebugType>pdbonly</DebugType>
    5152    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5354    <DefineConstants>TRACE</DefineConstants>
    5455    <ErrorReport>prompt</ErrorReport>
    … …  
    5758    </DocumentationFile>
    5859    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5961  </PropertyGroup>
    6062  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6163    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     64    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6365    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6466    <DebugType>full</DebugType>
    … …  
    6668    <ErrorReport>prompt</ErrorReport>
    6769    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     70    <Prefer32Bit>false</Prefer32Bit>
    6871  </PropertyGroup>
    6972  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    70     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7174    <DefineConstants>TRACE</DefineConstants>
    7275    <DocumentationFile>
    … …  
    7780    <ErrorReport>prompt</ErrorReport>
    7881    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     82    <Prefer32Bit>false</Prefer32Bit>
    7983  </PropertyGroup>
    8084  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8185    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     86    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8387    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8488    <DebugType>full</DebugType>
    … …  
    8690    <ErrorReport>prompt</ErrorReport>
    8791    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     92    <Prefer32Bit>false</Prefer32Bit>
    8893  </PropertyGroup>
    8994  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    90     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     95    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9196    <DefineConstants>TRACE</DefineConstants>
    9297    <DocumentationFile>
    … …  
    97102    <ErrorReport>prompt</ErrorReport>
    98103    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     104    <Prefer32Bit>false</Prefer32Bit>
    99105  </PropertyGroup>
    100106  <ItemGroup>
     107    <Reference Include="HeuristicLab.Collections-3.3">
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Common-3.3">
     112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Common.Resources-3.3">
     116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Core-3.3">
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Data-3.3">
     124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Operators-3.3">
     128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Parameters-3.3">
     132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     133      <Private>False</Private>
     134    </Reference>
     135    <Reference Include="HeuristicLab.Persistence-3.3">
     136      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     137      <Private>False</Private>
     138    </Reference>
     139    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     140      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     141      <Private>False</Private>
     142    </Reference>
    101143    <Reference Include="System" />
    102144    <Reference Include="System.Core">
    … …  
    114156  </ItemGroup>
    115157  <ItemGroup>
     158    <Compile Include="Algorithms\BasicAlgorithm.cs" />
     159    <Compile Include="BasicProblems\BasicProblem.cs" />
     160    <Compile Include="BasicProblems\Encoding.cs" />
     161    <Compile Include="BasicProblems\Individuals\Individual.cs" />
     162    <Compile Include="BasicProblems\Individuals\MultiEncodingIndividual.cs" />
     163    <Compile Include="BasicProblems\Individuals\SingleEncodingIndividual.cs" />
     164    <Compile Include="BasicProblems\Interfaces\IEncoding.cs" />
     165    <Compile Include="BasicProblems\Interfaces\IEncodingOperator.cs" />
     166    <Compile Include="BasicProblems\Interfaces\IMultiEncodingOperator.cs" />
     167    <Compile Include="BasicProblems\Interfaces\IMultiObjectiveProblemDefinition.cs" />
     168    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveAnalysisOperator.cs" />
     169    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveEvaluationOperator.cs" />
     170    <Compile Include="BasicProblems\Interfaces\internal\INeighborBasedOperator.cs" />
     171    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveAnalysisOperator.cs" />
     172    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveEvaluationOperator.cs" />
     173    <Compile Include="BasicProblems\Interfaces\IProblemDefinition.cs" />
     174    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveMoveOperator.cs" />
     175    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveProblemDefinition.cs" />
     176    <Compile Include="BasicProblems\MultiEncoding.cs" />
     177    <Compile Include="BasicProblems\MultiObjectiveBasicProblem.cs" />
     178    <Compile Include="BasicProblems\Operators\MultiEncodingCreator.cs" />
     179    <Compile Include="BasicProblems\Operators\MultiEncodingCrossover.cs" />
     180    <Compile Include="BasicProblems\Operators\MultiEncodingManipulator.cs" />
     181    <Compile Include="BasicProblems\Operators\MultiEncodingOperator.cs" />
     182    <Compile Include="BasicProblems\Operators\MultiObjectiveAnalyzer.cs" />
     183    <Compile Include="BasicProblems\Operators\MultiObjectiveEvaluator.cs" />
     184    <Compile Include="BasicProblems\Operators\SingleObjectiveAnalyzer.cs" />
     185    <Compile Include="BasicProblems\Operators\SingleObjectiveEvaluator.cs" />
     186    <Compile Include="BasicProblems\Operators\SingleObjectiveImprover.cs" />
     187    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveEvaluator.cs" />
     188    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveGenerator.cs" />
     189    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveMaker.cs" />
     190    <Compile Include="BasicProblems\SingleObjectiveBasicProblem.cs" />
     191    <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     192    <Compile Include="Interfaces\IMultiObjectiveOperator.cs" />
     193    <Compile Include="Interfaces\ISingleObjectiveOperator.cs" />
    116194    <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />
    117195    <Compile Include="Interfaces\ISingleObjectiveImprovementOperator.cs" />
    … …  
    214292  </ItemGroup>
    215293  <ItemGroup>
    216     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    217       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    218       <Name>HeuristicLab.Collections-3.3</Name>
    219       <Private>False</Private>
    220     </ProjectReference>
    221     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    222       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    223       <Name>HeuristicLab.Common.Resources-3.3</Name>
    224       <Private>False</Private>
    225     </ProjectReference>
    226     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    227       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    228       <Name>HeuristicLab.Common-3.3</Name>
    229       <Private>False</Private>
    230     </ProjectReference>
    231     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    232       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    233       <Name>HeuristicLab.Core-3.3</Name>
    234       <Private>False</Private>
    235     </ProjectReference>
    236     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    237       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    238       <Name>HeuristicLab.Data-3.3</Name>
    239       <Private>False</Private>
    240     </ProjectReference>
    241     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    242       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    243       <Name>HeuristicLab.Parameters-3.3</Name>
    244       <Private>False</Private>
    245     </ProjectReference>
    246     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    247       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    248       <Name>HeuristicLab.Persistence-3.3</Name>
    249       <Private>False</Private>
    250     </ProjectReference>
    251     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    252       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    253       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    254       <Private>False</Private>
    255     </ProjectReference>
    256   </ItemGroup>
    257   <ItemGroup>
    258294    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    259295      <Visible>False</Visible>
Note: See TracChangeset for help on using the changeset viewer.