Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/15/12 13:54:24 (12 years ago)
Author:
sforsten
Message:

#1784: merge branch ProblemInstancesRegressionAndClassification into trunk

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolicmergedeligible
      /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic5815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic5060
      /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic5175-5192
      /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic6828
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic5370-5682
      /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic6829-6865
      /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic5594-5752
      /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic5959-6341

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

    r7734 r7823  
    9595    <Reference Include="ALGLIB-3.5.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    9696      <HintPath>..\..\bin\ALGLIB-3.5.0.dll</HintPath>
     97      <Private>False</Private>
    9798    </Reference>
    9899    <Reference Include="System" />
    … …  
    298299      <Private>False</Private>
    299300    </ProjectReference>
     301    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     302      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     303      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     304    </ProjectReference>
    300305    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    301306      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
Note: See TracChangeset for help on using the changeset viewer.