Skip to content

Commit 82823c4

Browse files
committed
🐛 update composition related to arsenic, cadmium, and lead
1 parent bfbd23c commit 82823c4

File tree

7 files changed

+454
-447
lines changed

7 files changed

+454
-447
lines changed

compositions/build.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,16 @@ async function generateIndexCsv() {
179179
acc.set(r.before, arr);
180180
arr.push(r.code);
181181
}, new Map<string, string[]>());
182-
for (const file of Deno.readDirSync('assets'))
182+
for (const file of Deno.readDirSync('assets')) {
183+
if (!file.name.endsWith('.csv')) continue;
183184
await readAsset(path.join('assets', file.name));
185+
}
184186
nullToZero(dat);
185187
sumAll(dat);
186188
dat = orderAll(dat) as Dat;
187189
const ks = Object.keys(dat);
188-
let a = ks.map(k => `"${columns(k.replace(/_e$/, ''))[0].name}; ${k}"`).join() + '\n';
190+
// let a = ks.map(k => `"${columns(k.replace(/_e$/, ''))[0].name}; ${k}"`).join() + '\n';
191+
let a = ks.join() + '\n';
189192
for (let i=0; i<di; i++) {
190193
for (const k of ks) {
191194
const v = dat[k][i];

compositions/configs/sums.csv

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ phystr,camt+stgstr+stostrb
4545
phystr_e,camt_e+stgstr_e+stostrb_e
4646
mnrleq,na+mg+k+ca+p
4747
mnrleq_e,na_e+mg_e+k_e+ca_e+p_e
48-
mnrlet,cr+mo+mn+fe+co+ni+cu+zn+as+se
49-
mnrlet_e,cr_e+mo_e+mn_e+fe_e+co_e+ni_e+cu_e+zn_e+as_e+se_e
48+
mnrlet,cr+mo+mn+fe+co+ni+cu+zn+se
49+
mnrlet_e,cr_e+mo_e+mn_e+fe_e+co_e+ni_e+cu_e+zn_e+se_e
5050
mnrlpet,li
5151
mnrlpet_e,li_e
52-
mnrlnet,al+cd+pb
53-
mnrlnet_e,al_e+cd_e+pb_e
54-
mnrltx,hg
55-
mnrltx_e,hg_e
52+
mnrlnet,al
53+
mnrlnet_e,al_e
54+
mnrltx,as+cd+pb+hg
55+
mnrltx_e,as_e+cd_e+pb_e+hg_e
5656
carot,lycpn+cartg+carta+cartb
5757
carot_e,lycpn_e+cartg_e+carta_e+cartb_e
5858
xantp,lutn+zea+crypxb

compositions/index.csv

Lines changed: 436 additions & 436 deletions
Large diffs are not rendered by default.

compositionstats/build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,6 @@ async function main() {
9494
const data = keys.join(",") + "\n" + [min, max, avg].map(row => {
9595
return keys.map(k => typeof row[k] === "number"? `${round(row[k] as number)}` : `"${row[k]}"`);
9696
}).join("\n") + "\n";
97-
await Deno.writeTextFile(path.join(import.meta.dirname || "", "stats.csv"), data);
97+
await Deno.writeTextFile(path.join(import.meta.dirname || "", "index.csv"), data);
9898
}
9999
main();

compositionstats/index.csv

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nodef/ifct2017",
3-
"version": "1.3.8",
3+
"version": "1.3.11",
44
"license": "AGPL-3.0",
55
"exports": "./index.ts",
66
"publish": {

deno.lock

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)