@mark1russell7/packing 0.2.8 → 0.2.10

package/build/index.js

@@ -1716,6 +1716,9 @@ function packSkyline(rects, outer, options = {}) {
 /**
 * This function packs rectangles with a skyline in a free space. Each cell has a free range: the skyline is its start,
 * and `limit` is its end. A cell with less room than the lowest rectangle left goes to its next free range.
+*
+* A rectangle that needs more cells than the outer rectangle has goes at the left edge. Its y is the first y where each
+* cell is free over its height. Then each cell starts after the rectangle, as in the plain skyline.
 */
 function packSkylineInSpace(rects, outer, order, space) {
 	const width = Math.floor(outer.size.x);
@@ -1751,9 +1754,27 @@ function packSkylineInSpace(rects, outer, order, space) {
 			x = 0;
 			y = 0;
 			for (let i = 0; i < width; i++) if (Number.isFinite(skyline[i]) && skyline[i] > y) y = skyline[i];
+			for (let moved = true; moved;) {
+				moved = false;
+				for (let i = 0; i < width; i++) {
+					if (!Number.isFinite(skyline[i])) continue;
+					const [s, e] = rangeOf(i, y);
+					const next = s > y ? s : e < y + rh ? rangeOf(i, e)[0] : y;
+					if (next > y && Number.isFinite(next)) {
+						y = next;
+						moved = true;
+					}
+				}
+			}
 			rect.position.set(x + ox, y + oy);
 			rect.wasPacked = true;
-			outer.size.y = Math.max(outer.size.y, y + rh);
+			const top = y + rh;
+			for (let i = 0; i < width; i++) {
+				if (!Number.isFinite(skyline[i])) continue;
+				if (top <= limit[i]) skyline[i] = top;
+				else [skyline[i], limit[i]] = rangeOf(i, top);
+			}
+			outer.size.y = Math.max(outer.size.y, top);
 			continue;
 		}
 		let found = findWindow(skyline, width, rw, limit, rh);
@@ -3645,8 +3666,8 @@ const PORTFOLIO_SETS = {
 				"hardRegret": 0,
 				"excessAreaRegret": .001,
 				"fillRegret": .02,
-				"wins": 838,
-				"winShare": .642,
+				"wins": 857,
+				"winShare": .657,
 				"msMean": 4.92
 			},
 			"2": {
@@ -3654,8 +3675,8 @@ const PORTFOLIO_SETS = {
 				"hardRegret": 0,
 				"excessAreaRegret": .001,
 				"fillRegret": .011,
-				"wins": 1033,
-				"winShare": .792,
+				"wins": 1052,
+				"winShare": .806,
 				"msMean": 9.582
 			},
 			"3": {
@@ -3663,8 +3684,8 @@ const PORTFOLIO_SETS = {
 				"hardRegret": 0,
 				"excessAreaRegret": 0,
 				"fillRegret": .006,
-				"wins": 1126,
-				"winShare": .863,
+				"wins": 1139,
+				"winShare": .873,
 				"msMean": 22.228
 			}
 		},
@@ -3694,8 +3715,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": .002,
 					"fillRegret": .015,
-					"wins": 140,
-					"winShare": .667,
+					"wins": 147,
+					"winShare": .7,
 					"msMean": 10.026
 				},
 				"2": {
@@ -3703,8 +3724,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .006,
-					"wins": 162,
-					"winShare": .771,
+					"wins": 170,
+					"winShare": .81,
 					"msMean": 35.829
 				},
 				"3": {
@@ -3712,8 +3733,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .003,
-					"wins": 184,
-					"winShare": .876,
+					"wins": 190,
+					"winShare": .905,
 					"msMean": 46.593
 				}
 			},
@@ -3790,8 +3811,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .024,
-					"wins": 138,
-					"winShare": .657,
+					"wins": 144,
+					"winShare": .686,
 					"msMean": 9.772
 				},
 				"2": {
@@ -3799,8 +3820,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .008,
-					"wins": 162,
-					"winShare": .771,
+					"wins": 166,
+					"winShare": .79,
 					"msMean": 34.101
 				},
 				"3": {
@@ -3808,8 +3829,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .005,
-					"wins": 184,
-					"winShare": .876,
+					"wins": 185,
+					"winShare": .881,
 					"msMean": 49.128
 				}
 			},
@@ -3838,8 +3859,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": .001,
 					"fillRegret": .016,
-					"wins": 131,
-					"winShare": .624,
+					"wins": 133,
+					"winShare": .633,
 					"msMean": 2.009
 				},
 				"2": {
@@ -3847,8 +3868,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": .001,
 					"fillRegret": .011,
-					"wins": 163,
-					"winShare": .776,
+					"wins": 165,
+					"winShare": .786,
 					"msMean": 8.29
 				},
 				"3": {
@@ -3856,8 +3877,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .005,
-					"wins": 183,
-					"winShare": .871,
+					"wins": 184,
+					"winShare": .876,
 					"msMean": 13.146
 				}
 			},
@@ -3886,8 +3907,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .03,
-					"wins": 130,
-					"winShare": .619,
+					"wins": 131,
+					"winShare": .624,
 					"msMean": 1.663
 				},
 				"2": {
@@ -3895,8 +3916,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .012,
-					"wins": 180,
-					"winShare": .857,
+					"wins": 181,
+					"winShare": .862,
 					"msMean": 7.39
 				},
 				"3": {
@@ -3904,8 +3925,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .004,
-					"wins": 193,
-					"winShare": .919,
+					"wins": 194,
+					"winShare": .924,
 					"msMean": 8.701
 				}
 			},
@@ -3934,8 +3955,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .019,
-					"wins": 165,
-					"winShare": .647,
+					"wins": 168,
+					"winShare": .659,
 					"msMean": .808
 				},
 				"2": {
@@ -3943,8 +3964,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .007,
-					"wins": 212,
-					"winShare": .831,
+					"wins": 217,
+					"winShare": .851,
 					"msMean": 2.807
 				},
 				"3": {
@@ -3952,8 +3973,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .003,
-					"wins": 225,
-					"winShare": .882,
+					"wins": 230,
+					"winShare": .902,
 					"msMean": 3.514
 				}
 			},
@@ -3984,8 +4005,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": .004,
 					"fillRegret": .073,
-					"wins": 10,
-					"winShare": .286,
+					"wins": 11,
+					"winShare": .314,
 					"msMean": .886
 				},
 				"2": {
@@ -3993,8 +4014,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .014,
-					"wins": 20,
-					"winShare": .571,
+					"wins": 21,
+					"winShare": .6,
 					"msMean": 1.82
 				},
 				"3": {
@@ -4032,15 +4053,15 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .025,
-					"wins": 14,
-					"winShare": .4,
+					"wins": 15,
+					"winShare": .429,
 					"msMean": 1.028
 				},
 				"2": {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .009,
+					"fillRegret": .01,
 					"wins": 28,
 					"winShare": .8,
 					"msMean": 1.317
@@ -4067,11 +4088,11 @@ const PORTFOLIO_SETS = {
 			"thin": false,
 			"sets": {
 				"1": ["maxrects-bl"],
-				"2": ["maxrects-bl", "maxrects-bssf"],
+				"2": ["maxrects-bl", "maxrects-cp"],
 				"3": [
 					"maxrects-bl",
-					"maxrects-bssf",
-					"maxrects-cp"
+					"maxrects-cp",
+					"maxrects-bssf"
 				]
 			},
 			"train": {
@@ -4088,10 +4109,10 @@ const PORTFOLIO_SETS = {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .004,
+					"fillRegret": .001,
 					"wins": 30,
 					"winShare": .857,
-					"msMean": 5.932
+					"msMean": 5.919
 				},
 				"3": {
 					"inputs": 35,
@@ -4105,7 +4126,7 @@ const PORTFOLIO_SETS = {
 			},
 			"prefixMedianMs": {
 				"1": 2.837,
-				"2": 5.774,
+				"2": 5.565,
 				"3": 8.149
 			},
 			"defaultMembers": 3
@@ -4158,11 +4179,11 @@ const PORTFOLIO_SETS = {
 			"inputs": 35,
 			"thin": false,
 			"sets": {
-				"1": ["maxrects-bssf"],
-				"2": ["maxrects-bssf", "maxrects-blsf"],
+				"1": ["maxrects-cp"],
+				"2": ["maxrects-cp", "maxrects-bssf"],
 				"3": [
+					"maxrects-cp",
 					"maxrects-bssf",
-					"maxrects-blsf",
 					"maxrects-bl"
 				]
 			},
@@ -4170,35 +4191,35 @@ const PORTFOLIO_SETS = {
 				"1": {
 					"inputs": 35,
 					"hardRegret": 0,
-					"excessAreaRegret": 0,
-					"fillRegret": .002,
+					"excessAreaRegret": .001,
+					"fillRegret": .003,
 					"wins": 33,
 					"winShare": .943,
-					"msMean": 6.063
+					"msMean": 6.057
 				},
 				"2": {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .002,
+					"fillRegret": .003,
 					"wins": 34,
 					"winShare": .971,
-					"msMean": 11.397
+					"msMean": 12.12
 				},
 				"3": {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": 0,
+					"fillRegret": .001,
 					"wins": 35,
 					"winShare": 1,
-					"msMean": 17.653
+					"msMean": 18.376
 				}
 			},
 			"prefixMedianMs": {
-				"1": 5.498,
-				"2": 9.771,
-				"3": 14.704
+				"1": 4.153,
+				"2": 9.576,
+				"3": 13.853
 			},
 			"defaultMembers": 3
 		},
@@ -4207,8 +4228,12 @@ const PORTFOLIO_SETS = {
 			"thin": false,
 			"sets": {
 				"1": ["maxrects-bl"],
-				"2": ["maxrects-bl", "shelf-best"],
-				"3": ["maxrects-bl", "shelf-best"]
+				"2": ["maxrects-bl", "shelf-first"],
+				"3": [
+					"maxrects-bl",
+					"shelf-first",
+					"shelf-best"
+				]
 			},
 			"train": {
 				"1": {
@@ -4216,8 +4241,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .001,
-					"wins": 31,
-					"winShare": .886,
+					"wins": 32,
+					"winShare": .914,
 					"msMean": 44.25
 				},
 				"2": {
@@ -4225,9 +4250,9 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": 0,
-					"wins": 35,
-					"winShare": 1,
-					"msMean": 56.133
+					"wins": 34,
+					"winShare": .971,
+					"msMean": 49.4
 				},
 				"3": {
 					"inputs": 35,
@@ -4236,13 +4261,13 @@ const PORTFOLIO_SETS = {
 					"fillRegret": 0,
 					"wins": 35,
 					"winShare": 1,
-					"msMean": 56.133
+					"msMean": 61.283
 				}
 			},
 			"prefixMedianMs": {
 				"1": 46.745,
-				"2": 58.961,
-				"3": 58.961
+				"2": 51.433,
+				"3": 63.649
 			},
 			"defaultMembers": 1
 		},
@@ -4251,11 +4276,11 @@ const PORTFOLIO_SETS = {
 			"thin": false,
 			"sets": {
 				"1": ["maxrects-cp"],
-				"2": ["maxrects-cp", "maxrects-baf"],
+				"2": ["maxrects-cp", "maxrects-bl"],
 				"3": [
 					"maxrects-cp",
-					"maxrects-baf",
-					"maxrects-bl"
+					"maxrects-bl",
+					"maxrects-baf"
 				]
 			},
 			"train": {
@@ -4271,11 +4296,11 @@ const PORTFOLIO_SETS = {
 				"2": {
 					"inputs": 35,
 					"hardRegret": 0,
-					"excessAreaRegret": .001,
-					"fillRegret": .143,
-					"wins": 7,
-					"winShare": .2,
-					"msMean": 1.46
+					"excessAreaRegret": .006,
+					"fillRegret": .017,
+					"wins": 24,
+					"winShare": .686,
+					"msMean": 1.301
 				},
 				"3": {
 					"inputs": 35,
@@ -4289,7 +4314,7 @@ const PORTFOLIO_SETS = {
 			},
 			"prefixMedianMs": {
 				"1": .513,
-				"2": 1.303,
+				"2": 1.225,
 				"3": 1.931
 			},
 			"defaultMembers": 3
@@ -4298,10 +4323,10 @@ const PORTFOLIO_SETS = {
 			"inputs": 35,
 			"thin": false,
 			"sets": {
-				"1": ["maxrects-bl"],
-				"2": ["maxrects-bl", "maxrects-cp"],
+				"1": ["skyline"],
+				"2": ["skyline", "maxrects-cp"],
 				"3": [
-					"maxrects-bl",
+					"skyline",
 					"maxrects-cp",
 					"maxrects-bssf"
 				]
@@ -4312,33 +4337,33 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .012,
-					"wins": 26,
-					"winShare": .743,
-					"msMean": .786
+					"wins": 27,
+					"winShare": .771,
+					"msMean": 1.868
 				},
 				"2": {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .005,
-					"wins": 30,
-					"winShare": .857,
-					"msMean": 1.482
+					"fillRegret": .006,
+					"wins": 31,
+					"winShare": .886,
+					"msMean": 2.564
 				},
 				"3": {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .002,
-					"wins": 32,
-					"winShare": .914,
-					"msMean": 2.348
+					"wins": 33,
+					"winShare": .943,
+					"msMean": 3.43
 				}
 			},
 			"prefixMedianMs": {
-				"1": .71,
-				"2": 1.316,
-				"3": 2.22
+				"1": 1.235,
+				"2": 2.194,
+				"3": 3.119
 			},
 			"defaultMembers": 3
 		},
@@ -4592,8 +4617,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": .003,
 					"fillRegret": .059,
-					"wins": 16,
-					"winShare": .457,
+					"wins": 17,
+					"winShare": .486,
 					"msMean": .362
 				},
 				"2": {
@@ -4601,8 +4626,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .021,
-					"wins": 25,
-					"winShare": .714,
+					"wins": 26,
+					"winShare": .743,
 					"msMean": 1.407
 				},
 				"3": {
@@ -4639,9 +4664,9 @@ const PORTFOLIO_SETS = {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": .001,
-					"fillRegret": .003,
-					"wins": 27,
-					"winShare": .771,
+					"fillRegret": .004,
+					"wins": 26,
+					"winShare": .743,
 					"msMean": 3.074
 				},
 				"2": {
@@ -4688,8 +4713,8 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .002,
-					"wins": 30,
-					"winShare": .857,
+					"wins": 33,
+					"winShare": .943,
 					"msMean": 5.351
 				},
 				"2": {
@@ -4723,11 +4748,11 @@ const PORTFOLIO_SETS = {
 			"thin": false,
 			"sets": {
 				"1": ["maxrects-bssf"],
-				"2": ["maxrects-bssf", "maxrects-baf"],
+				"2": ["maxrects-bssf", "maxrects-blsf"],
 				"3": [
 					"maxrects-bssf",
-					"maxrects-baf",
-					"maxrects-cp"
+					"maxrects-blsf",
+					"maxrects-bl"
 				]
 			},
 			"train": {
@@ -4735,9 +4760,9 @@ const PORTFOLIO_SETS = {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .003,
-					"wins": 30,
-					"winShare": .857,
+					"fillRegret": .002,
+					"wins": 33,
+					"winShare": .943,
 					"msMean": 5.533
 				},
 				"2": {
@@ -4745,24 +4770,24 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
 					"fillRegret": .002,
-					"wins": 32,
-					"winShare": .914,
-					"msMean": 11.173
+					"wins": 34,
+					"winShare": .971,
+					"msMean": 10.704
 				},
 				"3": {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .002,
-					"wins": 33,
-					"winShare": .943,
-					"msMean": 16.218
+					"fillRegret": 0,
+					"wins": 35,
+					"winShare": 1,
+					"msMean": 16.428
 				}
 			},
 			"prefixMedianMs": {
 				"1": 5.067,
-				"2": 9.708,
-				"3": 13.112
+				"2": 9.535,
+				"3": 13.728
 			},
 			"defaultMembers": 3
 		},
@@ -4893,7 +4918,7 @@ const PORTFOLIO_SETS = {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .006,
+					"fillRegret": .005,
 					"wins": 30,
 					"winShare": .857,
 					"msMean": 1.115
@@ -4932,7 +4957,7 @@ const PORTFOLIO_SETS = {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": .001,
-					"fillRegret": .002,
+					"fillRegret": .001,
 					"wins": 30,
 					"winShare": .857,
 					"msMean": 1.13
@@ -4959,10 +4984,10 @@ const PORTFOLIO_SETS = {
 			"thin": false,
 			"sets": {
 				"1": ["maxrects-bl"],
-				"2": ["maxrects-bl", "shelf-first"],
+				"2": ["maxrects-bl", "shelf"],
 				"3": [
 					"maxrects-bl",
-					"shelf-first",
+					"shelf",
 					"maxrects-bssf"
 				]
 			},
@@ -4983,7 +5008,7 @@ const PORTFOLIO_SETS = {
 					"fillRegret": .002,
 					"wins": 34,
 					"winShare": .971,
-					"msMean": 1.948
+					"msMean": 1.147
 				},
 				"3": {
 					"inputs": 35,
@@ -4992,13 +5017,13 @@ const PORTFOLIO_SETS = {
 					"fillRegret": 0,
 					"wins": 35,
 					"winShare": 1,
-					"msMean": 3.03
+					"msMean": 2.229
 				}
 			},
 			"prefixMedianMs": {
 				"1": .837,
-				"2": 1.942,
-				"3": 3.011
+				"2": 1.134,
+				"3": 2.261
 			},
 			"defaultMembers": 3
 		},
@@ -5195,26 +5220,26 @@ const PORTFOLIO_SETS = {
 				"3": [
 					"maxrects-bl",
 					"maxrects-cp",
-					"maxrects-bssf"
+					"maxrects-blsf"
 				]
 			},
 			"train": {
 				"1": {
 					"inputs": 35,
 					"hardRegret": 0,
-					"excessAreaRegret": .001,
+					"excessAreaRegret": .002,
 					"fillRegret": .002,
-					"wins": 28,
-					"winShare": .8,
+					"wins": 29,
+					"winShare": .829,
 					"msMean": .369
 				},
 				"2": {
 					"inputs": 35,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .001,
-					"wins": 32,
-					"winShare": .914,
+					"fillRegret": 0,
+					"wins": 33,
+					"winShare": .943,
 					"msMean": .785
 				},
 				"3": {
@@ -5224,13 +5249,13 @@ const PORTFOLIO_SETS = {
 					"fillRegret": 0,
 					"wins": 34,
 					"winShare": .971,
-					"msMean": 1.303
+					"msMean": 1.174
 				}
 			},
 			"prefixMedianMs": {
 				"1": .378,
 				"2": .809,
-				"3": 1.33
+				"3": 1.182
 			},
 			"defaultMembers": 3
 		},
@@ -5456,7 +5481,7 @@ const PORTFOLIO_SETS = {
 					"inputs": 40,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .016,
+					"fillRegret": .015,
 					"wins": 33,
 					"winShare": .825,
 					"msMean": .114
@@ -5483,11 +5508,11 @@ const PORTFOLIO_SETS = {
 			"thin": false,
 			"sets": {
 				"1": ["maxrects-bl"],
-				"2": ["maxrects-bl", "maxrects-cp"],
+				"2": ["maxrects-bl", "maxrects-bssf"],
 				"3": [
 					"maxrects-bl",
-					"maxrects-cp",
-					"maxrects-bssf"
+					"maxrects-bssf",
+					"maxrects-baf"
 				]
 			},
 			"train": {
@@ -5496,18 +5521,18 @@ const PORTFOLIO_SETS = {
 					"hardRegret": 0,
 					"excessAreaRegret": .002,
 					"fillRegret": .003,
-					"wins": 30,
-					"winShare": .667,
+					"wins": 32,
+					"winShare": .711,
 					"msMean": .097
 				},
 				"2": {
 					"inputs": 45,
 					"hardRegret": 0,
-					"excessAreaRegret": .001,
+					"excessAreaRegret": 0,
 					"fillRegret": .001,
-					"wins": 38,
-					"winShare": .844,
-					"msMean": .208
+					"wins": 39,
+					"winShare": .867,
+					"msMean": .24
 				},
 				"3": {
 					"inputs": 45,
@@ -5516,13 +5541,13 @@ const PORTFOLIO_SETS = {
 					"fillRegret": .001,
 					"wins": 42,
 					"winShare": .933,
-					"msMean": .351
+					"msMean": .368
 				}
 			},
 			"prefixMedianMs": {
 				"1": .083,
-				"2": .15,
-				"3": .349
+				"2": .217,
+				"3": .324
 			},
 			"defaultMembers": 3
 		},
@@ -5547,7 +5572,7 @@ const PORTFOLIO_SETS = {
 					"inputs": 40,
 					"hardRegret": 0,
 					"excessAreaRegret": 0,
-					"fillRegret": .006,
+					"fillRegret": .005,
 					"wins": 31,
 					"winShare": .775,
 					"msMean": .208
@@ -5590,8 +5615,8 @@ const PORTFOLIO_SETS = {
 				"1": {
 					"inputs": 35,
 					"hardRegret": 0,
-					"excessAreaRegret": 0,
-					"fillRegret": 0,
+					"excessAreaRegret": -.001,
+					"fillRegret": -.001,
 					"wins": 35,
 					"winShare": 1,
 					"msMean": .679
@@ -5599,8 +5624,8 @@ const PORTFOLIO_SETS = {
 				"2": {
 					"inputs": 35,
 					"hardRegret": 0,
-					"excessAreaRegret": 0,
-					"fillRegret": 0,
+					"excessAreaRegret": -.001,
+					"fillRegret": -.001,
 					"wins": 35,
 					"winShare": 1,
 					"msMean": .679
@@ -5608,8 +5633,8 @@ const PORTFOLIO_SETS = {
 				"3": {
 					"inputs": 35,
 					"hardRegret": 0,
-					"excessAreaRegret": 0,
-					"fillRegret": 0,
+					"excessAreaRegret": -.001,
+					"fillRegret": -.001,
 					"wins": 35,
 					"winShare": 1,
 					"msMean": .679