Free cookie consent management tool by TermsFeed Policy Generator

Changeset 16580


Ignore:
Timestamp:
01/29/19 10:33:46 (6 years ago)
Author:
bburlacu
Message:

#2976: Merged r16496 into stable.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • stable/HeuristicLab.Random/3.3/RandomEnumerable.cs

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/HeuristicLab.Random/3.3/RandomEnumerable.csmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Random/3.3/RandomEnumerable.cs10321-10322
      /branches/2916_IndexedDataTableSerialization/HeuristicLab.Random/3.3/RandomEnumerable.cs15918
      /branches/Algorithms.GradientDescent/HeuristicLab.Random/3.3/RandomEnumerable.cs5516-5520
      /branches/Async/HeuristicLab.Random/3.3/RandomEnumerable.cs13329-15286
      /branches/Benchmarking/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs6917-7005
      /branches/CloningRefactoring/HeuristicLab.Random/3.3/RandomEnumerable.cs4656-4721
      /branches/CodeEditor/HeuristicLab.Random/3.3/RandomEnumerable.cs11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.Random/3.3/RandomEnumerable.cs5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Random/3.3/RandomEnumerable.cs5815-6180
      /branches/DataAnalysis/HeuristicLab.Random/3.3/RandomEnumerable.cs4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Random/3.3/RandomEnumerable.cs10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Random/3.3/RandomEnumerable.cs6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Random/3.3/RandomEnumerable.cs5060
      /branches/HLScript/HeuristicLab.Random/3.3/RandomEnumerable.cs10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Random/3.3/RandomEnumerable.cs6123-9799
      /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Random/3.3/RandomEnumerable.cs11130-12721
      /branches/HiveStatistics/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs12440-12877
      /branches/LogResidualEvaluator/HeuristicLab.Random/3.3/RandomEnumerable.cs10202-10483
      /branches/NET40/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs5138-5162
      /branches/NSGA-II Changes/HeuristicLab.Random/3.3/RandomEnumerable.cs12033-12122
      /branches/ParallelEngine/HeuristicLab.Random/3.3/RandomEnumerable.cs5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Random/3.3/RandomEnumerable.cs7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Random/3.3/RandomEnumerable.cs6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Random/3.3/RandomEnumerable.cs6828
      /branches/RuntimeOptimizer/HeuristicLab.Random/3.3/RandomEnumerable.cs8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Random/3.3/RandomEnumerable.cs7787-8333
      /branches/SlaveShutdown/HeuristicLab.Random/3.3/RandomEnumerable.cs8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Random/3.3/RandomEnumerable.cs10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Random/3.3/RandomEnumerable.cs5370-5682
      /branches/Trunk/HeuristicLab.Random/3.3/RandomEnumerable.cs6829-6865
      /branches/UnloadJobs/HeuristicLab.Random/3.3/RandomEnumerable.cs9168-9215
      /branches/VNS/HeuristicLab.Random/3.3/RandomEnumerable.cs5594-5752
      /branches/crossvalidation-2434/HeuristicLab.Random/3.3/RandomEnumerable.cs12948-12950
      /branches/histogram/HeuristicLab.Random/3.3/RandomEnumerable.cs5959-6341
      /branches/symbreg-factors-2650/HeuristicLab.Random/3.3/RandomEnumerable.cs14232-14825
      /trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/HeuristicLab.Random/3.3/RandomEnumerable.cs14175
      /trunk/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs9493,​9496,​9498,​9504-9506,​9515-9517,​9520-9521,​9523,​9530-9531,​9534-9537,​9540,​9542-9544,​9552-9555,​9568-9569,​9587,​9590-9592,​9600,​9607-9608,​9610-9611,​9613,​9618,​9623-9624,​9626,​9647-9649,​9652,​9657-9660,​9664-9666,​9675,​9692,​9695,​9699,​9702,​9710,​9714,​9718-9720,​9740-9741,​9751-9752,​9755,​9762,​9764-9775,​9777-9778,​9782-9786,​9792,​9794-9795,​9803-9812,​9816-9822,​9824-9825,​9828,​9830,​9833,​9837-9841,​9845,​9848-9851,​9855,​9859-9860,​9863,​9865-9868,​9871,​9893-9897,​9900-9902,​9905-9907,​9910,​9915-9916,​9919-9921,​9928,​9930,​9934-9935,​9938-9941,​9944,​9946,​9949,​9955-9956,​9958-9959,​9964-9965,​9973-9975,​9978,​9980-9982,​9988-9989,​9991-9992,​9994-9995,​9997,​10000-10005,​10009-10010,​10015,​10130,​10149-10150,​10154,​10170-10171,​10173-10176,​10195-10196,​10212-10213,​10231,​10261,​10273,​10291-10292,​10295,​10298,​10323-10324,​10346,​10348,​10355,​10359-10360,​10362-10363,​10365-10366,​10368,​10375,​10378,​10391,​10401,​10406-10407,​10414,​10417-10418,​10428,​10432-10433,​10435,​10440,​10448,​10453,​10460,​10465-10466,​10469-10470,​10472,​10474-10477,​10480,​10484,​10486,​10488-10500,​10503-10504,​10506,​10510-10512,​10519-10523,​10526,​10531,​10540-10541,​10543,​10545,​10561-10566,​10575-10578,​10596-10597,​10599,​10601-10607,​10639,​10642-10643,​10646,​10651-10653,​10727,​10731,​10745,​10747,​10761,​10767,​10774,​10787-10791,​10793-10794,​10796,​10799-10800,​10826,​10857-10862,​10865,​10885,​10889,​10894-10896,​10924,​10926-10927,​10937,​10941,​10953,​10955-10956,​10958-10961,​10963,​10975,​10983-10986,​10988-10989,​10996,​11007-11008,​11012-11014,​11019,​11024-11027,​11031,​11034-11035,​11048,​11050-11052,​11056-11058,​11060,​11065-11067,​11071,​11074-11082,​11086-11088,​11091-11093,​11095-11097,​11099-11100,​11102,​11108,​11111-11117,​11123-11128,​11131,​11135,​11153,​11156,​11161,​11214,​11241,​11243,​11248-11251,​11256,​11263,​11274,​11280,​11282-11283,​11285-11287,​11290,​11292,​11294-11296,​11298,​11300,​11302,​11306,​11308-11309,​11313,​11315,​11317,​11324,​11326,​11330-11332,​11337-11348,​11352-11353,​11361-11362,​11364-11367,​11380-11382,​11384,​11389,​11391-11392,​11394,​11403-11404,​11410-11411,​11417-11420,​11422,​11426-11430,​11432,​11434-11437,​11439-11448,​11450,​11453,​11455-11457,​11464,​11466-11467,​11469-11472,​11474,​11477-11480,​11483,​11494-11498,​11504,​11514-11515,​11523-11525,​11532-11533,​11536,​11540-11542,​11544-11545,​11547-11549,​11555,​11557,​11581,​11592,​11596-11597,​11599-11600,​11605,​11608,​11610,​11615-11616,​11618,​11623,​11631,​11634,​11650-11652,​11657,​11675,​11679-11680,​11703-11706,​11715,​11717,​11721,​11723-11725,​11734-11736,​11756-11758,​11762-11764,​11766,​11771-11772,​11781-11782,​11784,​11787-11790,​11794,​11807-11811,​11815-11816,​11818-11819,​11822,​11825-11831,​11833-11837,​11839-11840,​11853-11854,​11856,​11877-11879,​11882,​11890,​11909,​11912-11918,​11921,​11930,​11933-11934,​11936,​11938-11939,​11942,​11945,​11948,​11950-11951,​11955-11956,​11958-11961,​11963,​11967,​11970-11971,​11978,​11982-11984,​11987-11994,​11996,​11998-12004,​12015-12744,​12755,​12770,​12772,​12787,​12790-12798,​12801,​12807,​12810-12812,​12816-12819,​12835-12837,​12839,​12844-12846,​12851,​12855,​12868,​12873,​12875,​12878-12879,​12883,​12885-12886,​12889,​12894-12907,​12911-12918,​12920-12921,​12925-12927,​12932,​12934,​12936-12938,​12940,​12946-12948,​12953-12954,​12959-12961,​12971-12973,​12975-12978,​12981-12983,​12986-12987,​13000-13005,​13008,​13014,​13016,​13024-13027,​13030,​13033-13034,​13036,​13038-13040,​13051,​13054-13060,​13064-13066,​13078,​13080,​13087,​13093-13094,​13100-13104,​13109,​13116,​13118-13121,​13131,​13133,​13136-13143,​13154,​13157-13160,​13162-13165,​13167-13169,​13173,​13180-13181,​13183,​13186,​13198,​13200-13201,​13203-13205,​13209-13210,​13212,​13214,​13217-13219,​13222-13228,​13230-13239,​13241-13245,​13247-13257,​13260-13261,​13266-13271,​13288,​13300,​13307-13309,​13311,​13313-13315,​13318,​13392-13393,​13395,​13402,​13406,​13411,​13413-13415,​13419-13420,​13425,​13427-13430,​13433-13434,​13438-13442,​13445-13447,​13450,​13458,​13471,​13473-13474,​13484,​13491,​13494,​13498-13504,​13507-13514,​13516-13517,​13525-13526,​13529,​13534-13535,​13539-13540,​13549-13550,​13552,​13560,​13566-13567,​13570-13573,​13579-13582,​13584-13586,​13592-13593,​13597,​13614,​13616,​13621,​13626-13629,​13635,​13644-13646,​13648,​13650-13655,​13657-13662,​13666,​13669-13671,​13675-13684,​13690-13693,​13695,​13697-13705,​13707-13709,​13711,​13715,​13721,​13724,​13746,​13760-13761,​13764-13766,​13779,​13784-13786,​13796,​13800-13802,​13807,​13813,​13826,​13838,​13863,​13869,​13889-13891,​13895,​13898-13901,​13916-13917,​13921-13922,​13925,​13932-13935,​13938-13939,​13941-13942,​13958,​13963-13964,​13975,​13978,​13983-13987,​13992-13993,​13998,​14000-14001,​14007-14008,​14011,​14014-14017,​14024-14026,​14032,​14034,​14036-14037,​14056-14057,​14071,​14082-14083,​14095-14096,​14098-14100,​14102-14103,​14107,​14109-14110,​14118-14122,​14124-14127,​14130-14132,​14135-14136,​14140,​14142,​14144,​14150,​14152,​14155-14160,​14162-14164,​14167-14169,​14174-14175,​14177-14179,​14181,​14189,​14191,​14196,​14198,​14200,​14202-14207,​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,​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,​14940,​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,​15287-15288,​15300-15302,​15312,​15325-15327,​15329,​15335-15336,​15339,​15357-15358,​15361,​15367-15368,​15370-15372,​15376,​15383,​15388,​15390,​15393,​15395-15398,​15400,​15402,​15408-15409,​15419,​15427,​15447-15448,​15452,​15461,​15464,​15478,​15480-15481,​15483,​15486,​15498-15499,​15502,​15505,​15513,​15517-15518,​15532,​15534,​15545,​15548,​15551,​15556,​15560,​15570,​15591,​15594,​15596,​15598,​15607,​15610-15611,​15621-15623,​15626,​15637-15638,​15645,​15665,​15667,​15672-15674
    r15584 r16580  
    202202        var cur = list.First;
    203203        double ball = cur.Value.Item2, sum = random.NextDouble() * total; // assert: sum < total. When there is only one item remaining: sum < ball
    204         while (ball < sum) {
     204        while (ball < sum && cur.Next != null) {
    205205          cur = cur.Next;
    206206          ball += cur.Value.Item2;
Note: See TracChangeset for help on using the changeset viewer.