source: branches/2845_EnhancedProgress/HeuristicLab.Encodings.PermutationEncoding @ 16317

Name	Size	Rev	Age	Author	Last Change
../
3.3	​	16311	6 years	pfleck	#2845 Merged trunk changes into branch (15406-15681, 15683-16308)

Property svn:ignore set to bin Property svn:mergeinfo set to (toggle deleted branches) /branches/2839_HiveProjectManagement/HeuristicLab.Encodings.PermutationEncoding merged eligible /stable/HeuristicLab.Encodings.PermutationEncoding merged eligible /trunk/HeuristicLab.Encodings.PermutationEncoding merged eligible /branches/Async/HeuristicLab.Encodings.PermutationEncoding 13329-15286 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.PermutationEncoding 5815-6180 /branches/DataPreprocessing/HeuristicLab.Encodings.PermutationEncoding 10085-11101 /branches/HLScript/HeuristicLab.Encodings.PermutationEncoding 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.PermutationEncoding 11570-12508 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Encodings.PermutationEncoding 11130-12721 /branches/LogResidualEvaluator/HeuristicLab.Encodings.PermutationEncoding 10202-10483 /branches/ProgrammableProblem/HeuristicLab.Encodings.PermutationEncoding 11776-11959 /branches/QAP/HeuristicLab.Encodings.PermutationEncoding 5701-5932 /branches/QAPAlgorithms/HeuristicLab.Encodings.PermutationEncoding 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Encodings.PermutationEncoding 6828 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.PermutationEncoding 10204-10479 /branches/Trunk/HeuristicLab.Encodings.PermutationEncoding 6829-6865 /branches/histogram/HeuristicLab.Encodings.PermutationEncoding 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Encodings.PermutationEncoding 14232-14825 /trunk/sources/HeuristicLab.Encodings.PermutationEncoding 15406-15681