- Timestamp:
- 02/10/15 09:57:29 (10 years ago)
- Location:
- branches/ALPS
- Files:
-
- 8 deleted
- 178 edited
- 58 copied
-
branches/ALPS
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis merged: 11956,11970
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Analysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Analysis merged: 11703,11854,11856,11914,11970
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Encodings.BinaryVectorEncoding
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Encodings.BinaryVectorEncoding merged eligible /stable/HeuristicLab.Encodings.BinaryVectorEncoding merged eligible /trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Encodings.BinaryVectorEncoding 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Encodings.BinaryVectorEncoding 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Encodings.BinaryVectorEncoding 6917-7005 /branches/CloningRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding 4656-4721 /branches/CodeEditor/HeuristicLab.Encodings.BinaryVectorEncoding 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Encodings.BinaryVectorEncoding 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.BinaryVectorEncoding 5815-6180 /branches/DataAnalysis/HeuristicLab.Encodings.BinaryVectorEncoding 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Encodings.BinaryVectorEncoding 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Encodings.BinaryVectorEncoding 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.BinaryVectorEncoding 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Encodings.BinaryVectorEncoding 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Encodings.BinaryVectorEncoding 10202-10483 /branches/NET40/sources/HeuristicLab.Encodings.BinaryVectorEncoding 5138-5162 /branches/ParallelEngine/HeuristicLab.Encodings.BinaryVectorEncoding 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.BinaryVectorEncoding 7568-7810 /branches/ProgrammableProblem/HeuristicLab.Encodings.BinaryVectorEncoding 11774-11959 /branches/QAPAlgorithms/HeuristicLab.Encodings.BinaryVectorEncoding 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Encodings.BinaryVectorEncoding 6828 /branches/RuntimeOptimizer/HeuristicLab.Encodings.BinaryVectorEncoding 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.BinaryVectorEncoding 7787-8333 /branches/SlaveShutdown/HeuristicLab.Encodings.BinaryVectorEncoding 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.BinaryVectorEncoding 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Encodings.BinaryVectorEncoding 5370-5682 /branches/Trunk/HeuristicLab.Encodings.BinaryVectorEncoding 6829-6865 /branches/UnloadJobs/HeuristicLab.Encodings.BinaryVectorEncoding 9168-9215 /branches/VNS/HeuristicLab.Encodings.BinaryVectorEncoding 5594-5752 /branches/histogram/HeuristicLab.Encodings.BinaryVectorEncoding 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/ALPS/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
/branches/ProgrammableProblem/HeuristicLab.Encodings.PermutationEncoding (added) merged: 11776,11778,11946,11949,11952 /trunk/sources/HeuristicLab.Encodings.PermutationEncoding merged: 11961,11970
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Encodings.RealVectorEncoding
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Encodings.RealVectorEncoding merged eligible /stable/HeuristicLab.Encodings.RealVectorEncoding merged eligible /trunk/sources/HeuristicLab.Encodings.RealVectorEncoding merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Encodings.RealVectorEncoding 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Encodings.RealVectorEncoding 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Encodings.RealVectorEncoding 6917-7005 /branches/CloningRefactoring/HeuristicLab.Encodings.RealVectorEncoding 4656-4721 /branches/CodeEditor/HeuristicLab.Encodings.RealVectorEncoding 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Encodings.RealVectorEncoding 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.RealVectorEncoding 5815-6180 /branches/DataAnalysis/HeuristicLab.Encodings.RealVectorEncoding 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Encodings.RealVectorEncoding 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.RealVectorEncoding 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Encodings.RealVectorEncoding 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Encodings.RealVectorEncoding 10202-10483 /branches/NET40/sources/HeuristicLab.Encodings.RealVectorEncoding 5138-5162 /branches/ParallelEngine/HeuristicLab.Encodings.RealVectorEncoding 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.RealVectorEncoding 7568-7810 /branches/ProgrammableProblem/HeuristicLab.Encodings.RealVectorEncoding 11777-11959 /branches/QAPAlgorithms/HeuristicLab.Encodings.RealVectorEncoding 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Encodings.RealVectorEncoding 6828 /branches/RuntimeOptimizer/HeuristicLab.Encodings.RealVectorEncoding 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.RealVectorEncoding 7787-8333 /branches/SlaveShutdown/HeuristicLab.Encodings.RealVectorEncoding 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.RealVectorEncoding 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Encodings.RealVectorEncoding 5370-5682 /branches/Trunk/HeuristicLab.Encodings.RealVectorEncoding 6829-6865 /branches/UnloadJobs/HeuristicLab.Encodings.RealVectorEncoding 9168-9215 /branches/VNS/HeuristicLab.Encodings.RealVectorEncoding 5594-5752 /branches/histogram/HeuristicLab.Encodings.RealVectorEncoding 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/ALPS/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 11939
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
/branches/CodeEditor/HeuristicLab.ExtLibs (added) merged: 11700,11707,11743,11804 /trunk/sources/HeuristicLab.ExtLibs merged: 11807,11810-11811,11829-11831,11955
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Optimization
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Optimization merged eligible /stable/HeuristicLab.Optimization merged eligible /trunk/sources/HeuristicLab.Optimization merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Optimization 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Optimization 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Optimization 6917-7005 /branches/Classification-Extensions/HeuristicLab.Optimization 11687-11761 /branches/CloningRefactoring/HeuristicLab.Optimization 4656-4721 /branches/CodeEditor/HeuristicLab.Optimization 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Optimization 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimization 5815-6180 /branches/DataAnalysis/HeuristicLab.Optimization 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Optimization 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Optimization 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimization 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Optimization 10202-10483 /branches/NET40/sources/HeuristicLab.Optimization 5138-5162 /branches/ParallelEngine/HeuristicLab.Optimization 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization 7568-7810 /branches/ProgrammableProblem/HeuristicLab.Optimization 11573-11959 /branches/QAPAlgorithms/HeuristicLab.Optimization 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Optimization 6828 /branches/RuntimeOptimizer/HeuristicLab.Optimization 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization 7787-8333 /branches/SlaveShutdown/HeuristicLab.Optimization 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimization 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Optimization 5370-5682 /branches/Trunk/HeuristicLab.Optimization 6829-6865 /branches/UnloadJobs/HeuristicLab.Optimization 9168-9215 /branches/VNS/HeuristicLab.Optimization 5594-5752 /branches/histogram/HeuristicLab.Optimization 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/ALPS/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views merged: 11828
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression merged: 11680
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged: 11679
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment merged: 11970
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.TestFunctions merged: 11970
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 11961,11970
- Property svn:mergeinfo changed
-
branches/ALPS/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests merged: 11703,11705,11735,11782,11784,11789,11890,11916,11934,11938-11939,11951,11956,11959,11961
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.