Context Navigation

← Previous Change
Next Change →

HeuristicLab.Problems.BinPacking

Timestamp:

07/23/17 11:17:18 (7 years ago)

Author:

abeham

Message:

#2258: merged r14001:15280 from trunk into branch

Location:

branches/Async

Files:

: 1 edited
: 1 copied

. (modified) (2 props)
HeuristicLab.Problems.BinPacking (copied) (copied from trunk/sources/HeuristicLab.Problems.BinPacking) (1 prop)

branches/Async

Property svn:ignore

old	new
24	24	protoc.exe
25	25	obj
	26	.vs

Property svn:mergeinfo changed

/branches/symbreg-factors-2650 (added)	merged: 14232-14233,14237-14243,14248-14249,14251,14259,14266,14276-14277,14330-14331,14339,14351,14399,14401-14403,14421,14449,14497-14499,14501-14502,14534-14535,14539-14542,14554,14560,14589,14591-14592,14615,14693,14701,14715-14717,14719-14720,14751-14756,14758-14766,14812-14815,14823-14825
/stable	merged: 14190
/trunk/sources	merged: 14001,14007-14008,14011,14015-14017,14024-14026,14032,14034,14036-14037,14056-14057,14071,14078,14082-14083,14094-14096,14098-14100,14102-14103,14106-14107,14109-14110,14118,14120-14122,14124-14127,14129-14132,14135-14137,14140,14142,14144,14150,14152,14155-14160,14162-14164,14167-14169,14171,14174-14175,14177-14179,14181,14185,14187,14189,14191,14195-14196,14198,14200,14202-14209,14221-14224,14226-14230,14234-14236,14244-14247,14250,14255-14258,14260,14267-14268,14270-14273,14282,14284-14300,14307,14314-14316,14319,14322,14332,14340-14350,14352-14358,14367-14369,14371-14372,14376,14378,14381-14382,14384,14388,14390-14391,14393-14394,14396,14400,14405,14407-14408,14412,14418,14422-14423,14425,14432-14439,14443,14457-14458,14463-14465,14468-14469,14475-14476,14478-14479,14481-14483,14486,14493-14494,14504,14506-14509,14516-14517,14519,14522-14523,14527-14529,14531-14533,14548,14553,14561,14582,14597,14623,14630,14636-14638,14640-14641,14647,14651-14652,14654,14656,14659-14660,14662-14663,14672,14685,14687,14692,14697,14706,14708-14709,14718,14721-14722,14726,14732,14734,14737-14738,14740,14748-14750,14769-14770,14772-14775,14779-14781,14786,14789-14791,14793,14805,14809-14810,14817,14819-14820,14826-14832,14839-14843,14845-14847,14851-14854,14857,14860-14865,14871,14877,14882,14886,14889-14890,14899,14901,14904,14911-14912,14916,14918,14936-14938,14943-14951,14955,14971,14978-14979,14982,14984,14987,14992,14995,15002-15010,15013,15015-15016,15023-15024,15026,15029,15040,15042,15044,15046-15054,15058,15067-15077,15079-15080,15083-15088,15091-15096,15098-15099,15102-15107,15110-15114,15119-15126,15129,15135,15139,15156-15158,15160,15162-15169,15172-15173,15178-15181,15184-15185,15187,15191-15192,15194,15198,15201,15203,15205-15211,15213-15214,15221-15228,15230,15233-15236,15240-15241,15246-15248,15264-15266,15271,15276

branches/Async/HeuristicLab.Problems.BinPacking

Property svn:mergeinfo changed

/branches/1721-RandomForestPersistence/HeuristicLab.Problems.BinPacking (added)	merged: 10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.Problems.BinPacking (added)	merged: 5516-5520
/branches/Benchmarking/sources/HeuristicLab.Problems.BinPacking (added)	merged: 6917-7005
/branches/CloningRefactoring/HeuristicLab.Problems.BinPacking (added)	merged: 4656-4721
/branches/CodeEditor/HeuristicLab.Problems.BinPacking (added)	merged: 11700-11806
/branches/DataAnalysis Refactoring/HeuristicLab.Problems.BinPacking (added)	merged: 5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.BinPacking (added)	merged: 5815-6180
/branches/DataAnalysis/HeuristicLab.Problems.BinPacking (added)	merged: 4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Problems.BinPacking (added)	merged: 10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Problems.BinPacking (added)	merged: 6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.BinPacking (added)	merged: 5060
/branches/HLScript/HeuristicLab.Problems.BinPacking (added)	merged: 10331-10358
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.BinPacking (added)	merged: 11570-12508
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.BinPacking (added)	merged: 6123-9799
/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.BinPacking (added)	merged: 11130-12721
/branches/HiveStatistics/sources/HeuristicLab.Problems.BinPacking (added)	merged: 12440-12877
/branches/LogResidualEvaluator/HeuristicLab.Problems.BinPacking (added)	merged: 10202-10483
/branches/NET40/sources/HeuristicLab.Problems.BinPacking (added)	merged: 5138-5162
/branches/NSGA-II Changes/HeuristicLab.Problems.BinPacking (added)	merged: 12033-12122
/branches/ParallelEngine/HeuristicLab.Problems.BinPacking (added)	merged: 5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.BinPacking (added)	merged: 7568-7810
/branches/QAPAlgorithms/HeuristicLab.Problems.BinPacking (added)	merged: 6350-6627
/branches/Restructure trunk solution/HeuristicLab.Problems.BinPacking (added)	merged: 6828
/branches/RuntimeOptimizer/HeuristicLab.Problems.BinPacking (added)	merged: 8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.BinPacking (added)	merged: 7787-8333
/branches/SlaveShutdown/HeuristicLab.Problems.BinPacking (added)	merged: 8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.BinPacking (added)	merged: 10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Problems.BinPacking (added)	merged: 5370-5682
/branches/Trunk/HeuristicLab.Problems.BinPacking (added)	merged: 6829-6865
/branches/UnloadJobs/HeuristicLab.Problems.BinPacking (added)	merged: 9168-9215
/branches/VNS/HeuristicLab.Problems.BinPacking (added)	merged: 5594-5752
/branches/crossvalidation-2434/HeuristicLab.Problems.BinPacking (added)	merged: 12948-12950
/branches/histogram/HeuristicLab.Problems.BinPacking (added)	merged: 5959-6341
/branches/symbreg-factors-2650/HeuristicLab.Problems.BinPacking (added)	merged: 14277
/trunk/sources/HeuristicLab.Problems.BinPacking (added)	merged: 14162-14163,14167,14174,14177-14178,14185,14273,14916,15069,15230,15233,15240-15241,15276

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

Context Navigation

Changeset 15281 for branches/Async/HeuristicLab.Problems.BinPacking

branches/Async

branches/Async/HeuristicLab.Problems.BinPacking

Download in other formats: