Changeset 12495
- Timestamp:
- 06/23/15 12:50:05 (9 years ago)
- Location:
- branches/GBT
- Files:
-
- 11 deleted
- 128 edited
- 16 copied
-
branches/GBT
- Property svn:mergeinfo changed
/trunk/sources merged: 12392-12393,12397-12401,12422,12424,12428-12435,12442-12443,12445,12455-12458,12461,12463-12465,12470-12476,12478-12482,12485,12488,12490-12494 -
Property
svn:global-ignores
set to
*.nuget
packages
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Analysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Analysis.Views (added) merged: 12458
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added) merged: 12397-12398,12400
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Data/3.3
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Data/3.3 (added) merged: 12431-12433
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.ExtLibs (added) merged: 12463-12464,12472,12479,12490
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Optimizer
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Optimizer (added) merged: 12393,12397-12399,12401
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Persistence
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Persistence (added) merged: 12455-12456,12475
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.ArtificialAnt
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Problems.ArtificialAnt merged eligible /stable/HeuristicLab.Problems.ArtificialAnt merged eligible /trunk/sources/HeuristicLab.Problems.ArtificialAnt merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Problems.ArtificialAnt 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Problems.ArtificialAnt 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.ArtificialAnt 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.ArtificialAnt 4656-4721 /branches/CodeEditor/HeuristicLab.Problems.ArtificialAnt 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.ArtificialAnt 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.ArtificialAnt 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Problems.ArtificialAnt 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.ArtificialAnt 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.ArtificialAnt 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Problems.ArtificialAnt 10202-10483 /branches/NET40/sources/HeuristicLab.Problems.ArtificialAnt 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Problems.ArtificialAnt 12033-12122 /branches/ParallelEngine/HeuristicLab.Problems.ArtificialAnt 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.ArtificialAnt 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.ArtificialAnt 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.ArtificialAnt 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.ArtificialAnt 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.ArtificialAnt 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.ArtificialAnt 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.ArtificialAnt 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.ArtificialAnt 5370-5682 /branches/SymbolicExpressionTreeEncoding/HeuristicLab.Problems.ArtificialAnt 12339-12421 /branches/Trunk/HeuristicLab.Problems.ArtificialAnt 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.ArtificialAnt 9168-9215 /branches/VNS/HeuristicLab.Problems.ArtificialAnt 5594-5752 /branches/histogram/HeuristicLab.Problems.ArtificialAnt 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/GBT/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis (added) merged: 12485,12492
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis merged eligible /stable/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis merged eligible /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 4656-4721 /branches/CodeEditor/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 10202-10483 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 12033-12122 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5370-5682 /branches/SymbolicExpressionTreeEncoding/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 12343-12421 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 9168-9215 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/GBT/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged: 12493
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.GrammaticalEvolution
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/stable/HeuristicLab.Problems.GrammaticalEvolution merged eligible /trunk/sources/HeuristicLab.Problems.GrammaticalEvolution merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Problems.GrammaticalEvolution 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Problems.GrammaticalEvolution 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.GrammaticalEvolution 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.GrammaticalEvolution 4656-4721 /branches/CodeEditor/HeuristicLab.Problems.GrammaticalEvolution 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.GrammaticalEvolution 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.GrammaticalEvolution 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.GrammaticalEvolution 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Problems.GrammaticalEvolution 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Problems.GrammaticalEvolution 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.GrammaticalEvolution 5060 /branches/HLScript/HeuristicLab.Problems.GrammaticalEvolution 10331-10358 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.GrammaticalEvolution 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Problems.GrammaticalEvolution 10202-10483 /branches/NET40/sources/HeuristicLab.Problems.GrammaticalEvolution 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Problems.GrammaticalEvolution 12033-12122 /branches/ParallelEngine/HeuristicLab.Problems.GrammaticalEvolution 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.GrammaticalEvolution 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.GrammaticalEvolution 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.GrammaticalEvolution 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.GrammaticalEvolution 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.GrammaticalEvolution 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.GrammaticalEvolution 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.GrammaticalEvolution 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.GrammaticalEvolution 5370-5682 /branches/SymbolicExpressionTreeEncoding/HeuristicLab.Problems.GrammaticalEvolution 12340-12421 /branches/Trunk/HeuristicLab.Problems.GrammaticalEvolution 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.GrammaticalEvolution 9168-9215 /branches/VNS/HeuristicLab.Problems.GrammaticalEvolution 5594-5752 /branches/histogram/HeuristicLab.Problems.GrammaticalEvolution 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/GBT/HeuristicLab.Problems.LawnMower
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Problems.LawnMower merged eligible /stable/HeuristicLab.Problems.LawnMower merged eligible /trunk/sources/HeuristicLab.Problems.LawnMower merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Problems.LawnMower 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Problems.LawnMower 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.LawnMower 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.LawnMower 4656-4721 /branches/CodeEditor/HeuristicLab.Problems.LawnMower 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.LawnMower 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.LawnMower 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.LawnMower 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Problems.LawnMower 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Problems.LawnMower 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.LawnMower 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.LawnMower 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Problems.LawnMower 10202-10483 /branches/NET40/sources/HeuristicLab.Problems.LawnMower 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Problems.LawnMower 12033-12122 /branches/ParallelEngine/HeuristicLab.Problems.LawnMower 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.LawnMower 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.LawnMower 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.LawnMower 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.LawnMower 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.LawnMower 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.LawnMower 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.LawnMower 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.LawnMower 5370-5682 /branches/SymbolicExpressionTreeEncoding/HeuristicLab.Problems.LawnMower 12344-12421 /branches/Trunk/HeuristicLab.Problems.LawnMower 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.LawnMower 9168-9215 /branches/VNS/HeuristicLab.Problems.LawnMower 5594-5752 /branches/histogram/HeuristicLab.Problems.LawnMower 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/GBT/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 12488
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests (added) merged: 12482,12488
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.