nmr-processing 7.4.2 → 7.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/assignment/getAssignments.d.ts +6 -8
- package/lib/assignment/getAssignments.js.map +1 -1
- package/lib/assignment/utils/getAssignment/buildAssignments.js +5 -0
- package/lib/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib/assignment/utils/getAssignment/checkIDs.js +5 -9
- package/lib/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib/assignment/utils/getAssignment/formatData.js +30 -3
- package/lib/assignment/utils/getAssignment/formatData.js.map +1 -1
- package/lib/assignment/utils/getAssignment/partialScore.js +1 -1
- package/lib/assignment/utils/getAssignment/partialScore.js.map +1 -1
- package/lib-esm/assignment/getAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js +5 -0
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/checkIDs.js +5 -9
- package/lib-esm/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/formatData.js +30 -3
- package/lib-esm/assignment/utils/getAssignment/formatData.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/partialScore.js +1 -1
- package/lib-esm/assignment/utils/getAssignment/partialScore.js.map +1 -1
- package/package.json +1 -1
- package/src/assignment/getAssignments.ts +7 -8
- package/src/assignment/utils/getAssignment/buildAssignments.ts +6 -0
- package/src/assignment/utils/getAssignment/checkIDs.ts +8 -8
- package/src/assignment/utils/getAssignment/formatData.ts +39 -3
- package/src/assignment/utils/getAssignment/partialScore.ts +2 -2
|
@@ -8,21 +8,19 @@ import { AtomTypes, RestrictionByCS } from './utils/getAssignment/buildAssignmen
|
|
|
8
8
|
export interface SpectraData1D {
|
|
9
9
|
id?: string;
|
|
10
10
|
ranges: NMRRange[];
|
|
11
|
-
info
|
|
11
|
+
info: any;
|
|
12
12
|
}
|
|
13
13
|
export interface SpectraData2D {
|
|
14
14
|
id?: string;
|
|
15
15
|
zones: NMRZone[];
|
|
16
|
-
|
|
16
|
+
/**
|
|
17
|
+
* object with information about the spectrum, it is mandatory at the moment
|
|
18
|
+
* to generate correlations.
|
|
19
|
+
*/
|
|
20
|
+
info: any;
|
|
17
21
|
}
|
|
18
22
|
export declare type SpectraData = SpectraData1D | SpectraData2D;
|
|
19
23
|
export interface GetAutoAssignmentInput {
|
|
20
|
-
/**
|
|
21
|
-
* It has the number of each atoms in the chemical structure. e.g. { C: 6, H: 6 }
|
|
22
|
-
*/
|
|
23
|
-
atoms?: {
|
|
24
|
-
[key: string]: number;
|
|
25
|
-
};
|
|
26
24
|
spectra: SpectraData[];
|
|
27
25
|
/**
|
|
28
26
|
* Instance of Molecule
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAssignments.js","sourceRoot":"","sources":["../../src/assignment/getAssignments.ts"],"names":[],"mappings":";;;;;;AACA,yDAAsE;AAQtE,6EAIgD;AAChD,6DAA0D;AAC1D,+FAA4F;AAC5F,oFAA4D;
|
|
1
|
+
{"version":3,"file":"getAssignments.js","sourceRoot":"","sources":["../../src/assignment/getAssignments.ts"],"names":[],"mappings":";;;;;;AACA,yDAAsE;AAQtE,6EAIgD;AAChD,6DAA0D;AAC1D,+FAA4F;AAC5F,oFAA4D;AA0ErD,KAAK,UAAU,cAAc,CAClC,KAA6B,EAC7B,UAAiC,EAAE;IAEnC,IAAI,EACF,eAAe,GAAG,EAAE,EACpB,UAAU,EACV,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,EACnB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,EACtB,WAAW,GAAG,EAAE,EAChB,WAAW,EAAE,kBAAkB,GAAG,EAAE,GACrC,GAAG,OAAO,CAAC;IAEZ,MAAM,EACJ,SAAS,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAC5B,qBAAqB,GAAG,KAAK,EAC7B,wBAAwB,GAAG,IAAI,GAChC,GAAG,eAAe,CAAC;IAEpB,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAEhC,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAEpE,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAChC,IAAA,qDAAiC,EAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAG,IAAA,mBAAQ,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAA,qDAAyB,EACzD,OAAO,EACP,kBAAkB,CACnB,CAAC;IAEF,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,qBAAW,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAElE,MAAM,SAAS,GAAG,MAAM,IAAA,mCAAgB,EAAC;QACvC,eAAe,EAAE;YACf,SAAS;YACT,qBAAqB;YACrB,wBAAwB;SACzB;QACD,OAAO;QACP,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,YAAY;QACZ,eAAe;QACf,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,iBAAiB;QACjB,WAAW;KACZ,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC;AAzDD,wCAyDC"}
|
|
@@ -59,10 +59,12 @@ async function buildAssignments(props) {
|
|
|
59
59
|
checkNMRSignal1D(joinedSignals);
|
|
60
60
|
if (!predictions[atomType])
|
|
61
61
|
predictions[atomType] = {};
|
|
62
|
+
let totalHydrogens = 0;
|
|
62
63
|
for (let prediction of joinedSignals) {
|
|
63
64
|
const diaID = prediction.diaIDs[0];
|
|
64
65
|
const index = prediction.atoms[0];
|
|
65
66
|
const allHydrogens = exports.getAllHydrogens[atomType](molecule, index);
|
|
67
|
+
totalHydrogens += prediction.nbAtoms * allHydrogens;
|
|
66
68
|
predictions[atomType][diaID] = {
|
|
67
69
|
...prediction,
|
|
68
70
|
diaIDIndex: index,
|
|
@@ -71,6 +73,9 @@ async function buildAssignments(props) {
|
|
|
71
73
|
pathLength: pathLengthMatrix[index],
|
|
72
74
|
};
|
|
73
75
|
}
|
|
76
|
+
for (let diaID in predictions[atomType]) {
|
|
77
|
+
predictions[atomType][diaID].allHydrogens *= 100 / totalHydrogens;
|
|
78
|
+
}
|
|
74
79
|
infoByAtomType[atomType] = {
|
|
75
80
|
nSources: joinedSignals.length,
|
|
76
81
|
currentIndex: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAssignments.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/buildAssignments.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAkC;AAGlC,yDAA0D;AAO1D,qEAAkE;AAClE,qEAAkE;AAKlE,+EAGuC;AACvC,+CAAgE;AAEhE,uDAAoD;AACpD,mDAAgD;AAEhD,MAAM,UAAU,GAAG,CAAC,CAAqB,EAAE,CAAqB,EAAE,EAAE;IAClE,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,6BAAa,EAAE,CAAC,EAAE,6BAAa,EAAE,CAAC;AA4CzD,SAAS,gBAAgB,CACvB,OAAsB;IAEtB,MAAM,IAAI,GAA0C;QAClD,SAAS;QACT,QAAQ;QACR,OAAO;KACR,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC;SACrE;KACF;AACH,CAAC;AAyBY,QAAA,eAAe,GAAG;IAC7B,CAAC,EAAE,CAAC,CAAW,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IACnD,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;CACX,CAAC;AAEK,KAAK,UAAU,gBAAgB,CAAC,KAA2B;IAChE,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,eAAe,EACf,OAAO,EACP,QAAQ,EACR,mBAAmB,GAAG,EAAE,EACxB,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,WAAW,EAAE,eAAe,GAAG,EAAE,EACjC,OAAO,GACR,GAAG,KAAK,CAAC;IAEV,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC/B,IAAI,eAAe,GAAG,QAAQ,CAAC;IAE/B,IAAI,KAAK,GAAqB;QAC5B,SAAS,EAAE,IAAI,qBAAO,CAAC,UAAU,CAAC;QAClC,UAAU,EAAE,CAAC;KACd,CAAC;IAEF,MAAM,gBAAgB,GAAG,IAAA,yCAAqB,EAAC,QAAQ,EAAE;QACvD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,IAAI,cAAc,GAAmB,EAAE,CAAC;IACxC,MAAM,WAAW,GAA0B,EAAE,CAAC;IAC9C,IAAI,qBAAqB,GAA2B,EAAE,CAAC;IACvD,IAAI,2BAA2B,GAAgC,EAAE,CAAC;IAElE,KAAK,MAAM,kBAAkB,IAAI,eAAe,EAAE;QAChD,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE;YACzC,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAI,EAAE,aAAa,EAAE,GAAG,gBAAgB;gBACtC,CAAC,CAAC,EAAE,aAAa,EAAE,gBAAgB,EAAE;gBACrC,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAEjD,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAEhC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;gBAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"buildAssignments.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/buildAssignments.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,17 +10,13 @@ function checkIDs(input = []) {
|
|
|
10
10
|
let inputClone = JSON.parse(JSON.stringify(input));
|
|
11
11
|
let spectra = [];
|
|
12
12
|
for (const spectraData of inputClone) {
|
|
13
|
+
if (!('info' in spectraData)) {
|
|
14
|
+
throw new Error('each spectrum should contain info properties with nucleus information');
|
|
15
|
+
}
|
|
13
16
|
const { info, id } = spectraData;
|
|
14
17
|
if ((0, isSpectraData1D_1.isSpectraData1D)(spectraData)) {
|
|
15
|
-
let
|
|
16
|
-
|
|
17
|
-
const { integration } = element;
|
|
18
|
-
for (let signal of element.signals || []) {
|
|
19
|
-
if (!signal.integration)
|
|
20
|
-
signal.integration = integration;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
spectra.push({ id, info, ranges: data });
|
|
18
|
+
let ranges = addIDs(spectraData.ranges);
|
|
19
|
+
spectra.push({ id, info, ranges });
|
|
24
20
|
}
|
|
25
21
|
else {
|
|
26
22
|
let data = addIDs(spectraData.zones);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkIDs.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/checkIDs.ts"],"names":[],"mappings":";;;;;;AAOA,+DAAuC;AAEvC,uDAAoD;AAEpD,SAAgB,QAAQ,CAAC,QAAuB,EAAE;IAChD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAkB,CAAC;IACpE,IAAI,OAAO,GAAyB,EAAE,CAAC;IACvC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,
|
|
1
|
+
{"version":3,"file":"checkIDs.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/checkIDs.ts"],"names":[],"mappings":";;;;;;AAOA,+DAAuC;AAEvC,uDAAoD;AAEpD,SAAgB,QAAQ,CAAC,QAAuB,EAAE;IAChD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAkB,CAAC;IACpE,IAAI,OAAO,GAAyB,EAAE,CAAC;IACvC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;SACH;QAED,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;QACjC,IAAI,IAAA,iCAAe,EAAC,WAAW,CAAC,EAAE;YAChC,IAAI,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAsB,CAAC;YAC7D,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;SACpC;aAAM;YACL,IAAI,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAqB,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SACzC;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AApBD,4BAoBC;AAED,SAAgB,MAAM,CACpB,IAA4B;IAE5B,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/D,KAAK,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3D;KACF;AACH,CAAC;AATD,wBASC;AAED,SAAgB,MAAM,CAAC,IAA4B;IACjD,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,GAAG,IAAA,oBAAU,GAAE,CAAC;QAC3C,KAAK,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,GAAG,IAAA,oBAAU,GAAE,CAAC;SAC1C;KACF;IACD,MAAM,CAAC,IAAI,CAAC,CAAC;IACb,OAAO,IAAI,CAAC;AACd,CAAC;AATD,wBASC"}
|
|
@@ -6,15 +6,42 @@ function formatData(input = []) {
|
|
|
6
6
|
let inputClone = JSON.parse(JSON.stringify(input));
|
|
7
7
|
let spectra = [];
|
|
8
8
|
for (const spectraData of inputClone) {
|
|
9
|
-
const { info } = spectraData;
|
|
9
|
+
const { id, info } = spectraData;
|
|
10
10
|
if ((0, isSpectraData1D_1.isSpectraData1D)(spectraData)) {
|
|
11
|
-
|
|
11
|
+
const ranges = rescaleIntegration({
|
|
12
|
+
id,
|
|
13
|
+
info,
|
|
14
|
+
ranges: spectraData.ranges,
|
|
15
|
+
});
|
|
16
|
+
spectra.push({ id, info, ranges: { values: ranges } });
|
|
12
17
|
}
|
|
13
18
|
else {
|
|
14
|
-
spectra.push({ info, zones: { values: spectraData.zones } });
|
|
19
|
+
spectra.push({ id, info, zones: { values: spectraData.zones } });
|
|
15
20
|
}
|
|
16
21
|
}
|
|
17
22
|
return spectra;
|
|
18
23
|
}
|
|
19
24
|
exports.formatData = formatData;
|
|
25
|
+
function rescaleIntegration(spectrum) {
|
|
26
|
+
if (spectrum.info.nucleus !== '1H')
|
|
27
|
+
return spectrum.ranges;
|
|
28
|
+
let totalIntegration = spectrum.ranges.reduce((total, range) => (range.integration ? total + range.integration : total), 0);
|
|
29
|
+
for (let range of spectrum.ranges) {
|
|
30
|
+
if (range.integration) {
|
|
31
|
+
range.integration *= 100 / totalIntegration;
|
|
32
|
+
if (range.signals) {
|
|
33
|
+
const totalSignalIntegration = range.signals.reduce((total, signal) => signal.integration ? total + signal.integration : total, 0);
|
|
34
|
+
for (let signal of range.signals) {
|
|
35
|
+
if (signal.integration) {
|
|
36
|
+
signal.integration *= range.integration / totalSignalIntegration;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
signal.integration = range.integration;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return spectrum.ranges;
|
|
46
|
+
}
|
|
20
47
|
//# sourceMappingURL=formatData.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatData.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/formatData.ts"],"names":[],"mappings":";;;AAQA,uDAAoD;AAapD,SAAgB,UAAU,CACxB,QAA8B,EAAE;IAEhC,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAyB,CAAC;IAC3E,IAAI,OAAO,GAA2B,EAAE,CAAC;IACzC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"formatData.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/formatData.ts"],"names":[],"mappings":";;;AAQA,uDAAoD;AAapD,SAAgB,UAAU,CACxB,QAA8B,EAAE;IAEhC,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAyB,CAAC;IAC3E,IAAI,OAAO,GAA2B,EAAE,CAAC;IACzC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QACjC,IAAI,IAAA,iCAAe,EAAC,WAAW,CAAC,EAAE;YAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC;gBAChC,EAAE;gBACF,IAAI;gBACJ,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;SACxD;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;SAClE;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAnBD,gCAmBC;AAED,SAAS,kBAAkB,CAAC,QAA8B;IACxD,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;IAE3D,IAAI,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAC3C,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,EACzE,CAAC,CACF,CAAC;IAEF,KAAK,IAAI,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE;QACjC,IAAI,KAAK,CAAC,WAAW,EAAE;YACrB,KAAK,CAAC,WAAW,IAAI,GAAG,GAAG,gBAAgB,CAAC;YAC5C,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,MAAM,sBAAsB,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CACjD,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAChB,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EACzD,CAAC,CACF,CAAC;gBACF,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;oBAChC,IAAI,MAAM,CAAC,WAAW,EAAE;wBACtB,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,GAAG,sBAAsB,CAAC;qBAClE;yBAAM;wBACL,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;qBACxC;iBACF;aACF;SACF;KACF;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC;AACzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partialScore.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/partialScore.ts"],"names":[],"mappings":";;;;;;AAAA,qDAAsD;AAatD,8GAAsF;AAmBtF,SAAgB,YAAY,CAAC,OAAgB,EAAE,KAA0B;IACvE,MAAM,EACJ,2BAA2B,EAC3B,eAAe,EACf,eAAe,EACf,WAAW,EACX,OAAO,EACP,YAAY,GACb,GAAG,KAAK,CAAC;IAEV,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,qBAAqB,EAAE,GAAG,eAAe,CAAC;IAC1E,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,cAAc,GAA4B,EAAE,CAAC;IACjD,IAAI,wBAAwB,GAAgC,EAAE,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAgB,CAAC;IACtD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,EAAE,mBAAmB,EAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC1D,MAAM,qBAAqB,GAAsB,EAAE,CAAC;QACpD,MAAM,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClD,cAAc,CAAC,QAAQ,CAAC,GAAG,qBAAqB,CAAC;QACjD,wBAAwB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACxC,YAAY,IAAI,iBAAiB,CAAC,MAAM,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACtC,IAAI,QAAQ,IAAI,QAAQ,KAAK,GAAG,EAAE;gBAChC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC3C,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE;oBACpC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;iBACtC;gBACD,qBAAqB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAClC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACzC,CAAC;aACH;YACD,IAAI,QAAQ,KAAK,GAAG;gBAAE,UAAU,EAAE,CAAC;SACpC;QAED,IAAI,UAAU,GAAG,mBAAmB;YAAE,OAAO,CAAC,CAAC;QAC/C,WAAW,IAAI,UAAU,CAAC;KAC3B;IAED,MAAM,oBAAoB,GAAsB,EAAE,CAAC;IACnD,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE;QACrC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;KACxE;IAED,MAAM,0BAA0B,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACvE,IACE,0BAA0B,CAAC,MAAM,CAC/B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAC5C,CAAC,CACF,KAAK,0BAA0B,CAAC,MAAM,EACvC;QACA,OAAO,CAAC,CAAC;KACV;IAED,MAAM,oBAAoB,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IACjE,wBAAwB;IACxB,MAAM,gBAAgB,GAIhB,EAAE,CAAC;IAET,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;QAC9B,IAAI,QAAQ,KAAK,GAAG,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACjE,gBAAgB,CAAC,IAAI,CACnB,GAAG,IAAA,4CAAkC,EACnC,oBAAoB,CAAC,QAAQ,CAAC,EAC9B,OAAO,CAAC,QAAQ,CAAC,EACjB,YAAY,CACb,CACF,CAAC;SACH;aAAM;YACL,KAAK,IAAI,QAAQ,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAE;gBACnD,gBAAgB,CAAC,IAAI,CAAC;oBACpB,QAAQ;oBACR,SAAS,EAAE,CAAC,QAAQ,CAAC;oBACrB,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,WAAW;iBAC7C,CAAC,CAAC;aACJ;SACF;KACF;
|
|
1
|
+
{"version":3,"file":"partialScore.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/partialScore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAssignments.js","sourceRoot":"","sources":["../../src/assignment/getAssignments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAQtE,OAAO,EAEL,gBAAgB,GAEjB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,WAAW,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"getAssignments.js","sourceRoot":"","sources":["../../src/assignment/getAssignments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAQtE,OAAO,EAEL,gBAAgB,GAEjB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,WAAW,MAAM,mCAAmC,CAAC;AA0E5D,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAA6B,EAC7B,UAAiC,EAAE;IAEnC,IAAI,EACF,eAAe,GAAG,EAAE,EACpB,UAAU,EACV,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,EACnB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,EACtB,WAAW,GAAG,EAAE,EAChB,WAAW,EAAE,kBAAkB,GAAG,EAAE,GACrC,GAAG,OAAO,CAAC;IAEZ,MAAM,EACJ,SAAS,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAC5B,qBAAqB,GAAG,KAAK,EAC7B,wBAAwB,GAAG,IAAI,GAChC,GAAG,eAAe,CAAC;IAEpB,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAEhC,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAEpE,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAChC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,yBAAyB,CACzD,OAAO,EACP,kBAAkB,CACnB,CAAC;IAEF,MAAM,EAAE,eAAe,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAElE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC;QACvC,eAAe,EAAE;YACf,SAAS;YACT,qBAAqB;YACrB,wBAAwB;SACzB;QACD,OAAO;QACP,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,YAAY;QACZ,eAAe;QACf,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,iBAAiB;QACjB,WAAW;KACZ,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -53,10 +53,12 @@ export async function buildAssignments(props) {
|
|
|
53
53
|
checkNMRSignal1D(joinedSignals);
|
|
54
54
|
if (!predictions[atomType])
|
|
55
55
|
predictions[atomType] = {};
|
|
56
|
+
let totalHydrogens = 0;
|
|
56
57
|
for (let prediction of joinedSignals) {
|
|
57
58
|
const diaID = prediction.diaIDs[0];
|
|
58
59
|
const index = prediction.atoms[0];
|
|
59
60
|
const allHydrogens = getAllHydrogens[atomType](molecule, index);
|
|
61
|
+
totalHydrogens += prediction.nbAtoms * allHydrogens;
|
|
60
62
|
predictions[atomType][diaID] = {
|
|
61
63
|
...prediction,
|
|
62
64
|
diaIDIndex: index,
|
|
@@ -65,6 +67,9 @@ export async function buildAssignments(props) {
|
|
|
65
67
|
pathLength: pathLengthMatrix[index],
|
|
66
68
|
};
|
|
67
69
|
}
|
|
70
|
+
for (let diaID in predictions[atomType]) {
|
|
71
|
+
predictions[atomType][diaID].allHydrogens *= 100 / totalHydrogens;
|
|
72
|
+
}
|
|
68
73
|
infoByAtomType[atomType] = {
|
|
69
74
|
nSources: joinedSignals.length,
|
|
70
75
|
currentIndex: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAssignments.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/buildAssignments.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"buildAssignments.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/buildAssignments.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,17 +4,13 @@ export function checkIDs(input = []) {
|
|
|
4
4
|
let inputClone = JSON.parse(JSON.stringify(input));
|
|
5
5
|
let spectra = [];
|
|
6
6
|
for (const spectraData of inputClone) {
|
|
7
|
+
if (!('info' in spectraData)) {
|
|
8
|
+
throw new Error('each spectrum should contain info properties with nucleus information');
|
|
9
|
+
}
|
|
7
10
|
const { info, id } = spectraData;
|
|
8
11
|
if (isSpectraData1D(spectraData)) {
|
|
9
|
-
let
|
|
10
|
-
|
|
11
|
-
const { integration } = element;
|
|
12
|
-
for (let signal of element.signals || []) {
|
|
13
|
-
if (!signal.integration)
|
|
14
|
-
signal.integration = integration;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
spectra.push({ id, info, ranges: data });
|
|
12
|
+
let ranges = addIDs(spectraData.ranges);
|
|
13
|
+
spectra.push({ id, info, ranges });
|
|
18
14
|
}
|
|
19
15
|
else {
|
|
20
16
|
let data = addIDs(spectraData.zones);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkIDs.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/checkIDs.ts"],"names":[],"mappings":"AAOA,OAAO,UAAU,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,UAAU,QAAQ,CAAC,QAAuB,EAAE;IAChD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAkB,CAAC;IACpE,IAAI,OAAO,GAAyB,EAAE,CAAC;IACvC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,
|
|
1
|
+
{"version":3,"file":"checkIDs.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/checkIDs.ts"],"names":[],"mappings":"AAOA,OAAO,UAAU,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,UAAU,QAAQ,CAAC,QAAuB,EAAE;IAChD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAkB,CAAC;IACpE,IAAI,OAAO,GAAyB,EAAE,CAAC;IACvC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;SACH;QAED,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;QACjC,IAAI,eAAe,CAAC,WAAW,CAAC,EAAE;YAChC,IAAI,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAsB,CAAC;YAC7D,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;SACpC;aAAM;YACL,IAAI,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAqB,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SACzC;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,MAAM,CACpB,IAA4B;IAE5B,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/D,KAAK,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3D;KACF;AACH,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,IAA4B;IACjD,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC;QAC3C,KAAK,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC;SAC1C;KACF;IACD,MAAM,CAAC,IAAI,CAAC,CAAC;IACb,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -3,14 +3,41 @@ export function formatData(input = []) {
|
|
|
3
3
|
let inputClone = JSON.parse(JSON.stringify(input));
|
|
4
4
|
let spectra = [];
|
|
5
5
|
for (const spectraData of inputClone) {
|
|
6
|
-
const { info } = spectraData;
|
|
6
|
+
const { id, info } = spectraData;
|
|
7
7
|
if (isSpectraData1D(spectraData)) {
|
|
8
|
-
|
|
8
|
+
const ranges = rescaleIntegration({
|
|
9
|
+
id,
|
|
10
|
+
info,
|
|
11
|
+
ranges: spectraData.ranges,
|
|
12
|
+
});
|
|
13
|
+
spectra.push({ id, info, ranges: { values: ranges } });
|
|
9
14
|
}
|
|
10
15
|
else {
|
|
11
|
-
spectra.push({ info, zones: { values: spectraData.zones } });
|
|
16
|
+
spectra.push({ id, info, zones: { values: spectraData.zones } });
|
|
12
17
|
}
|
|
13
18
|
}
|
|
14
19
|
return spectra;
|
|
15
20
|
}
|
|
21
|
+
function rescaleIntegration(spectrum) {
|
|
22
|
+
if (spectrum.info.nucleus !== '1H')
|
|
23
|
+
return spectrum.ranges;
|
|
24
|
+
let totalIntegration = spectrum.ranges.reduce((total, range) => (range.integration ? total + range.integration : total), 0);
|
|
25
|
+
for (let range of spectrum.ranges) {
|
|
26
|
+
if (range.integration) {
|
|
27
|
+
range.integration *= 100 / totalIntegration;
|
|
28
|
+
if (range.signals) {
|
|
29
|
+
const totalSignalIntegration = range.signals.reduce((total, signal) => signal.integration ? total + signal.integration : total, 0);
|
|
30
|
+
for (let signal of range.signals) {
|
|
31
|
+
if (signal.integration) {
|
|
32
|
+
signal.integration *= range.integration / totalSignalIntegration;
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
signal.integration = range.integration;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return spectrum.ranges;
|
|
42
|
+
}
|
|
16
43
|
//# sourceMappingURL=formatData.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatData.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/formatData.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAapD,MAAM,UAAU,UAAU,CACxB,QAA8B,EAAE;IAEhC,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAyB,CAAC;IAC3E,IAAI,OAAO,GAA2B,EAAE,CAAC;IACzC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"formatData.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/formatData.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAapD,MAAM,UAAU,UAAU,CACxB,QAA8B,EAAE;IAEhC,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAyB,CAAC;IAC3E,IAAI,OAAO,GAA2B,EAAE,CAAC;IACzC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QACjC,IAAI,eAAe,CAAC,WAAW,CAAC,EAAE;YAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC;gBAChC,EAAE;gBACF,IAAI;gBACJ,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;SACxD;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;SAClE;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CAAC,QAA8B;IACxD,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;IAE3D,IAAI,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAC3C,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,EACzE,CAAC,CACF,CAAC;IAEF,KAAK,IAAI,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE;QACjC,IAAI,KAAK,CAAC,WAAW,EAAE;YACrB,KAAK,CAAC,WAAW,IAAI,GAAG,GAAG,gBAAgB,CAAC;YAC5C,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,MAAM,sBAAsB,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CACjD,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAChB,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EACzD,CAAC,CACF,CAAC;gBACF,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;oBAChC,IAAI,MAAM,CAAC,WAAW,EAAE;wBACtB,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,GAAG,sBAAsB,CAAC;qBAClE;yBAAM;wBACL,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;qBACxC;iBACF;aACF;SACF;KACF;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC;AACzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partialScore.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/partialScore.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"partialScore.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/partialScore.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -19,23 +19,22 @@ import getWorkFlow from './utils/getAssignment/getWorkFlow';
|
|
|
19
19
|
export interface SpectraData1D {
|
|
20
20
|
id?: string;
|
|
21
21
|
ranges: NMRRange[];
|
|
22
|
-
info
|
|
22
|
+
info: any;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
export interface SpectraData2D {
|
|
26
26
|
id?: string;
|
|
27
27
|
zones: NMRZone[];
|
|
28
|
-
|
|
28
|
+
/**
|
|
29
|
+
* object with information about the spectrum, it is mandatory at the moment
|
|
30
|
+
* to generate correlations.
|
|
31
|
+
*/
|
|
32
|
+
info: any;
|
|
29
33
|
}
|
|
30
34
|
|
|
31
35
|
export type SpectraData = SpectraData1D | SpectraData2D;
|
|
32
36
|
|
|
33
37
|
export interface GetAutoAssignmentInput {
|
|
34
|
-
/**
|
|
35
|
-
* It has the number of each atoms in the chemical structure. e.g. { C: 6, H: 6 }
|
|
36
|
-
*/
|
|
37
|
-
atoms?: { [key: string]: number };
|
|
38
|
-
|
|
39
38
|
spectra: SpectraData[];
|
|
40
39
|
/**
|
|
41
40
|
* Instance of Molecule
|
|
@@ -119,11 +118,11 @@ export async function getAssignments(
|
|
|
119
118
|
addDiastereotopicMissingChirality(molecule);
|
|
120
119
|
|
|
121
120
|
const spectra = checkIDs(input.spectra);
|
|
122
|
-
|
|
123
121
|
const { targets, correlations } = getTargetsAndCorrelations(
|
|
124
122
|
spectra,
|
|
125
123
|
correlationOptions,
|
|
126
124
|
);
|
|
125
|
+
|
|
127
126
|
const { assignmentOrder } = getWorkFlow(correlations, justAssign);
|
|
128
127
|
|
|
129
128
|
const solutions = await buildAssignments({
|
|
@@ -159,10 +159,13 @@ export async function buildAssignments(props: BuildAssignmentInput) {
|
|
|
159
159
|
checkNMRSignal1D(joinedSignals);
|
|
160
160
|
|
|
161
161
|
if (!predictions[atomType]) predictions[atomType] = {};
|
|
162
|
+
|
|
163
|
+
let totalHydrogens = 0;
|
|
162
164
|
for (let prediction of joinedSignals) {
|
|
163
165
|
const diaID = prediction.diaIDs[0];
|
|
164
166
|
const index = prediction.atoms[0];
|
|
165
167
|
const allHydrogens = getAllHydrogens[atomType](molecule, index);
|
|
168
|
+
totalHydrogens += prediction.nbAtoms * allHydrogens;
|
|
166
169
|
predictions[atomType][diaID] = {
|
|
167
170
|
...prediction,
|
|
168
171
|
diaIDIndex: index,
|
|
@@ -171,6 +174,9 @@ export async function buildAssignments(props: BuildAssignmentInput) {
|
|
|
171
174
|
pathLength: pathLengthMatrix[index] as number[],
|
|
172
175
|
};
|
|
173
176
|
}
|
|
177
|
+
for (let diaID in predictions[atomType]) {
|
|
178
|
+
predictions[atomType][diaID].allHydrogens *= 100 / totalHydrogens;
|
|
179
|
+
}
|
|
174
180
|
infoByAtomType[atomType] = {
|
|
175
181
|
nSources: joinedSignals.length,
|
|
176
182
|
currentIndex: 0,
|
|
@@ -13,16 +13,16 @@ export function checkIDs(input: SpectraData[] = []): SpectraDataWithIds[] {
|
|
|
13
13
|
let inputClone = JSON.parse(JSON.stringify(input)) as SpectraData[];
|
|
14
14
|
let spectra: SpectraDataWithIds[] = [];
|
|
15
15
|
for (const spectraData of inputClone) {
|
|
16
|
+
if (!('info' in spectraData)) {
|
|
17
|
+
throw new Error(
|
|
18
|
+
'each spectrum should contain info properties with nucleus information',
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
|
|
16
22
|
const { info, id } = spectraData;
|
|
17
23
|
if (isSpectraData1D(spectraData)) {
|
|
18
|
-
let
|
|
19
|
-
|
|
20
|
-
const { integration } = element;
|
|
21
|
-
for (let signal of element.signals || []) {
|
|
22
|
-
if (!signal.integration) signal.integration = integration;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
spectra.push({ id, info, ranges: data });
|
|
24
|
+
let ranges = addIDs(spectraData.ranges) as NMRRangeWithIds[];
|
|
25
|
+
spectra.push({ id, info, ranges });
|
|
26
26
|
} else {
|
|
27
27
|
let data = addIDs(spectraData.zones) as NMRZoneWithIds[];
|
|
28
28
|
spectra.push({ id, info, zones: data });
|
|
@@ -25,12 +25,48 @@ export function formatData(
|
|
|
25
25
|
let inputClone = JSON.parse(JSON.stringify(input)) as SpectraDataWithIds[];
|
|
26
26
|
let spectra: SpectraDataFormatted[] = [];
|
|
27
27
|
for (const spectraData of inputClone) {
|
|
28
|
-
const { info } = spectraData;
|
|
28
|
+
const { id, info } = spectraData;
|
|
29
29
|
if (isSpectraData1D(spectraData)) {
|
|
30
|
-
|
|
30
|
+
const ranges = rescaleIntegration({
|
|
31
|
+
id,
|
|
32
|
+
info,
|
|
33
|
+
ranges: spectraData.ranges,
|
|
34
|
+
});
|
|
35
|
+
spectra.push({ id, info, ranges: { values: ranges } });
|
|
31
36
|
} else {
|
|
32
|
-
spectra.push({ info, zones: { values: spectraData.zones } });
|
|
37
|
+
spectra.push({ id, info, zones: { values: spectraData.zones } });
|
|
33
38
|
}
|
|
34
39
|
}
|
|
35
40
|
return spectra;
|
|
36
41
|
}
|
|
42
|
+
|
|
43
|
+
function rescaleIntegration(spectrum: SpectraData1DWithIds): NMRRangeWithIds[] {
|
|
44
|
+
if (spectrum.info.nucleus !== '1H') return spectrum.ranges;
|
|
45
|
+
|
|
46
|
+
let totalIntegration = spectrum.ranges.reduce(
|
|
47
|
+
(total, range) => (range.integration ? total + range.integration : total),
|
|
48
|
+
0,
|
|
49
|
+
);
|
|
50
|
+
|
|
51
|
+
for (let range of spectrum.ranges) {
|
|
52
|
+
if (range.integration) {
|
|
53
|
+
range.integration *= 100 / totalIntegration;
|
|
54
|
+
if (range.signals) {
|
|
55
|
+
const totalSignalIntegration = range.signals.reduce(
|
|
56
|
+
(total, signal) =>
|
|
57
|
+
signal.integration ? total + signal.integration : total,
|
|
58
|
+
0,
|
|
59
|
+
);
|
|
60
|
+
for (let signal of range.signals) {
|
|
61
|
+
if (signal.integration) {
|
|
62
|
+
signal.integration *= range.integration / totalSignalIntegration;
|
|
63
|
+
} else {
|
|
64
|
+
signal.integration = range.integration;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
return spectrum.ranges;
|
|
72
|
+
}
|
|
@@ -114,9 +114,9 @@ export function partialScore(partial: Partial, props: PartialScoreOptions) {
|
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
|
+
|
|
117
118
|
for (const group of targetByIntegral) {
|
|
118
119
|
const { integration, atomType } = group;
|
|
119
|
-
|
|
120
120
|
if (integration === undefined || isNaN(integration)) continue;
|
|
121
121
|
|
|
122
122
|
let total = 0;
|
|
@@ -128,7 +128,7 @@ export function partialScore(partial: Partial, props: PartialScoreOptions) {
|
|
|
128
128
|
if (atomType === atomOfPrediction) total += prediction.allHydrogens;
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
|
-
if (total - integration >=
|
|
131
|
+
if (total - integration >= 5) {
|
|
132
132
|
return 0;
|
|
133
133
|
}
|
|
134
134
|
}
|