diff --git a/examples/health-centre/coldstart-500000-s2.log b/examples/health-centre/coldstart-500000-s2.log index fe10da7..69be834 100644 --- a/examples/health-centre/coldstart-500000-s2.log +++ b/examples/health-centre/coldstart-500000-s2.log @@ -181,3 +181,7 @@ output : /home/bruno/src/homemaker-layout/examples/health-centre/coldstart [429600 evals] best 0.000769686 (fails 6) via level_fix noop [430320 evals] best 0.00078154 (fails 6) via core_divide noop [431440 evals] best 0.00078639 (fails 6) via level_compound_fix noop +[433680 evals] best 0.000793532 (fails 6) via crossover lrlrl<->rlrrl +[433760 evals] best 0.000793974 (fails 6) via level_delete noop +[435280 evals] best 0.000796904 (fails 6) via level_compound_fix noop +[439520 evals] best 0.000798566 (fails 6) via level_fix noop diff --git a/examples/programme-house/coldstart-500000-s2.dom b/examples/programme-house/coldstart-500000-s2.dom new file mode 100644 index 0000000..a272f96 --- /dev/null +++ b/examples/programme-house/coldstart-500000-s2.dom @@ -0,0 +1,148 @@ +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.5356815548737125 +- 0.5356815548737125 +height: 3.0 +elevation: 0.0 +wall_inner: 0.08 +wall_outer: 0.25 +l: + rotation: 1 + division: + - 0.48744474801155124 + - 0.48744474801155124 + l: + rotation: 3 + division: + - 0.5040666628633002 + - 0.5040666628633002 + l: + type: C + rotation: 0 + r: + type: C + rotation: 0 + r: + type: C + rotation: 1 +r: + rotation: 1 + division: + - 0.5430891656879034 + - 0.5430891656879034 + l: + rotation: 2 + division: + - 0.6357435711673266 + - 0.6357435711673266 + l: + type: l1 + rotation: 0 + r: + type: t3 + rotation: 0 + r: + type: b2 + rotation: 0 +above: + rotation: 0 + division: + - 0.422710624129746 + - 0.422710624129746 + height: 3.0 + l: + rotation: 0 + division: + - 0.8171577162760618 + - 0.8171577162760618 + l: + rotation: 1 + division: + - 0.5 + - 0.5 + l: + type: C + rotation: 0 + r: + type: t1 + rotation: 0 + r: + type: b1 + rotation: 0 + r: + rotation: 0 + division: + - 0.4016497398054913 + - 0.4016497398054913 + l: + type: O + rotation: 0 + r: + type: O + rotation: 0 + above: + rotation: 0 + division: + - 0.422710624129746 + - 0.422710624129746 + height: 3.0 + l: + rotation: 0 + division: + - 0.8171577162760618 + - 0.8171577162760618 + l: + rotation: 1 + division: + - 0.5 + - 0.5 + l: + type: C + rotation: 0 + r: + type: t2 + rotation: 0 + r: + rotation: 1 + division: + - 0.5002825736306157 + - 0.5002825736306157 + l: + type: O + rotation: 0 + r: + type: O + rotation: 0 + r: + rotation: 0 + division: + - 0.4016497398054913 + - 0.4016497398054913 + l: + type: O + rotation: 0 + r: + rotation: 1 + division: + - 0.5020331882778841 + - 0.5020331882778841 + l: + type: O + rotation: 0 + r: + type: O + rotation: 0 diff --git a/examples/programme-house/coldstart-500000-s2.log b/examples/programme-house/coldstart-500000-s2.log index 4a55592..b0a2d96 100644 --- a/examples/programme-house/coldstart-500000-s2.log +++ b/examples/programme-house/coldstart-500000-s2.log @@ -87,3 +87,82 @@ output : /home/bruno/src/homemaker-layout/examples/programme-house/coldsta --- finishing (homemaker-py-3l6): unfold + polish 250000 evals --- [finish] unfold: materialised 0 shared-leaf copies [ 200 evals] best 0.00226757 (fails 1) via seed + +--- collapse (homemaker-py-94g): finish-time cell→room relabel --- +[finish] collapse: 13 → 1 fails (applied) + +--- done --- +elapsed : 26218.8s +evals : 750040 across 9374 topologies +best : 0.00226757 (1 fails) via seed+collapse + +improvement history: + [ 80] 8.34088e-08 (share:construct/0) + [ 160] 3.25056e-07 (share:construct/1) + [ 480] 4.05065e-07 (share:construct/5) + [ 2320] 4.76094e-07 (share:core_divide noop) + [ 2640] 4.87216e-07 (share:core_divide noop) + [ 4800] 5.01285e-07 (share:swap 0/lr) + [ 5040] 1.05925e-06 (share:swap 0/ll) + [ 5200] 1.15811e-06 (share:place_missing noop) + [ 6080] 1.15978e-06 (share:place_missing noop) + [ 6480] 1.15987e-06 (share:place_missing noop) + [ 6720] 4.22518e-06 (share:level_retype 2/rl<->0/lll) + [ 7200] 7.78334e-06 (share:retype 0/rrr->t2) + [ 7360] 4.89625e-05 (share:level_retype 0/rl<->1/rr) + [ 8400] 3.13343e-05 (share:crossover llr<->lll) + [ 9120] 5.70453e-05 (share:core_undivide noop) + [ 11040] 7.50021e-05 (share:level_fix noop) + [ 11360] 2.80185e-05 (share:level_retype 0/llr<->2/lrl) + [ 11600] 3.37736e-05 (share:retype 1/lr->l1) + [ 12480] 0.000635808 (share:undivide 2/lr) + [ 13760] 0.0007325 (share:level_compound_fix noop) + [ 14800] 0.000782161 (share:crossover rrr<->rrr) + [ 15280] 0.000823097 (share:level_retype 2/rr<->0/rrl) + [ 15760] 0.000825665 (share:core_undivide noop) + [ 16480] 0.000826726 (share:level_fix noop) + [ 16800] 0.00082769 (share:crossover rl<->rl) + [ 16960] 0.000846272 (share:swap 0/ll) + [ 17040] 0.000862002 (share:crossover llr<->llr) + [ 19680] 0.000879214 (share:level_fix noop) + [ 21600] 0.00127147 (share:retype 2/rl->O) + [ 27280] 0.00127374 (share:crossover rrr<->rrr) + [ 29200] 0.00127915 (share:level_fix noop) + [ 38320] 0.00131908 (share:undivide 0/lr) + [ 39200] 0.00131972 (share:level_fix noop) + [ 49280] 0.00133897 (share:swap 0/ll) + [ 68720] 0.00136878 (share:rotate 0/rr) + [ 68880] 0.00144686 (share:undivide 0/lr) + [ 71840] 0.00151517 (share:level_fix noop) + [ 72000] 0.00153784 (share:crossover rl<->rl) + [ 72960] 0.00154496 (share:level_fix noop) + [ 80400] 0.00158092 (share:divide 2/rr) + [ 81040] 0.00162435 (share:level_retype 0/llr<->2/lll) + [ 84960] 0.00162755 (share:core_undivide noop) + [ 85440] 0.00165285 (share:level_fix noop) + [ 94640] 0.00165285 (share:undivide 0/lr) + [ 95920] 0.00166211 (share:swap 2/rr) + [103200] 0.00178978 (share:level_retype 1/rl<->0/rrl) + [103440] 0.00182512 (share:level_retype 0/rrr<->1/lr) + [103600] 0.00183656 (share:crossover rrr<->rrr) + [111120] 0.00184342 (share:level_fix noop) + [119680] 0.00200171 (share:rotate 0/ll) + [120320] 0.00201261 (share:core_undivide noop) + [121040] 0.00201391 (share:retype 0/rl->t1) + [122640] 0.00203552 (share:rotate 0/ll) + [122880] 0.00204467 (share:level_fix noop) + [152160] 0.00216646 (share:level_fix noop) + [154880] 0.00221636 (share:level_fix noop) + [174080] 0.00222694 (share:level_compound_fix noop) + [182480] 0.00222773 (share:retype 0/rlr->b2) + [184160] 0.00225027 (share:crossover l<->l) + [185120] 0.00225822 (share:level_fix noop) + [206640] 0.00225918 (share:crossover llr<->lll) + [208240] 0.00226116 (share:crossover r<->r) + [211760] 0.00226381 (share:level_retype 2/lll<->1/lll) + [224560] 0.00226381 (share:crossover l<->l) + [281520] 0.00226563 (share:divide 2/rr) + [346400] 0.00226631 (share:divide 1/rr) + [480000] 0.00226655 (share:divide 2/lr) + [500200] 0.00226757 (polish:seed) +written : /home/bruno/src/homemaker-layout/examples/programme-house/coldstart-500000-s2.dom diff --git a/experiments/results/coldstart_baseline.tsv b/experiments/results/coldstart_baseline.tsv index c85d6ea..5c4589a 100644 --- a/experiments/results/coldstart_baseline.tsv +++ b/experiments/results/coldstart_baseline.tsv @@ -8,3 +8,4 @@ maple-court 0 500000 54 18 36 5.52881e-18 224214.4 coldstart-500000-s0.dom health-centre 1 500000 9 5 4 0.000101292 124903.7 coldstart-500000-s1.dom maple-court 1 500000 73 17 56 4.61196e-25 207119.5 coldstart-500000-s1.dom harbor-house 2 500000 42 12 30 3.04107e-14 158582.9 coldstart-500000-s2.dom +programme-house 2 500000 1 0 1 0.00226757 26225.8 coldstart-500000-s2.dom