diff --git a/examples/health-centre/coldstart-500000-s1.log b/examples/health-centre/coldstart-500000-s1.log index 3785452..14871e6 100644 --- a/examples/health-centre/coldstart-500000-s1.log +++ b/examples/health-centre/coldstart-500000-s1.log @@ -116,3 +116,23 @@ output : /home/bruno/src/homemaker-layout/examples/health-centre/coldstart [124480 evals] best 9.33002e-05 (fails 7) via level_fix noop [144400 evals] best 0.000107422 (fails 7) via undivide 0/rlrr [148560 evals] best 0.000113564 (fails 7) via retype 0/lrlllrl->t10 +[150640 evals] best 0.000117071 (fails 7) via level_compound_fix noop +[151040 evals] best 0.000121829 (fails 7) via level_retype noop +[153040 evals] best 0.000124879 (fails 7) via level_retype noop +[157680 evals] best 0.000126775 (fails 7) via crossover lrlllrr<->llrll +[158800 evals] best 0.000240095 (fails 7) via undivide 0/rrll +[163680 evals] best 0.000499652 (fails 6) via level_retype noop +[164640 evals] best 0.000508459 (fails 6) via core_undivide noop +[165440 evals] best 0.00050947 (fails 6) via level_retype noop +[174400 evals] best 0.000510996 (fails 6) via core_undivide noop +[201200 evals] best 0.000521531 (fails 6) via rotate 0/rrrr +[202800 evals] best 0.000524554 (fails 6) via level_compound_fix noop +[216400 evals] best 0.000524554 (fails 6) via crossover rlllr<->rrll +[231680 evals] best 0.000581588 (fails 6) via crossover llrr<->rllr +[232800 evals] best 0.000631983 (fails 6) via crossover rllllr<->rllllr +[233600 evals] best 0.000663972 (fails 6) via rotate 0/rlllll +[234400 evals] best 0.000679543 (fails 6) via rotate 0/lr +[235120 evals] best 0.000680799 (fails 6) via level_compound_fix noop +[235280 evals] best 0.000704214 (fails 6) via level_fix noop +[235360 evals] best 0.00070883 (fails 6) via level_compound_fix noop +[235600 evals] best 0.000710322 (fails 6) via level_fix noop diff --git a/examples/maple-court/coldstart-500000-s1.log b/examples/maple-court/coldstart-500000-s1.log index 5b26e1b..23efc1d 100644 --- a/examples/maple-court/coldstart-500000-s1.log +++ b/examples/maple-court/coldstart-500000-s1.log @@ -129,3 +129,13 @@ output : /home/bruno/src/homemaker-layout/examples/maple-court/coldstart-5 [212000 evals] best 2.21402e-21 (fails 60) via core_undivide noop [215760 evals] best 2.21403e-21 (fails 60) via retype 2/llrrl->tt [215920 evals] best 2.21422e-21 (fails 60) via retype 0/rrlrll->gh1 +[225600 evals] best 2.21422e-21 (fails 60) via rotate 2/llrr +[227200 evals] best 2.21441e-21 (fails 60) via rotate 2/llrr +[230720 evals] best 2.21445e-21 (fails 60) via core_undivide noop +[234720 evals] best 2.21445e-21 (fails 60) via swap 0/rrll +[240240 evals] best 2.7509e-20 (fails 56) via level_fix ws1: lvl1/rllll → lvl0/rllll +[268800 evals] best 6.17587e-20 (fails 55) via swap 0/lr +[271440 evals] best 6.21537e-20 (fails 55) via rotate 2/llrr +[272480 evals] best 6.21597e-20 (fails 55) via swap 0/lrr +[275920 evals] best 6.23221e-20 (fails 55) via core_undivide noop +[279920 evals] best 6.23222e-20 (fails 55) via core_undivide noop diff --git a/examples/programme-house/coldstart-500000-s1.dom b/examples/programme-house/coldstart-500000-s1.dom new file mode 100644 index 0000000..4b44552 --- /dev/null +++ b/examples/programme-house/coldstart-500000-s1.dom @@ -0,0 +1,96 @@ +node: +- - 1.67100188077385 + - 11.9169190395339 +- - 8.72124918939699 + - 13.7119442286569 +- - 6.79637028658874 + - 21.3797854212389 +- - -0.42152047183069 + - 19.9368564494913 +perimeter: + a: private + b: null + c: null + d: null +rotation: 1 +division: +- 0.678520486748628 +- 0.678520486748628 +height: 3.0 +elevation: 0.0 +wall_inner: 0.08 +wall_outer: 0.25 +l: + rotation: 1 + division: + - 0.4857106780525208 + - 0.4857106780525208 + l: + rotation: 1 + division: + - 0.6020205699844519 + - 0.6020205699844519 + l: + type: C + rotation: 0 + r: + type: C + rotation: 0 + r: + type: l1 + rotation: 1 +r: + rotation: 1 + division: + - 0.30659045622347697 + - 0.30659045622347697 + l: + type: t3 + rotation: 0 + r: + type: b2 + rotation: 0 +above: + rotation: 0 + division: + - 0.5096611719837818 + - 0.5096611719837818 + height: 3.0 + l: + rotation: 0 + division: + - 0.810439317043183 + - 0.810439317043183 + l: + rotation: 1 + division: + - 0.5 + - 0.5 + l: + type: O + rotation: 0 + r: + type: C + rotation: 0 + r: + type: b1 + rotation: 0 + r: + rotation: 0 + division: + - 0.15762442509997923 + - 0.15762442509997923 + l: + type: t2 + rotation: 0 + r: + rotation: 1 + division: + - 0.4162714156244671 + - 0.4162714156244671 + l: + type: C + rotation: 0 + r: + type: t1 + rotation: 0 diff --git a/examples/programme-house/coldstart-500000-s1.log b/examples/programme-house/coldstart-500000-s1.log new file mode 100644 index 0000000..bf1d0e5 --- /dev/null +++ b/examples/programme-house/coldstart-500000-s1.log @@ -0,0 +1,122 @@ +seed : /home/bruno/src/homemaker-layout/examples/programme-house/init.dom +programme : programme-house +budget : 500000 +pop : 16 +child_budget : 80 +workers : 1 +rng seed : 1 +leaf sharing : True (factor=3) +superpose : False +multi_use : False +conn grade : False +use tiers : False +bridge circulation : False +ruin recreate : False +collapse in-search : True +shapecurve warmstart : False +shapecurve prune : False +output : /home/bruno/src/homemaker-layout/examples/programme-house/coldstart-500000-s1.dom +[ 80 evals] best 4.73547e-07 (fails 11) via construct/0 +[ 160 evals] best 9.37107e-07 (fails 9) via construct/1 +[ 2720 evals] best 2.72402e-05 (fails 7) via swap 0/ll +[ 2800 evals] best 1.02861e-05 (fails 6) via crossover llr<->llr +[ 3040 evals] best 1.08389e-05 (fails 6) via level_fix noop +[ 3600 evals] best 2.65188e-05 (fails 5) via undivide 0/ll +[ 3920 evals] best 2.68577e-05 (fails 5) via retype 1/rl->b2 +[ 6960 evals] best 2.71134e-05 (fails 5) via level_compound_fix noop +[ 8080 evals] best 0.000534598 (fails 3) via swap 0/rr +[ 9520 evals] best 0.000552787 (fails 3) via retype 1/rl->t3 +[ 11760 evals] best 0.000562919 (fails 3) via core_undivide noop +[ 18080 evals] best 0.000614306 (fails 3) via place_missing t2 -> ll +[ 18400 evals] best 0.000650367 (fails 3) via level_retype 1/lll<->0/rl +[ 22400 evals] best 0.00094194 (fails 3) via divide 1/rr +[ 23440 evals] best 0.000998712 (fails 3) via crossover llr<->llr +[ 23920 evals] best 0.00117838 (fails 3) via core_undivide noop +[ 24080 evals] best 0.00122788 (fails 3) via core_divide noop +[ 24720 evals] best 0.00123449 (fails 3) via place_missing noop +[ 26560 evals] best 0.00124116 (fails 3) via crossover l<->l +[ 26800 evals] best 0.00125494 (fails 3) via level_compound_fix noop +[ 27200 evals] best 0.000596296 (fails 2) via crossover llr<->rrr +[ 27520 evals] best 0.000664798 (fails 2) via retype 0/llr->C +[ 28160 evals] best 0.000764779 (fails 2) via level_retype 0/rr<->1/lr +[ 28240 evals] best 0.00077279 (fails 2) via core_divide noop +[ 29520 evals] best 0.000806654 (fails 2) via rotate 0/root +[ 29680 evals] best 0.000834624 (fails 2) via level_compound_fix noop +[ 30720 evals] best 0.000844674 (fails 2) via swap 0/r +[ 31120 evals] best 0.000845753 (fails 2) via core_divide noop +[ 32240 evals] best 0.00085792 (fails 2) via undivide 0/ll +[ 32560 evals] best 0.000858981 (fails 2) via place_missing noop +[ 38560 evals] best 0.000859059 (fails 2) via level_compound_fix noop +[176480 evals] best 0.00412056 (fails 1) via divide 1/ll +[178160 evals] best 0.00427693 (fails 1) via level_retype 1/lr<->0/rl +[184640 evals] best 0.00436811 (fails 1) via place_missing noop +[185280 evals] best 0.00439571 (fails 1) via level_fix noop +[185360 evals] best 0.00440821 (fails 1) via level_compound_fix noop +[212320 evals] best 0.00518807 (fails 1) via rotate 0/ll +[212960 evals] best 0.00526235 (fails 1) via crossover r<->r +[213040 evals] best 0.00526441 (fails 1) via place_missing noop +[214080 evals] best 0.00526462 (fails 1) via place_missing noop +[215600 evals] best 0.00526787 (fails 1) via swap 0/r +[217440 evals] best 0.00527131 (fails 1) via swap 0/ll +[279840 evals] best 0.00533313 (fails 1) via crossover lr<->lr +[280720 evals] best 0.00534008 (fails 1) via level_retype 0/rl<->1/lr + +--- finishing (homemaker-py-3l6): unfold + polish 250000 evals --- +[finish] unfold: materialised 0 shared-leaf copies +[ 200 evals] best 0.0053408 (fails 1) via seed + +--- collapse (homemaker-py-94g): finish-time cell→room relabel --- +[finish] collapse: 5 → 1 fails (applied) + +--- done --- +elapsed : 17963.6s +evals : 750040 across 9374 topologies +best : 0.0053408 (1 fails) via seed+collapse + +improvement history: + [ 80] 4.73547e-07 (share:construct/0) + [ 160] 9.37107e-07 (share:construct/1) + [ 2720] 2.72402e-05 (share:swap 0/ll) + [ 2800] 1.02861e-05 (share:crossover llr<->llr) + [ 3040] 1.08389e-05 (share:level_fix noop) + [ 3600] 2.65188e-05 (share:undivide 0/ll) + [ 3920] 2.68577e-05 (share:retype 1/rl->b2) + [ 6960] 2.71134e-05 (share:level_compound_fix noop) + [ 8080] 0.000534598 (share:swap 0/rr) + [ 9520] 0.000552787 (share:retype 1/rl->t3) + [ 11760] 0.000562919 (share:core_undivide noop) + [ 18080] 0.000614306 (share:place_missing t2 -> ll) + [ 18400] 0.000650367 (share:level_retype 1/lll<->0/rl) + [ 22400] 0.00094194 (share:divide 1/rr) + [ 23440] 0.000998712 (share:crossover llr<->llr) + [ 23920] 0.00117838 (share:core_undivide noop) + [ 24080] 0.00122788 (share:core_divide noop) + [ 24720] 0.00123449 (share:place_missing noop) + [ 26560] 0.00124116 (share:crossover l<->l) + [ 26800] 0.00125494 (share:level_compound_fix noop) + [ 27200] 0.000596296 (share:crossover llr<->rrr) + [ 27520] 0.000664798 (share:retype 0/llr->C) + [ 28160] 0.000764779 (share:level_retype 0/rr<->1/lr) + [ 28240] 0.00077279 (share:core_divide noop) + [ 29520] 0.000806654 (share:rotate 0/root) + [ 29680] 0.000834624 (share:level_compound_fix noop) + [ 30720] 0.000844674 (share:swap 0/r) + [ 31120] 0.000845753 (share:core_divide noop) + [ 32240] 0.00085792 (share:undivide 0/ll) + [ 32560] 0.000858981 (share:place_missing noop) + [ 38560] 0.000859059 (share:level_compound_fix noop) + [176480] 0.00412056 (share:divide 1/ll) + [178160] 0.00427693 (share:level_retype 1/lr<->0/rl) + [184640] 0.00436811 (share:place_missing noop) + [185280] 0.00439571 (share:level_fix noop) + [185360] 0.00440821 (share:level_compound_fix noop) + [212320] 0.00518807 (share:rotate 0/ll) + [212960] 0.00526235 (share:crossover r<->r) + [213040] 0.00526441 (share:place_missing noop) + [214080] 0.00526462 (share:place_missing noop) + [215600] 0.00526787 (share:swap 0/r) + [217440] 0.00527131 (share:swap 0/ll) + [279840] 0.00533313 (share:crossover lr<->lr) + [280720] 0.00534008 (share:level_retype 0/rl<->1/lr) + [500200] 0.0053408 (polish:seed) +written : /home/bruno/src/homemaker-layout/examples/programme-house/coldstart-500000-s1.dom diff --git a/experiments/results/coldstart_baseline.tsv b/experiments/results/coldstart_baseline.tsv index 33f58c4..dac8f6e 100644 --- a/experiments/results/coldstart_baseline.tsv +++ b/experiments/results/coldstart_baseline.tsv @@ -3,3 +3,4 @@ programme-house 0 500000 1 0 1 0.00587685 19400.4 coldstart-500000-s0.dom health-centre 0 500000 4 2 2 0.0011747 130593.0 coldstart-500000-s0.dom harbor-house 0 500000 33 8 25 1.68969e-11 160951.3 coldstart-500000-s0.dom harbor-house 1 500000 43 7 36 1.44523e-15 166958.6 coldstart-500000-s1.dom +programme-house 1 500000 1 1 0 0.0053408 17970.5 coldstart-500000-s1.dom