AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak slice support selection / cull criteria

Browse source
This commit is contained in:
Stewart Allen 2020-04-24 19:22:43 -04:00
commit e984726ba9
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
js/kiri-driver-sla.js
View file

@ -211,14 +211,15 @@ let gs_kiri_sla = exports;
let mass_per_bear = (tot_mass / tot_bear) * (1 / process.slaSupportDensity); let mass_per_bear = (tot_mass / tot_bear) * (1 / process.slaSupportDensity);
console.log({tot_mass, tot_bear, ratio: tot_mass / tot_bear, mass_per_bear}); // console.log({tot_mass, tot_bear, ratio: tot_mass / tot_bear, mass_per_bear});
let first; let first;
ops.slice().map((s,i) => { ops.slice().map((s,i) => {
if (!first && s.bear) { if (!first && s.bear) {
s.ord_first = first = true; s.ord_first = first = true;
} }
s.ord_weight = ((ops.length - i) / ops.length) * 3; // 30x lowest to 1x highest
s.ord_weight = Math.pow(30,((ops.length - i) / ops.length));
return s; return s;
}).sort((a,b) => { }).sort((a,b) => {
if (a.ord_first) return -1; if (a.ord_first) return -1;
@ -232,9 +233,11 @@ let gs_kiri_sla = exports;
rem_bear = tot_bear; rem_bear = tot_bear;
// compute remaining mass, bearing surface, for each slice // compute remaining mass, bearing surface, for each slice
let run, runLast, runCount = 0, runList = [];
ops.forEach(slice => { ops.forEach(slice => {
slice.rem_mass = rem_mass; slice.rem_mass = rem_mass;
slice.rem_bear = rem_bear; slice.rem_bear = rem_bear;
// slice.can_bear = slice.mass * mass_per_bear;
slice.can_bear = slice.bear * mass_per_bear; slice.can_bear = slice.bear * mass_per_bear;
rem_mass -= slice.mass; rem_mass -= slice.mass;
rem_bear -= slice.bear; rem_bear -= slice.bear;
@ -252,24 +255,35 @@ let gs_kiri_sla = exports;
for (let i=0; i<ord.length; i++) { for (let i=0; i<ord.length; i++) {
let slice = ord[i], let slice = ord[i],
bearing = Math.min(slice.can_bear, slice.rem_mass); bearing = Math.min(slice.can_bear, slice.rem_mass);
// remove from slices below the amount of mass they have to bear // remove from slices below the amount of mass they have to bear
for (let j=slice.index - 1; j>ops[0].index; j--) { for (let j=slice.index - 1; j>ops[0].index; j--) {
slices[j].rem_mass -= bearing; slices[j].rem_mass -= bearing;
} }
// remove total mass left to bear // remove total mass left to bear
rem_mass -= bearing; rem_mass -= bearing;
slice.can_emit = true; slice.can_emit = true;
if (rem_mass <= 0) { if (rem_mass <= 0) {
console.log({break: i}); // console.log({break: i, of: ord.length});
break; break;
} }
} }
let seq = 0, seqLast = 0;
slices.forEach(slice => { slices.forEach(slice => {
if (slice.can_emit) { if (slice.can_emit) {
slice.supports = slice.bear_up.map(p => { if (seq === 0 || slice.index - seqLast > 5) {
return p.clone(true).setZ(slice.z); slice.supports = slice.bear_up.map(p => {
}); return p.clone(true).setZ(slice.z);
});
seq++;
} else if (seq > 5) {
seq = 0;
} else {
seq++;
}
seqLast = slice.index;
} }
}); });
} }
@ -475,19 +489,21 @@ let gs_kiri_sla = exports;
if (slice.solids.unioned) { if (slice.solids.unioned) {
slice.solids.unioned.forEach(poly => { slice.solids.unioned.forEach(poly => {
poly = poly.clone(true).move(widget.track.pos); poly = poly.clone(true);//.move(widget.track.pos);
outline.poly(poly, 0x010101, true); outline.poly(poly, 0x010101, true);
outline.solid(poly, 0x0099cc); outline.solid(poly, 0x0099cc);
}); });
} else if (slice.tops) { } else if (slice.tops) {
slice.tops.forEach(top => { slice.tops.forEach(top => {
outline.poly(top.poly, 0x010101, true, false); let poly = top.poly;//.clone(true).move(widget.track.pos);
outline.solid(top.poly, 0xfcba03); outline.poly(poly, 0x010101, true, false);
outline.solid(poly, 0xfcba03);
}); });
} }
if (slice.supports) if (slice.supports)
slice.supports.forEach(poly => { slice.supports.forEach(poly => {
//poly = poly.clone(true).move(widget.track.pos);
support.poly(poly, 0x010105, true, false); support.poly(poly, 0x010105, true, false);
support.solid(poly, 0xfcba03); support.solid(poly, 0xfcba03);
}); });