Changeset 12689
- Timestamp:
- 07/08/15 15:32:12 (9 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 109 edited
- 11 copied
-
branches/HiveStatistics/sources
-
branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis merged: 12622
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Analysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Analysis.Views merged: 12614,12670,12679
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Core
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Core merged: 12616,12622,12649,12664
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Data.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Data.Views merged eligible /stable/HeuristicLab.Data.Views merged eligible /trunk/sources/HeuristicLab.Data.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Data.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Data.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Data.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Data.Views 4656-4721 /branches/CodeEditor/HeuristicLab.Data.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Data.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Data.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Data.Views 10085-11101 /branches/DataPreprocessingImprovements/HeuristicLab.Data.Views 12160-12675 /branches/GP.Grammar.Editor/HeuristicLab.Data.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data.Views 5060 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Data.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Data.Views 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Data.Views 10202-10483 /branches/NET40/sources/HeuristicLab.Data.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Data.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.Data.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Data.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Data.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Data.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Data.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Data.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Data.Views 5370-5682 /branches/Trunk/HeuristicLab.Data.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Data.Views 9168-9215 /branches/VNS/HeuristicLab.Data.Views 5594-5752 /branches/histogram/HeuristicLab.Data.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
/branches/DataPreprocessingImprovements/HeuristicLab.Data.Views/3.3 (added) merged: 12161,12164-12165,12168,12500,12633 /trunk/sources/HeuristicLab.Data.Views/3.3 merged: 12602,12676,12682
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/stable/HeuristicLab.DataPreprocessing.Views merged eligible /trunk/sources/HeuristicLab.DataPreprocessing.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views 4656-4721 /branches/CodeEditor/HeuristicLab.DataPreprocessing.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views 10085-11101 /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views 12054-12675 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views 5060 /branches/HLScript/HeuristicLab.DataPreprocessing.Views 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views 10202-10483 /branches/NET40/sources/HeuristicLab.DataPreprocessing.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views 5370-5682 /branches/Trunk/HeuristicLab.DataPreprocessing.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views 9168-9215 /branches/VNS/HeuristicLab.DataPreprocessing.Views 5594-5752 /branches/histogram/HeuristicLab.DataPreprocessing.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing/3.4
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/stable/HeuristicLab.DataPreprocessing/3.4 merged eligible /trunk/sources/HeuristicLab.DataPreprocessing/3.4 merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing/3.4 10321-10322 /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing/3.4 5516-5520 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5516-5520 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing/3.4 6917-7005 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6917-7005 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing/3.4 4656-4721 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 4656-4721 /branches/CodeEditor/HeuristicLab.DataPreprocessing/3.4 11700-11806 /branches/CodeEditor/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing/3.4 5471-5808 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing/3.4 5815-6180 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5815-6180 /branches/DataAnalysis/HeuristicLab.DataPreprocessing/3.4 4458-4459,4462,4464 /branches/DataAnalysis/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10085-11101 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10085-11101 /branches/DataPreprocessingImprovements/3.4 12051 /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing/3.4 12053-12675 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing/3.4 6284-6795 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing/3.4 5060 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5060 /branches/HLScript/HeuristicLab.DataPreprocessing/3.4 10331-10358 /branches/HLScript/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing/3.4 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing/3.4 6123-9799 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing/3.4 10202-10483 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10202-10483 /branches/NET40/sources/HeuristicLab.DataPreprocessing/3.4 5138-5162 /branches/NET40/sources/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5138-5162 /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing/3.4 12033-12122 /branches/ParallelEngine/HeuristicLab.DataPreprocessing/3.4 5175-5192 /branches/ParallelEngine/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing/3.4 7568-7810 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 7568-7810 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing/3.4 6350-6627 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6350-6627 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing/3.4 6828 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6828 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing/3.4 8943-9078 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing/3.4 7787-8333 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 7787-8333 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing/3.4 8944-8956 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing/3.4 10204-10479 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing/3.4 5370-5682 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5370-5682 /branches/Trunk/HeuristicLab.DataPreprocessing/3.4 6829-6865 /branches/Trunk/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6829-6865 /branches/UnloadJobs/HeuristicLab.DataPreprocessing/3.4 9168-9215 /branches/UnloadJobs/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 9168-9215 /branches/VNS/HeuristicLab.DataPreprocessing/3.4 5594-5752 /branches/VNS/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5594-5752 /branches/histogram/HeuristicLab.DataPreprocessing/3.4 5959-6341 /branches/histogram/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5959-6341 /stable/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10032-10033,11170,11173,11175,12008-12010
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HiveStatistics/sources/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.ExtLibs merged: 12621,12657,12671,12675
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Optimization
- Property svn:mergeinfo changed
/branches/TimeLimitRunOptimizer/HeuristicLab.Optimization (added) merged: 9438,12118,12128,12625 /trunk/sources/HeuristicLab.Optimization merged: 12617,12627,12672
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Optimization.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Optimization.Views merged eligible /stable/HeuristicLab.Optimization.Views merged eligible /trunk/sources/HeuristicLab.Optimization.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Optimization.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Optimization.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Optimization.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Optimization.Views 4656-4721 /branches/CodeEditor/HeuristicLab.Optimization.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Optimization.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimization.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Optimization.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Optimization.Views 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization.Views 5060 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimization.Views 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Optimization.Views 10202-10483 /branches/NET40/sources/HeuristicLab.Optimization.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Optimization.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.Optimization.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Optimization.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Optimization.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Optimization.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Optimization.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimization.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Optimization.Views 5370-5682 /branches/TimeLimitRunOptimizer/HeuristicLab.Optimization.Views 9438-12626 /branches/Trunk/HeuristicLab.Optimization.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Optimization.Views 9168-9215 /branches/VNS/HeuristicLab.Optimization.Views 5594-5752 /branches/histogram/HeuristicLab.Optimization.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HiveStatistics/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
-
branches/HiveStatistics/sources/HeuristicLab.Optimizer
- Property svn:mergeinfo changed
/branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer (added) merged: 12251-12252,12254,12267-12268,12466,12513,12678 /trunk/sources/HeuristicLab.Optimizer merged: 12649,12680
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Persistence
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Persistence merged: 12638
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis merged: 12612,12641
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 12641,12645,12674
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification merged: 12641
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression merged: 12641
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged: 12614,12642
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis merged: 12687-12688
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.