Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/18/15 10:54:32 (10 years ago)
Author:
bburlacu
Message:

#2276: Merged trunk changes.

Location:
branches/HeuristicLab.DatasetRefactor/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DatasetRefactor/sources

  • branches/HeuristicLab.DatasetRefactor/sources/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/CodeEditor/HeuristicLab.Optimization11700-11806
      /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/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r11300 r12031  
    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>
    … …  
    4646    <WarningLevel>4</WarningLevel>
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4849  </PropertyGroup>
    4950  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    5758    </DocumentationFile>
    5859    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5961  </PropertyGroup>
    6062  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    6668    <ErrorReport>prompt</ErrorReport>
    6769    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     70    <Prefer32Bit>false</Prefer32Bit>
    6871  </PropertyGroup>
    6972  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    7780    <ErrorReport>prompt</ErrorReport>
    7881    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     82    <Prefer32Bit>false</Prefer32Bit>
    7983  </PropertyGroup>
    8084  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    8690    <ErrorReport>prompt</ErrorReport>
    8791    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     92    <Prefer32Bit>false</Prefer32Bit>
    8893  </PropertyGroup>
    8994  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    97102    <ErrorReport>prompt</ErrorReport>
    98103    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     104    <Prefer32Bit>false</Prefer32Bit>
    99105  </PropertyGroup>
    100106  <ItemGroup>
    … …  
    114120  </ItemGroup>
    115121  <ItemGroup>
     122    <Compile Include="Algorithms\BasicAlgorithm.cs" />
     123    <Compile Include="BasicProblems\BasicProblem.cs" />
     124    <Compile Include="BasicProblems\Encoding.cs" />
     125    <Compile Include="BasicProblems\Individuals\Individual.cs" />
     126    <Compile Include="BasicProblems\Individuals\MultiEncodingIndividual.cs" />
     127    <Compile Include="BasicProblems\Individuals\SingleEncodingIndividual.cs" />
     128    <Compile Include="BasicProblems\Interfaces\IEncoding.cs" />
     129    <Compile Include="BasicProblems\Interfaces\IEncodingOperator.cs" />
     130    <Compile Include="BasicProblems\Interfaces\IMultiEncodingOperator.cs" />
     131    <Compile Include="BasicProblems\Interfaces\IMultiObjectiveProblemDefinition.cs" />
     132    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveAnalysisOperator.cs" />
     133    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveEvaluationOperator.cs" />
     134    <Compile Include="BasicProblems\Interfaces\internal\INeighborBasedOperator.cs" />
     135    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveAnalysisOperator.cs" />
     136    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveEvaluationOperator.cs" />
     137    <Compile Include="BasicProblems\Interfaces\IProblemDefinition.cs" />
     138    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveMoveOperator.cs" />
     139    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveProblemDefinition.cs" />
     140    <Compile Include="BasicProblems\MultiEncoding.cs" />
     141    <Compile Include="BasicProblems\MultiObjectiveBasicProblem.cs" />
     142    <Compile Include="BasicProblems\Operators\MultiEncodingCreator.cs" />
     143    <Compile Include="BasicProblems\Operators\MultiEncodingCrossover.cs" />
     144    <Compile Include="BasicProblems\Operators\MultiEncodingManipulator.cs" />
     145    <Compile Include="BasicProblems\Operators\MultiEncodingOperator.cs" />
     146    <Compile Include="BasicProblems\Operators\MultiObjectiveAnalyzer.cs" />
     147    <Compile Include="BasicProblems\Operators\MultiObjectiveEvaluator.cs" />
     148    <Compile Include="BasicProblems\Operators\SingleObjectiveAnalyzer.cs" />
     149    <Compile Include="BasicProblems\Operators\SingleObjectiveEvaluator.cs" />
     150    <Compile Include="BasicProblems\Operators\SingleObjectiveImprover.cs" />
     151    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveEvaluator.cs" />
     152    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveGenerator.cs" />
     153    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveMaker.cs" />
     154    <Compile Include="BasicProblems\SingleObjectiveBasicProblem.cs" />
    116155    <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     156    <Compile Include="Interfaces\IMultiObjectiveOperator.cs" />
     157    <Compile Include="Interfaces\ISingleObjectiveOperator.cs" />
    117158    <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />
    118159    <Compile Include="Interfaces\ISingleObjectiveImprovementOperator.cs" />
    … …  
    239280      <Private>False</Private>
    240281    </ProjectReference>
     282    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     283      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     284      <Name>HeuristicLab.Operators-3.3</Name>
     285      <Private>False</Private>
     286    </ProjectReference>
    241287    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    242288      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
Note: See TracChangeset for help on using the changeset viewer.