quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge artifacts

Browse Source
This commit is contained in:
Vyacheslav Matyukhin 2022-09-19 23:20:28 +04:00
parent b24cfbc328
commit 8e13caae84
No known key found for this signature in database
GPG Key ID: 3D2A774C5489F96C
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/squiggle-lang/scripts/README.md
View File

@ -1,8 +1,5 @@
Various scripts used for development, benchmarking and testing. Various scripts used for development, benchmarking and testing.
<<<<<<< HEAD
None of these are bundled in NPM package yet.
=======
None of these are bundled in the NPM package yet. None of these are bundled in the NPM package yet.
# run.mjs # run.mjs
@ -26,4 +23,3 @@ Time: 3.18 Ok
``` ```
To see the result and bindings, add the `-o` or `--output` flag. To see the result and bindings, add the `-o` or `--output` flag.
>>>>>>> develop

24
packages/squiggle-lang/scripts/run-file.mjs
View File

@ -14,20 +14,11 @@ const measure = (cb, times = 1) => {
return (t2 - t1) / 1000; return (t2 - t1) / 1000;
}; };
<<<<<<< HEAD
const red = (s) => `\x1b[31m${s}\x1b[0m`;
const green = (s) => `\x1b[32m${s}\x1b[0m`;
const program = new Command();
program.option("-t, --time");
=======
const red = (str) => `\x1b[31m${str}\x1b[0m`; const red = (str) => `\x1b[31m${str}\x1b[0m`;
const green = (str) => `\x1b[32m${str}\x1b[0m`; const green = (str) => `\x1b[32m${str}\x1b[0m`;
const program = new Command(); const program = new Command();
>>>>>>> develop
program.option("-o, --output"); program.option("-o, --output");
program.arguments("<string>"); program.arguments("<string>");
@ -48,11 +39,7 @@ if (!src) {
} }
project.setSource("main", src); project.setSource("main", src);
<<<<<<< HEAD
const t = measure(() => project.run("main"));
=======
const time = measure(() => project.run("main")); const time = measure(() => project.run("main"));
>>>>>>> develop
const bindings = project.getBindings("main"); const bindings = project.getBindings("main");
const result = project.getResult("main"); const result = project.getResult("main");
@ -62,20 +49,9 @@ if (options.output) {
console.log("Bindings:", bindings.toString()); console.log("Bindings:", bindings.toString());
} }
<<<<<<< HEAD
if (options.time) {
console.log(
"Time:",
String(t),
result.tag === "Error" ? red(result.tag) : green(result.tag),
result.tag === "Error" ? result.value.toString() : ""
);
}
=======
console.log( console.log(
"Time:", "Time:",
String(time), String(time),
result.tag === "Error" ? red(result.tag) : green(result.tag), result.tag === "Error" ? red(result.tag) : green(result.tag),
result.tag === "Error" ? result.value.toString() : "" result.tag === "Error" ? result.value.toString() : ""
); );
>>>>>>> develop