nmr-processing 3.3.3 → 4.0.0
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/CHANGELOG.md +38 -0
- package/lib/assignment/get13CAssignments.d.ts +35 -0
- package/lib/assignment/get13CAssignments.js +54 -0
- package/lib/assignment/get13CAssignments.js.map +1 -0
- package/lib/assignment/get1HAssignments.d.ts +42 -0
- package/lib/assignment/get1HAssignments.js +55 -0
- package/lib/assignment/get1HAssignments.js.map +1 -0
- package/lib/assignment/utils/buildAssignments.d.ts +33 -0
- package/lib/assignment/utils/buildAssignments.js +93 -0
- package/lib/assignment/utils/buildAssignments.js.map +1 -0
- package/lib/assignment/utils/createMapPossibleAssignments.d.ts +15 -0
- package/lib/assignment/utils/createMapPossibleAssignments.js +51 -0
- package/lib/assignment/utils/createMapPossibleAssignments.js.map +1 -0
- package/lib/assignment/utils/exploreTreeRec.d.ts +22 -0
- package/lib/assignment/utils/exploreTreeRec.js +77 -0
- package/lib/assignment/utils/exploreTreeRec.js.map +1 -0
- package/lib/assignment/utils/generateID.d.ts +1 -0
- package/lib/assignment/utils/generateID.js +13 -0
- package/lib/assignment/utils/generateID.js.map +1 -0
- package/lib/assignment/utils/partialScore.d.ts +16 -0
- package/lib/assignment/utils/partialScore.js +91 -0
- package/lib/assignment/utils/partialScore.js.map +1 -0
- package/lib/index.d.ts +2 -5
- package/lib/index.js +2 -5
- package/lib/index.js.map +1 -1
- package/lib/peaks/peaksFilterImpurities.js +1 -1
- package/lib/peaks/peaksFilterImpurities.js.map +1 -1
- package/lib/peaks/peaksToRanges.js +11 -17
- package/lib/peaks/peaksToRanges.js.map +1 -1
- package/lib/peaks/util/determineRealTop.js +3 -2
- package/lib/peaks/util/determineRealTop.js.map +1 -1
- package/lib/peaks/util/jAnalyzer.js +33 -35
- package/lib/peaks/util/jAnalyzer.js.map +1 -1
- package/lib/ranges/rangesToXY.d.ts +2 -2
- package/lib/ranges/rangesToXY.js +10 -2
- package/lib/ranges/rangesToXY.js.map +1 -1
- package/lib/signals/signals2DToZ.d.ts +2 -2
- package/lib/signals/signalsToXY.d.ts +2 -2
- package/lib/signals/simulation/simulate1D.d.ts +4 -3
- package/lib/signals/simulation/simulate1D.js.map +1 -1
- package/lib/types/NMRPeak1D.d.ts +2 -9
- package/lib/types/NMRRange.d.ts +1 -0
- package/lib/types/NMRSignal1D.d.ts +3 -2
- package/lib/types/NMRSignal2D.d.ts +1 -0
- package/lib/types/NMRZone.d.ts +4 -3
- package/lib/xy/xyAutoPeaksPicking.d.ts +4 -60
- package/lib/xy/xyAutoPeaksPicking.js +3 -3
- package/lib/xy/xyAutoPeaksPicking.js.map +1 -1
- package/lib-esm/assignment/get13CAssignments.js +47 -0
- package/lib-esm/assignment/get13CAssignments.js.map +1 -0
- package/lib-esm/assignment/get1HAssignments.js +48 -0
- package/lib-esm/assignment/get1HAssignments.js.map +1 -0
- package/lib-esm/assignment/utils/buildAssignments.js +86 -0
- package/lib-esm/assignment/utils/buildAssignments.js.map +1 -0
- package/lib-esm/assignment/utils/createMapPossibleAssignments.js +47 -0
- package/lib-esm/assignment/utils/createMapPossibleAssignments.js.map +1 -0
- package/lib-esm/assignment/utils/exploreTreeRec.js +73 -0
- package/lib-esm/assignment/utils/exploreTreeRec.js.map +1 -0
- package/lib-esm/assignment/utils/generateID.js +10 -0
- package/lib-esm/assignment/utils/generateID.js.map +1 -0
- package/lib-esm/assignment/utils/partialScore.js +87 -0
- package/lib-esm/assignment/utils/partialScore.js.map +1 -0
- package/lib-esm/index.js +2 -5
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/peaks/peaksFilterImpurities.js +1 -1
- package/lib-esm/peaks/peaksFilterImpurities.js.map +1 -1
- package/lib-esm/peaks/peaksToRanges.js +11 -17
- package/lib-esm/peaks/peaksToRanges.js.map +1 -1
- package/lib-esm/peaks/util/determineRealTop.js +4 -3
- package/lib-esm/peaks/util/determineRealTop.js.map +1 -1
- package/lib-esm/peaks/util/jAnalyzer.js +33 -35
- package/lib-esm/peaks/util/jAnalyzer.js.map +1 -1
- package/lib-esm/ranges/rangesToXY.js +10 -2
- package/lib-esm/ranges/rangesToXY.js.map +1 -1
- package/lib-esm/signals/simulation/simulate1D.js.map +1 -1
- package/lib-esm/xy/xyAutoPeaksPicking.js +3 -3
- package/lib-esm/xy/xyAutoPeaksPicking.js.map +1 -1
- package/package.json +4 -4
- package/src/assignment/get13CAssignments.ts +100 -0
- package/src/assignment/get1HAssignments.ts +116 -0
- package/src/assignment/utils/buildAssignments.ts +155 -0
- package/src/assignment/utils/createMapPossibleAssignments.ts +76 -0
- package/src/assignment/utils/exploreTreeRec.ts +138 -0
- package/src/assignment/utils/generateID.ts +11 -0
- package/src/assignment/utils/partialScore.ts +128 -0
- package/src/index.ts +3 -6
- package/src/peaks/peaksFilterImpurities.ts +1 -1
- package/src/peaks/peaksToRanges.ts +12 -19
- package/src/peaks/util/determineRealTop.ts +4 -6
- package/src/peaks/util/jAnalyzer.ts +34 -36
- package/src/ranges/rangesToXY.ts +14 -7
- package/src/signals/signals2DToZ.ts +2 -2
- package/src/signals/signalsToXY.ts +2 -2
- package/src/signals/simulation/simulate1D.ts +4 -3
- package/src/types/NMRPeak1D.ts +3 -9
- package/src/types/NMRRange.ts +1 -0
- package/src/types/NMRSignal1D.ts +3 -3
- package/src/types/NMRSignal2D.ts +2 -0
- package/src/types/NMRZone.ts +4 -3
- package/src/types/ml-spectra-processing/index.d.ts +8 -8
- package/src/types/ml-tree-set/index.d.ts +18 -0
- package/src/types/openchemlib-utils/index..d.ts +2 -2
- package/src/xy/xyAutoPeaksPicking.ts +19 -58
- package/src/types/ml-gsd/index.d.ts +0 -164
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { partialScore } from './partialScore';
|
|
2
|
+
export function exploreTreeRec(props, currentIndex, partial, store) {
|
|
3
|
+
const { nSources, restrictionByCS, timeout, timeStart, maxSolutions, targets, predictions, lowerBoundScore, nbAllowedUnAssigned, possibleAssignmentMap, useIntegrationRestriction, diaIDPeerPossibleAssignment, } = props;
|
|
4
|
+
const currentDate = new Date();
|
|
5
|
+
if (currentDate.getTime() - timeStart > timeout) {
|
|
6
|
+
new Error('timeout expired');
|
|
7
|
+
return store;
|
|
8
|
+
}
|
|
9
|
+
const diaID = diaIDPeerPossibleAssignment[currentIndex];
|
|
10
|
+
const possibleAssignments = possibleAssignmentMap[diaID];
|
|
11
|
+
for (let targetID of possibleAssignments) {
|
|
12
|
+
partial[currentIndex] = targetID;
|
|
13
|
+
let score = partialScore(partial, {
|
|
14
|
+
useIntegrationRestriction,
|
|
15
|
+
diaIDPeerPossibleAssignment,
|
|
16
|
+
nbAllowedUnAssigned,
|
|
17
|
+
restrictionByCS,
|
|
18
|
+
predictions,
|
|
19
|
+
targets,
|
|
20
|
+
});
|
|
21
|
+
if (score === 0) {
|
|
22
|
+
if (targetID === '*') {
|
|
23
|
+
partial[currentIndex] = null;
|
|
24
|
+
}
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
if (currentIndex === nSources - 1 && score >= lowerBoundScore) {
|
|
28
|
+
addSolution(store, { predictions, partial, score, maxSolutions });
|
|
29
|
+
}
|
|
30
|
+
else if (currentIndex < nSources - 1) {
|
|
31
|
+
exploreTreeRec({
|
|
32
|
+
nSources,
|
|
33
|
+
restrictionByCS,
|
|
34
|
+
timeout,
|
|
35
|
+
timeStart,
|
|
36
|
+
maxSolutions,
|
|
37
|
+
targets,
|
|
38
|
+
predictions,
|
|
39
|
+
lowerBoundScore,
|
|
40
|
+
nbAllowedUnAssigned,
|
|
41
|
+
possibleAssignmentMap,
|
|
42
|
+
useIntegrationRestriction,
|
|
43
|
+
diaIDPeerPossibleAssignment,
|
|
44
|
+
}, currentIndex + 1, JSON.parse(JSON.stringify(partial)), store);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
function addSolution(store, props) {
|
|
49
|
+
let { score, maxSolutions, partial, predictions } = props;
|
|
50
|
+
score /= doubleAssignmentPenalty(partial, predictions);
|
|
51
|
+
store.nSolutions++;
|
|
52
|
+
let solution = {
|
|
53
|
+
assignment: JSON.parse(JSON.stringify(partial)),
|
|
54
|
+
score: score,
|
|
55
|
+
};
|
|
56
|
+
if (store.nSolutions >= maxSolutions) {
|
|
57
|
+
if (solution.score > store.solutions.last().score) {
|
|
58
|
+
store.solutions.pollLast();
|
|
59
|
+
store.solutions.add(solution);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
store.solutions.add(solution);
|
|
64
|
+
store.nSolutions++;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
function doubleAssignmentPenalty(partial, predictions) {
|
|
68
|
+
const nbSources = Object.keys(predictions).length;
|
|
69
|
+
let assignments = new Set(partial);
|
|
70
|
+
let nbDoubleAssignment = nbSources - assignments.size;
|
|
71
|
+
return nbDoubleAssignment > 0 ? 2 * nbDoubleAssignment : 1;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=exploreTreeRec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exploreTreeRec.js","sourceRoot":"","sources":["../../../src/assignment/utils/exploreTreeRec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
const BASE62 = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
|
2
|
+
const LENGTH = 8;
|
|
3
|
+
export default function generateID() {
|
|
4
|
+
let id = '';
|
|
5
|
+
for (let i = 0; i < LENGTH; i++) {
|
|
6
|
+
id += BASE62.charAt(Math.floor(Math.random() * 62));
|
|
7
|
+
}
|
|
8
|
+
return id;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=generateID.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateID.js","sourceRoot":"","sources":["../../../src/assignment/utils/generateID.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,gEAAgE,CAAC;AAEhF,MAAM,MAAM,GAAG,CAAC,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,UAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;KACrD;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
export function partialScore(partial, options) {
|
|
2
|
+
const { useIntegrationRestriction, diaIDPeerPossibleAssignment, nbAllowedUnAssigned, restrictionByCS, predictions, targets, } = options;
|
|
3
|
+
const { useChemicalShiftScore } = restrictionByCS;
|
|
4
|
+
let countStars = 0;
|
|
5
|
+
let totalPartial = partial.length;
|
|
6
|
+
let partialInverse = {};
|
|
7
|
+
let activeDomainOnPrediction = [];
|
|
8
|
+
for (let i = 0; i < partial.length; i++) {
|
|
9
|
+
const targetID = partial[i];
|
|
10
|
+
if (targetID && targetID !== '*') {
|
|
11
|
+
activeDomainOnPrediction.push(i);
|
|
12
|
+
if (!partialInverse[targetID]) {
|
|
13
|
+
partialInverse[targetID] = [];
|
|
14
|
+
}
|
|
15
|
+
partialInverse[targetID].push(diaIDPeerPossibleAssignment[i]);
|
|
16
|
+
}
|
|
17
|
+
if (targetID === '*')
|
|
18
|
+
countStars++;
|
|
19
|
+
}
|
|
20
|
+
if (countStars > nbAllowedUnAssigned)
|
|
21
|
+
return 0;
|
|
22
|
+
const activeDomainOnTarget = Object.keys(partialInverse);
|
|
23
|
+
if (activeDomainOnTarget.length === 0) {
|
|
24
|
+
return 0;
|
|
25
|
+
}
|
|
26
|
+
if (useIntegrationRestriction) {
|
|
27
|
+
for (let targetID of activeDomainOnTarget) {
|
|
28
|
+
let targetToSource = partialInverse[targetID];
|
|
29
|
+
let total = 0;
|
|
30
|
+
for (const diaID of targetToSource) {
|
|
31
|
+
const prediction = predictions[diaID];
|
|
32
|
+
total += prediction.allHydrogens;
|
|
33
|
+
}
|
|
34
|
+
const { integration } = targets[targetID];
|
|
35
|
+
if (total - integration >= 0.5) {
|
|
36
|
+
return 0;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
//chemical shift score
|
|
41
|
+
let chemicalShiftScore = useChemicalShiftScore
|
|
42
|
+
? chemicalShiftScoring(partial, options)
|
|
43
|
+
: 1;
|
|
44
|
+
const penaltyByStarts = countStars / totalPartial;
|
|
45
|
+
return chemicalShiftScore - penaltyByStarts;
|
|
46
|
+
}
|
|
47
|
+
function chemicalShiftScoring(partial, options) {
|
|
48
|
+
const { tolerance } = options.restrictionByCS;
|
|
49
|
+
const { diaIDPeerPossibleAssignment, predictions, targets } = options;
|
|
50
|
+
let chemicalShiftScore = 0;
|
|
51
|
+
let count = 0;
|
|
52
|
+
for (let index = 0; index < partial.length; index++) {
|
|
53
|
+
const targetID = partial[index];
|
|
54
|
+
if (targetID && targetID !== '*') {
|
|
55
|
+
count++;
|
|
56
|
+
let diaID = diaIDPeerPossibleAssignment[index];
|
|
57
|
+
let source = predictions[diaID];
|
|
58
|
+
let target = targets[targetID];
|
|
59
|
+
let error = tolerance;
|
|
60
|
+
if (source.error) {
|
|
61
|
+
error = Math.max(source.error, tolerance);
|
|
62
|
+
}
|
|
63
|
+
if (typeof source.delta === 'undefined') {
|
|
64
|
+
// Chemical shift is not a restriction
|
|
65
|
+
chemicalShiftScore += 1;
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
const delta = target.signals && target.signals.length > 0
|
|
69
|
+
? target.signals[0].delta
|
|
70
|
+
: (target.to + target.from) / 2;
|
|
71
|
+
let diff = Math.abs(source.delta - delta);
|
|
72
|
+
if (diff < error) {
|
|
73
|
+
chemicalShiftScore += 1;
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
diff = Math.abs(diff - error);
|
|
77
|
+
chemicalShiftScore += (-0.25 / error) * diff + 1;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
if (count > 0) {
|
|
83
|
+
chemicalShiftScore /= count;
|
|
84
|
+
}
|
|
85
|
+
return chemicalShiftScore;
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=partialScore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"partialScore.js","sourceRoot":"","sources":["../../../src/assignment/utils/partialScore.ts"],"names":[],"mappings":"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"}
|
package/lib-esm/index.js
CHANGED
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @typedef {Object} DataXY
|
|
3
|
-
* @property {Array<Number>} x Array of x values
|
|
4
|
-
* @property {Array<Number>} y Array of y values
|
|
5
|
-
*/
|
|
6
1
|
export * from './constants/gyromagneticRatio';
|
|
7
2
|
export * from './constants/impurities';
|
|
8
3
|
export * from './constants/couplingPatterns';
|
|
@@ -13,6 +8,8 @@ export * from './prediction/predictCOSY';
|
|
|
13
8
|
export * from './prediction/predictHSQC';
|
|
14
9
|
export * from './prediction/predictHMBC';
|
|
15
10
|
export * from './prediction/predictAll';
|
|
11
|
+
export * from './assignment/get1HAssignments';
|
|
12
|
+
export * from './assignment/get13CAssignments';
|
|
16
13
|
export * from './ranges/rangesToACS';
|
|
17
14
|
export * from './ranges/rangesToXY';
|
|
18
15
|
export * from './signals/signalsToRanges';
|
package/lib-esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAE9C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AAExC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAE/C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AAEvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAE5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AAEtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC"}
|
|
@@ -29,7 +29,7 @@ function checkImpurity(peakList, impurity, options) {
|
|
|
29
29
|
while (i--) {
|
|
30
30
|
j = peakList.length;
|
|
31
31
|
while (j--) {
|
|
32
|
-
tolerance = error + peakList[j].
|
|
32
|
+
tolerance = error + peakList[j].width;
|
|
33
33
|
difference = Math.abs(impurity[i].shift - peakList[j].x);
|
|
34
34
|
if (difference < tolerance) {
|
|
35
35
|
// && (impurity[i].multiplicity === '' || (impurity[i].multiplicity.indexOf(peakList[j].multiplicity)) { // some impurities has multiplicities like 'bs' but at presents it is unsupported
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peaksFilterImpurities.js","sourceRoot":"","sources":["../../src/peaks/peaksFilterImpurities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIrD,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AA2B1C;;GAEG;AAEH,MAAM,UAAU,qBAAqB,CACnC,QAAqB,EACrB,UAAwC,EAAE;IAE1C,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAEzD,IAAI,OAAO,EAAE;QACX,IAAI,OAAO,KAAK,UAAU;YAAE,OAAO,GAAG,MAAM,CAAC;QAC7C,IAAI,OAAO,KAAK,MAAM;YAAE,OAAO,GAAG,OAAO,CAAC;QAC1C,IAAI,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,IAAI,QAAQ,IAAI,OAAO,EAAE;YAC5B,IAAI,cAAc,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACjD,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE;gBACtC,KAAK;gBACL,MAAM;gBACN,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;SACJ;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CACpB,QAAqB,EACrB,QAA0B,EAC1B,OAA6B;IAE7B,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC;IAC7B,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,EAAE;QACV,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,EAAE;YACV,SAAS,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC
|
|
1
|
+
{"version":3,"file":"peaksFilterImpurities.js","sourceRoot":"","sources":["../../src/peaks/peaksFilterImpurities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIrD,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AA2B1C;;GAEG;AAEH,MAAM,UAAU,qBAAqB,CACnC,QAAqB,EACrB,UAAwC,EAAE;IAE1C,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAEzD,IAAI,OAAO,EAAE;QACX,IAAI,OAAO,KAAK,UAAU;YAAE,OAAO,GAAG,MAAM,CAAC;QAC7C,IAAI,OAAO,KAAK,MAAM;YAAE,OAAO,GAAG,OAAO,CAAC;QAC1C,IAAI,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,IAAI,QAAQ,IAAI,OAAO,EAAE;YAC5B,IAAI,cAAc,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACjD,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE;gBACtC,KAAK;gBACL,MAAM;gBACN,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;SACJ;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CACpB,QAAqB,EACrB,QAA0B,EAC1B,OAA6B;IAE7B,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC;IAC7B,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,EAAE;QACV,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,EAAE;YACV,SAAS,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACtC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,IAAI,UAAU,GAAG,SAAS,EAAE;gBAC1B,0LAA0L;gBAC1L,IAAI,MAAM,EAAE;oBACV,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACvB;qBAAM;oBACL,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;iBACzB;aACF;SACF;KACF;AACH,CAAC"}
|
|
@@ -17,22 +17,20 @@ const assignSignal = (peak, frequency, nucleus) => {
|
|
|
17
17
|
delta: NaN,
|
|
18
18
|
nbPeaks: 1,
|
|
19
19
|
kind: 'signal',
|
|
20
|
-
startX: peak.x - peak.
|
|
21
|
-
stopX: peak.x + peak.
|
|
20
|
+
startX: peak.x - peak.width,
|
|
21
|
+
stopX: peak.x + peak.width,
|
|
22
22
|
observe: frequency,
|
|
23
23
|
nucleus,
|
|
24
24
|
integralData: {
|
|
25
|
-
from: peak.x - peak.
|
|
26
|
-
to: peak.x + peak.
|
|
25
|
+
from: peak.x - peak.width * 3,
|
|
26
|
+
to: peak.x + peak.width * 3,
|
|
27
27
|
value: 0,
|
|
28
28
|
},
|
|
29
29
|
peaks: [
|
|
30
30
|
{
|
|
31
31
|
x: peak.x,
|
|
32
32
|
intensity: peak.y,
|
|
33
|
-
|
|
34
|
-
width: peak.shape.width,
|
|
35
|
-
},
|
|
33
|
+
width: peak.width,
|
|
36
34
|
},
|
|
37
35
|
],
|
|
38
36
|
};
|
|
@@ -81,9 +79,7 @@ export function peaksToRanges(data, peakList, options = {}) {
|
|
|
81
79
|
peaksO.push({
|
|
82
80
|
x: peakR.x,
|
|
83
81
|
y: peakR.intensity,
|
|
84
|
-
|
|
85
|
-
width: peakR.shape.width,
|
|
86
|
-
},
|
|
82
|
+
width: peakR.width,
|
|
87
83
|
});
|
|
88
84
|
signal.mask.splice(j, 1);
|
|
89
85
|
signal.mask2.splice(j, 1);
|
|
@@ -194,19 +190,17 @@ function detectSignals(data, peakList, options = {}) {
|
|
|
194
190
|
signals.push(signal1D);
|
|
195
191
|
}
|
|
196
192
|
else {
|
|
197
|
-
let tmp = peak.x + peak.
|
|
193
|
+
let tmp = peak.x + peak.width;
|
|
198
194
|
signal1D.stopX = Math.max(signal1D.stopX, tmp);
|
|
199
195
|
signal1D.startX = Math.min(signal1D.startX, tmp);
|
|
200
196
|
signal1D.nbPeaks++;
|
|
201
197
|
signal1D.peaks.push({
|
|
202
198
|
x: peak.x,
|
|
203
199
|
intensity: peak.y,
|
|
204
|
-
|
|
205
|
-
width: peak.shape.width,
|
|
206
|
-
},
|
|
200
|
+
width: peak.width,
|
|
207
201
|
});
|
|
208
|
-
signal1D.integralData.from = Math.min(signal1D.integralData.from, peak.x - peak.
|
|
209
|
-
signal1D.integralData.to = Math.max(signal1D.integralData.to, peak.x + peak.
|
|
202
|
+
signal1D.integralData.from = Math.min(signal1D.integralData.from, peak.x - peak.width * 3);
|
|
203
|
+
signal1D.integralData.to = Math.max(signal1D.integralData.to, peak.x + peak.width * 3);
|
|
210
204
|
if (peak.kind)
|
|
211
205
|
signal1D.kind = peak.kind;
|
|
212
206
|
}
|
|
@@ -250,6 +244,6 @@ function detectSignals(data, peakList, options = {}) {
|
|
|
250
244
|
* @private
|
|
251
245
|
*/
|
|
252
246
|
function computeArea(peak) {
|
|
253
|
-
return Math.abs(peak.intensity * peak.
|
|
247
|
+
return Math.abs(peak.intensity * peak.width * 1.57); // todo add an option with this value: 1.772453851
|
|
254
248
|
}
|
|
255
249
|
//# sourceMappingURL=peaksToRanges.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import LM from 'ml-levenberg-marquardt';
|
|
2
|
-
import {
|
|
3
|
-
const { fct: gaussian2DFct } = gaussian2D;
|
|
2
|
+
import { Gaussian2D } from 'ml-peak-shape-generator';
|
|
4
3
|
const direction8X = [-1, -1, -1, 0, 0, 1, 1, 1];
|
|
5
4
|
const direction8Y = [-1, 0, 1, -1, 1, -1, 0, 1];
|
|
6
5
|
const direction16X = [-2, -2, -2, -2, -2, -1, -1, 0, 0, 1, 1, 2, 2, 2, 2, 2];
|
|
@@ -106,6 +105,7 @@ function fitGaussian(data, options) {
|
|
|
106
105
|
};
|
|
107
106
|
}
|
|
108
107
|
function paramGaussian2D(intervalX, intervalY, nCols) {
|
|
108
|
+
const gaussian2D = new Gaussian2D();
|
|
109
109
|
return (p) => {
|
|
110
110
|
return (t) => {
|
|
111
111
|
let nL = p.length / 5;
|
|
@@ -113,9 +113,10 @@ function paramGaussian2D(intervalX, intervalY, nCols) {
|
|
|
113
113
|
let xIndex = t % nCols;
|
|
114
114
|
let yIndex = (t - xIndex) / nCols;
|
|
115
115
|
for (let i = 0; i < nL; i++) {
|
|
116
|
+
gaussian2D.fwhm = { x: p[i + 3 * nL], y: p[i + 4 * nL] };
|
|
116
117
|
result +=
|
|
117
118
|
p[i + 2 * nL] *
|
|
118
|
-
|
|
119
|
+
gaussian2D.fct((xIndex - p[i]) * intervalX, (yIndex - p[i + nL]) * intervalY);
|
|
119
120
|
}
|
|
120
121
|
return result;
|
|
121
122
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"determineRealTop.js","sourceRoot":"","sources":["../../../src/peaks/util/determineRealTop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIrD,MAAM,
|
|
1
|
+
{"version":3,"file":"determineRealTop.js","sourceRoot":"","sources":["../../../src/peaks/util/determineRealTop.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ export default {
|
|
|
42
42
|
signal.asymmetric = false;
|
|
43
43
|
let P1, n2, maxFlagged;
|
|
44
44
|
let k = 1;
|
|
45
|
-
let
|
|
45
|
+
let jCouplings = [];
|
|
46
46
|
// Loop over the possible number of coupling contributing to the multiplet
|
|
47
47
|
for (let n = 0; n < 9; n++) {
|
|
48
48
|
// 1.2 Normalize. It makes a deep copy of the peaks before to modify them.
|
|
@@ -76,17 +76,17 @@ export default {
|
|
|
76
76
|
numbering[i][j] = k++;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
|
|
79
|
+
jCouplings = []; // The array to store the detected j-coupling
|
|
80
80
|
// 2.2 Set j = 1; J1 = P2 - P1. Flag components 1 and 2 as accounted for.
|
|
81
81
|
let j = 1;
|
|
82
|
-
|
|
82
|
+
jCouplings.push(peaks[1].x - peaks[0].x);
|
|
83
83
|
P1 = peaks[0].x;
|
|
84
84
|
numbering[0].splice(0, 1); // Flagged
|
|
85
85
|
numbering[1].splice(0, 1); // Flagged
|
|
86
86
|
k = 1;
|
|
87
87
|
let nFlagged = 2;
|
|
88
88
|
maxFlagged = Math.pow(2, n) - 1;
|
|
89
|
-
while (
|
|
89
|
+
while (jCouplings.length < n && nFlagged < maxFlagged && k < peaks.length) {
|
|
90
90
|
counter += 1;
|
|
91
91
|
// 4.1. Increment j. Set k to the number of the first unflagged component.
|
|
92
92
|
j++;
|
|
@@ -95,7 +95,7 @@ export default {
|
|
|
95
95
|
}
|
|
96
96
|
if (k < peaks.length) {
|
|
97
97
|
// 4.2 Jj = Pk - P1.
|
|
98
|
-
|
|
98
|
+
jCouplings.push(peaks[k].x - peaks[0].x);
|
|
99
99
|
// Flag component k and, for each sum of the...
|
|
100
100
|
numbering[k].splice(0, 1); // Flageed
|
|
101
101
|
nFlagged++;
|
|
@@ -103,7 +103,7 @@ export default {
|
|
|
103
103
|
for (let u = 2; u <= j; u++) {
|
|
104
104
|
let jSum = 0;
|
|
105
105
|
for (let i = 0; i < u; i++) {
|
|
106
|
-
jSum +=
|
|
106
|
+
jSum += jCouplings[i];
|
|
107
107
|
}
|
|
108
108
|
for (let i = 1; i < numbering.length; i++) {
|
|
109
109
|
// Maybe 0.25 Hz is too much?
|
|
@@ -117,7 +117,7 @@ export default {
|
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
// Calculate the ideal patter by using the extracted j-couplings
|
|
120
|
-
let pattern = idealPattern(
|
|
120
|
+
let pattern = idealPattern(jCouplings);
|
|
121
121
|
// Compare the ideal pattern with the proposed intensities.
|
|
122
122
|
// All the intensities have to match to accept the multiplet
|
|
123
123
|
validPattern = true;
|
|
@@ -129,7 +129,7 @@ export default {
|
|
|
129
129
|
}
|
|
130
130
|
// If we found a valid pattern we should inform about the pattern.
|
|
131
131
|
if (validPattern) {
|
|
132
|
-
updateSignal(signal,
|
|
132
|
+
updateSignal(signal, jCouplings);
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
}
|
|
@@ -144,56 +144,56 @@ export default {
|
|
|
144
144
|
* @private
|
|
145
145
|
* update the signal
|
|
146
146
|
* @param {*} signal
|
|
147
|
-
* @param {*}
|
|
147
|
+
* @param {*} jCouplings
|
|
148
148
|
*/
|
|
149
|
-
function updateSignal(signal,
|
|
149
|
+
function updateSignal(signal, jCouplings) {
|
|
150
150
|
// Update the limits of the signal
|
|
151
151
|
let peaks = signal.peaksComp; // Always in Hz
|
|
152
152
|
let nbPeaks = peaks.length;
|
|
153
|
-
signal.startX = peaks[0].x / signal.observe - peaks[0].
|
|
153
|
+
signal.startX = peaks[0].x / signal.observe - peaks[0].width;
|
|
154
154
|
signal.stopX =
|
|
155
|
-
peaks[nbPeaks - 1].x / signal.observe + peaks[nbPeaks - 1].
|
|
155
|
+
peaks[nbPeaks - 1].x / signal.observe + peaks[nbPeaks - 1].width;
|
|
156
156
|
signal.integralData.from =
|
|
157
|
-
peaks[0].x / signal.observe - peaks[0].
|
|
157
|
+
peaks[0].x / signal.observe - peaks[0].width * 3;
|
|
158
158
|
signal.integralData.to =
|
|
159
|
-
peaks[nbPeaks - 1].x / signal.observe + peaks[nbPeaks - 1].
|
|
159
|
+
peaks[nbPeaks - 1].x / signal.observe + peaks[nbPeaks - 1].width * 3;
|
|
160
160
|
// Compile the pattern and format the constant couplings
|
|
161
161
|
signal.maskPattern = signal.mask2;
|
|
162
|
-
signal.multiplicity = abstractPattern(signal,
|
|
162
|
+
signal.multiplicity = abstractPattern(signal, jCouplings);
|
|
163
163
|
signal.pattern = signal.multiplicity; // Our library depends on this parameter, but it is old
|
|
164
164
|
}
|
|
165
165
|
/**
|
|
166
166
|
* Returns the multiplet in the compact format
|
|
167
167
|
* @param {object} signal
|
|
168
|
-
* @param {object}
|
|
168
|
+
* @param {object} jCouplings
|
|
169
169
|
* @return {String}
|
|
170
170
|
* @private
|
|
171
171
|
*/
|
|
172
|
-
function abstractPattern(signal,
|
|
172
|
+
function abstractPattern(signal, jCouplings) {
|
|
173
173
|
let tol = 0.05;
|
|
174
174
|
let pattern = '';
|
|
175
175
|
let cont = 1;
|
|
176
176
|
let newNmrJs = [];
|
|
177
|
-
if (
|
|
178
|
-
|
|
177
|
+
if (jCouplings && jCouplings.length > 0) {
|
|
178
|
+
jCouplings.sort((a, b) => {
|
|
179
179
|
return b - a;
|
|
180
180
|
});
|
|
181
|
-
for (let i = 0; i <
|
|
182
|
-
if (Math.abs(
|
|
181
|
+
for (let i = 0; i < jCouplings.length - 1; i++) {
|
|
182
|
+
if (Math.abs(jCouplings[i] - jCouplings[i + 1]) < tol) {
|
|
183
183
|
cont++;
|
|
184
184
|
}
|
|
185
185
|
else {
|
|
186
186
|
newNmrJs.push({
|
|
187
|
-
coupling: Math.abs(
|
|
187
|
+
coupling: Math.abs(jCouplings[i]),
|
|
188
188
|
multiplicity: patterns[cont],
|
|
189
189
|
});
|
|
190
190
|
pattern += patterns[cont];
|
|
191
191
|
cont = 1;
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
|
-
let index =
|
|
194
|
+
let index = jCouplings.length - 1;
|
|
195
195
|
newNmrJs.push({
|
|
196
|
-
coupling: Math.abs(
|
|
196
|
+
coupling: Math.abs(jCouplings[index]),
|
|
197
197
|
multiplicity: patterns[cont],
|
|
198
198
|
});
|
|
199
199
|
pattern += patterns[cont];
|
|
@@ -210,15 +210,15 @@ function abstractPattern(signal, Jc) {
|
|
|
210
210
|
/**
|
|
211
211
|
* This function creates an ideal pattern from the given J-couplings
|
|
212
212
|
* @private
|
|
213
|
-
* @param {Array}
|
|
213
|
+
* @param {Array} jCouplings
|
|
214
214
|
* @return {*[]}
|
|
215
215
|
* @private
|
|
216
216
|
*/
|
|
217
|
-
function idealPattern(
|
|
218
|
-
let hsum = Math.pow(2,
|
|
217
|
+
function idealPattern(jCouplings) {
|
|
218
|
+
let hsum = Math.pow(2, jCouplings.length);
|
|
219
219
|
let pattern = [{ x: 0, intensity: hsum }];
|
|
220
220
|
// To split the initial height
|
|
221
|
-
for (const jc of
|
|
221
|
+
for (const jc of jCouplings) {
|
|
222
222
|
for (let j = pattern.length - 1; j >= 0; j--) {
|
|
223
223
|
pattern.push({
|
|
224
224
|
x: pattern[j].x + jc / 2,
|
|
@@ -375,9 +375,7 @@ function symmetrize(signalInput, maxError, iteration, key) {
|
|
|
375
375
|
peaks[i] = {
|
|
376
376
|
x: peak[jAxis] * newSignal.observe,
|
|
377
377
|
intensity: peak[intensity],
|
|
378
|
-
|
|
379
|
-
width: peak.shape.width,
|
|
380
|
-
},
|
|
378
|
+
width: peak.width,
|
|
381
379
|
};
|
|
382
380
|
}
|
|
383
381
|
// Join the peaks that are closer than 0.25 Hz
|
|
@@ -389,7 +387,7 @@ function symmetrize(signalInput, maxError, iteration, key) {
|
|
|
389
387
|
peaks[i].intensity = peaks[i].intensity + peaks[i + 1].intensity;
|
|
390
388
|
peaks[i].x /= peaks[i].intensity;
|
|
391
389
|
peaks[i].intensity /= 2;
|
|
392
|
-
peaks[i].
|
|
390
|
+
peaks[i].width += peaks[i + 1].width;
|
|
393
391
|
peaks.splice(i + 1, 1);
|
|
394
392
|
}
|
|
395
393
|
}
|
|
@@ -437,9 +435,9 @@ function symmetrize(signalInput, maxError, iteration, key) {
|
|
|
437
435
|
let diffR = Math.abs(peaks[right].x - cs);
|
|
438
436
|
if (Math.abs(diffL - diffR) < maxError) {
|
|
439
437
|
avg = Math.min(peaks[left].intensity, peaks[right].intensity);
|
|
440
|
-
avgWidth = Math.min(peaks[left].
|
|
438
|
+
avgWidth = Math.min(peaks[left].width, peaks[right].width);
|
|
441
439
|
peaks[left].intensity = peaks[right].intensity = avg;
|
|
442
|
-
peaks[left].
|
|
440
|
+
peaks[left].width = peaks[right].width = avgWidth;
|
|
443
441
|
middle = [
|
|
444
442
|
middle[0] + (peaks[right].x + peaks[left].x) / 2,
|
|
445
443
|
middle[1] + 1,
|
|
@@ -616,6 +614,6 @@ function chemicalShift(peaks, mask = []) {
|
|
|
616
614
|
* @private
|
|
617
615
|
*/
|
|
618
616
|
function getArea(peak) {
|
|
619
|
-
return Math.abs(peak.intensity * peak.
|
|
617
|
+
return Math.abs(peak.intensity * peak.width * 1.57); // 1.772453851);
|
|
620
618
|
}
|
|
621
619
|
//# sourceMappingURL=jAnalyzer.js.map
|