Skip to content

Commit e3b6e84

Browse files
committed
Fix bug where 1 layer too many was excluded from the aggregated stats
1 parent a967fc3 commit e3b6e84

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/App.svelte

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,18 +207,20 @@
207207
};
208208
}
209209
210-
function aggregateLayerStats(layers) {
211-
console.debug('aggregateLayerStats');
210+
function aggregateLayerStats(layers, skipFirstLayers, skipLastLayers) {
211+
console.time('aggregateLayerStats');
212212
213-
const time = layers.reduce((prev, cur) => prev + cur.totalT, 0);
214-
const extruded = layers.reduce((prev, cur) => prev + cur.totalE, 0);
215-
const volume = layers.reduce((prev, cur) => prev + cur.totalE*filamentCrossSection, 0);
213+
const filteredLayers = layers.slice(skipFirstLayers, layers.length - skipLastLayers );
214+
const time = filteredLayers.reduce((prev, cur) => prev + cur.totalT, 0);
215+
const extruded = filteredLayers.reduce((prev, cur) => prev + cur.totalE, 0);
216+
const volume = extruded * filamentCrossSection;
216217
217-
const minExtrusionSpeed = layers.reduce((prev, cur)=> Math.min(prev , cur.flow), Infinity );
218-
const maxExtrusionSpeed = layers.reduce((prev, cur)=> Math.max(prev , cur.flow), -Infinity );
218+
const minExtrusionSpeed = filteredLayers.reduce((prev, cur)=> Math.min(prev , cur.flow), Infinity );
219+
const maxExtrusionSpeed = filteredLayers.reduce((prev, cur)=> Math.max(prev , cur.flow), -Infinity );
219220
220221
const minFlow = minExtrusionSpeed * filamentCrossSection;
221222
const maxFlow = maxExtrusionSpeed * filamentCrossSection;
223+
console.timeEnd('aggregateLayerStats');
222224
return {
223225
time,
224226
extruded,

0 commit comments

Comments
 (0)