Context Navigation

← Previous Changeset
Next Changeset →

Changeset 13285

Timestamp:

11/19/15 11:56:45 (9 years ago)

Author:

ascheibe

Message:

#2269 merged r13214, r13217, r13223, r13224, r13226, r13228, r13231, r13232, r13260 into stable

Location:

Files:

: 10 edited
: 4 copied

. (modified) (view diffs)
HeuristicLab 3.3.sln (modified) (view diffs)
HeuristicLab.Algorithms.ALPS (copied) (copied from trunk/sources/HeuristicLab.Algorithms.ALPS) (view diffs)
HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (view diffs)
HeuristicLab.Algorithms.ALPS/3.3/ResultsHistoryWiper.cs (modified) (view diffs)
HeuristicLab.Optimizer (modified) (view diffs)
HeuristicLab.Optimizer/3.3/Documents/ALPSGA_TSP.hl (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/Documents/ALPSGA_TSP.hl) (view diffs)
HeuristicLab.Optimizer/3.3/Documents/ALPSGP_SymReg.hl (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/Documents/ALPSGP_SymReg.hl) (view diffs)
HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (view diffs)
HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (view diffs)
HeuristicLab.Tests (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab-3.3/Samples/AlpsSampleTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples/AlpsSampleTest.cs) (view diffs)
HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 13214,13217,13223-13224,13226,13228,13231-13232,13260

stable/HeuristicLab.Algorithms.ALPS

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.ALPS (added)	merged: 11570-12508
/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Algorithms.ALPS (added)	merged: 11130-12721
/branches/HiveStatistics/sources/HeuristicLab.Algorithms.ALPS (added)	merged: 12440-12877
/branches/NSGA-II Changes/HeuristicLab.Algorithms.ALPS (added)	merged: 12033-12122
/branches/crossvalidation-2434/HeuristicLab.Algorithms.ALPS (added)	merged: 12948-12950
/trunk/sources/HeuristicLab.Algorithms.ALPS	merged: 13214,13217,13231-13232

stable/HeuristicLab.Optimizer
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Optimizer merged: 13228,13260
stable/HeuristicLab.Tests
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Tests merged: 13223-13224,13226,13260

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

Download in other formats:

Update cookies preferences