From e8aa541fc97be13fd2e42f01794e3e9f570f48d8 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Wed, 12 Oct 2022 12:17:38 +1100 Subject: [PATCH] Fix review comments --- packages/squiggle-lang/scripts/lib.mjs | 21 +++---------------- .../squiggle-lang/scripts/run-project.mjs | 4 ++-- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/packages/squiggle-lang/scripts/lib.mjs b/packages/squiggle-lang/scripts/lib.mjs index dbb83956..f34a052c 100644 --- a/packages/squiggle-lang/scripts/lib.mjs +++ b/packages/squiggle-lang/scripts/lib.mjs @@ -22,25 +22,10 @@ export const run = (src, { output, sampleCount } = {}) => { }); } project.setSource("main", src); - const time = measure(() => project.run("main")); - - const bindings = project.getBindings("main"); - const result = project.getResult("main"); - - if (output) { - console.log("Result:", result.tag, result.value.toString()); - console.log("Bindings:", bindings.toString()); - } - - console.log( - "Time:", - String(time), - result.tag === "Error" ? red(result.tag) : green(result.tag), - result.tag === "Error" ? result.value.toStringWithFrameStack() : "" - ); + runProject(project, output); }; -export const runProject = (project, output) => { +export const runProject = (project, { output }) => { const time = measure(() => project.runAll()); console.log("Time: ", time); @@ -48,7 +33,7 @@ export const runProject = (project, output) => { ids.forEach((id) => { const result = project.getResult(id); - const bindings = project.getBindings("main"); + const bindings = project.getBindings(id); console.log(id + ":"); if (output) { diff --git a/packages/squiggle-lang/scripts/run-project.mjs b/packages/squiggle-lang/scripts/run-project.mjs index b6f841ac..fb9629c0 100755 --- a/packages/squiggle-lang/scripts/run-project.mjs +++ b/packages/squiggle-lang/scripts/run-project.mjs @@ -13,7 +13,7 @@ program.arguments(""); const options = program.parse(process.argv); -const sampleCount = process.env.SAMPLE_COUNT ?? 10000; +const sampleCount = process.env.SAMPLE_COUNT; console.log(sampleCount); const src = fs.readFileSync(program.args[0], "utf-8"); @@ -25,4 +25,4 @@ const projectJson = JSON.parse(src); const project = SqProject.fromJson(projectJson); -runProject(project, options.output); +runProject(project, options);