nmr-processing 5.0.0 → 6.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/lib/assignment/get13CAssignments.js.map +1 -1
- package/lib/assignment/utils/buildAssignments.js.map +1 -1
- package/lib/assignment/utils/createMapPossibleAssignments.js.map +1 -1
- package/lib/constants/couplingValues.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/peaks/util/determineRealTop.d.ts +2 -2
- package/lib/peaks/util/determineRealTop.js.map +1 -1
- package/lib/peaks/util/jAnalyzer.js +4 -3
- package/lib/peaks/util/jAnalyzer.js.map +1 -1
- package/lib/peaks/util/peakOptimizer.d.ts +2 -2
- package/lib/peaks/util/peakOptimizer.js.map +1 -1
- package/lib/prediction/predictAll.js +1 -1
- package/lib/prediction/predictAll.js.map +1 -1
- package/lib/prediction/predictHSQC.js.map +1 -1
- package/lib/prediction/predictProton.js +1 -1
- package/lib/prediction/predictProton.js.map +1 -1
- package/lib/prediction/utils/getFilteredIDiaIDs.js.map +1 -1
- package/lib/prediction/utils/getNuclei.js +1 -1
- package/lib/prediction/utils/getNuclei.js.map +1 -1
- package/lib/prediction/utils/getPredictions.d.ts +2 -2
- package/lib/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib/signal/signalJoinCouplings.d.ts +1 -1
- package/lib/signal/signalJoinCouplings.js +3 -3
- package/lib/signal/signalJoinCouplings.js.map +1 -1
- package/lib/signals/signalsJoin.d.ts +1 -1
- package/lib/signals/signalsJoin.js +7 -7
- package/lib/signals/signalsJoin.js.map +1 -1
- package/lib/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib/types/NMRSignal2D.d.ts +6 -4
- package/lib/types/NMRZone.d.ts +3 -7
- package/lib/types/jcoupling.d.ts +1 -1
- package/lib/types/modules/nmr-parser.d.ts +11 -0
- package/lib/types/modules/nmr-parser.js +2 -0
- package/lib/types/modules/nmr-parser.js.map +1 -0
- package/lib/types/prediction1D.d.ts +2 -2
- package/lib/utilities/joinPatterns.js.map +1 -1
- package/lib/xy/xyAutoPeaksPicking.d.ts +2 -2
- package/lib/xyz/{xyzAutoPeaksPicking.d.ts → xyzAutoZonesPicking.d.ts} +2 -2
- package/lib/xyz/{xyzAutoPeaksPicking.js → xyzAutoZonesPicking.js} +38 -26
- package/lib/xyz/xyzAutoZonesPicking.js.map +1 -0
- package/lib/xyz/xyzJResAnalyzer.js.map +1 -1
- package/lib-esm/assignment/get13CAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/buildAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/createMapPossibleAssignments.js.map +1 -1
- package/lib-esm/constants/couplingValues.js.map +1 -1
- package/lib-esm/index.js +1 -1
- package/lib-esm/peaks/util/determineRealTop.js.map +1 -1
- package/lib-esm/peaks/util/jAnalyzer.js +4 -3
- package/lib-esm/peaks/util/jAnalyzer.js.map +1 -1
- package/lib-esm/peaks/util/peakOptimizer.js.map +1 -1
- package/lib-esm/prediction/predictAll.js +1 -1
- package/lib-esm/prediction/predictAll.js.map +1 -1
- package/lib-esm/prediction/predictHSQC.js.map +1 -1
- package/lib-esm/prediction/predictProton.js +1 -1
- package/lib-esm/prediction/predictProton.js.map +1 -1
- package/lib-esm/prediction/utils/getFilteredIDiaIDs.js.map +1 -1
- package/lib-esm/prediction/utils/getNuclei.js +1 -1
- package/lib-esm/prediction/utils/getNuclei.js.map +1 -1
- package/lib-esm/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib-esm/signal/signalJoinCouplings.js +3 -3
- package/lib-esm/signal/signalJoinCouplings.js.map +1 -1
- package/lib-esm/signals/signalsJoin.js +7 -7
- package/lib-esm/signals/signalsJoin.js.map +1 -1
- package/lib-esm/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib-esm/types/modules/nmr-parser.js +2 -0
- package/lib-esm/types/modules/nmr-parser.js.map +1 -0
- package/lib-esm/utilities/joinPatterns.js.map +1 -1
- package/lib-esm/xyz/{xyzAutoPeaksPicking.js → xyzAutoZonesPicking.js} +36 -24
- package/lib-esm/xyz/xyzAutoZonesPicking.js.map +1 -0
- package/lib-esm/xyz/xyzJResAnalyzer.js.map +1 -1
- package/package.json +19 -16
- package/src/assignment/get13CAssignments.ts +4 -1
- package/src/assignment/utils/buildAssignments.ts +1 -4
- package/src/assignment/utils/createMapPossibleAssignments.ts +4 -1
- package/src/constants/couplingValues.ts +1 -1
- package/src/index.ts +1 -1
- package/src/peaks/util/determineRealTop.ts +3 -4
- package/src/peaks/util/jAnalyzer.ts +7 -7
- package/src/peaks/util/peakOptimizer.ts +4 -3
- package/src/prediction/predictAll.ts +5 -5
- package/src/prediction/predictHSQC.ts +4 -1
- package/src/prediction/predictProton.ts +1 -1
- package/src/prediction/utils/getFilteredIDiaIDs.ts +1 -2
- package/src/prediction/utils/getNuclei.ts +3 -3
- package/src/prediction/utils/getPredictions.ts +3 -3
- package/src/prediction/utils/queryByHOSE.ts +1 -1
- package/src/signal/signalJoinCouplings.ts +3 -3
- package/src/signals/signalsJoin.ts +7 -7
- package/src/signals/signalsToXY.ts +1 -1
- package/src/signals/simulation/splitSpinSystem.ts +10 -2
- package/src/types/NMRSignal2D.ts +7 -5
- package/src/types/NMRZone.ts +6 -6
- package/src/types/dataStructure.ts +1 -1
- package/src/types/jcoupling.ts +1 -1
- package/src/types/ml-matrix-peaks-finder/index.d.ts +2 -2
- package/src/types/ml-simple-clustering/index.d.ts +1 -1
- package/src/types/ml-spectra-processing/index.d.ts +8 -2
- package/src/types/modules/nmr-parser.ts +17 -0
- package/src/types/openchemlib-utils/index..d.ts +17 -6
- package/src/types/prediction1D.ts +2 -2
- package/src/utilities/joinPatterns.ts +0 -1
- package/src/xy/xyAutoPeaksPicking.ts +6 -6
- package/src/xyz/{xyzAutoPeaksPicking.ts → xyzAutoZonesPicking.ts} +40 -26
- package/src/xyz/xyzJResAnalyzer.ts +4 -4
- package/CHANGELOG.md +0 -572
- package/lib/types/MPFPeak.d.ts +0 -9
- package/lib/types/MPFPeak.js +0 -3
- package/lib/types/MPFPeak.js.map +0 -1
- package/lib/xyz/xyzAutoPeaksPicking.js.map +0 -1
- package/lib-esm/types/MPFPeak.js +0 -2
- package/lib-esm/types/MPFPeak.js.map +0 -1
- package/lib-esm/xyz/xyzAutoPeaksPicking.js.map +0 -1
- package/src/types/MPFPeak.ts +0 -9
|
@@ -11,7 +11,7 @@ const takeCareDiaIDs = (a, b, tolerance) => localeCompareJcouplingKeys(a, b) ===
|
|
|
11
11
|
/**
|
|
12
12
|
* Join couplings smaller than a define tolerance.
|
|
13
13
|
* The resulting coupling should be an average of the existing one.
|
|
14
|
-
* If
|
|
14
|
+
* If pathLength is specified and is not always the same this property will be removed.
|
|
15
15
|
*/
|
|
16
16
|
export function signalJoinCouplings(signal, options = {}) {
|
|
17
17
|
const { tolerance = 0.05, ignoreDiaIDs = false } = options;
|
|
@@ -55,7 +55,7 @@ function groupJCouplings(signal, comparator, tolerance) {
|
|
|
55
55
|
.filter((group) => group.diaIDs)
|
|
56
56
|
.map((group) => group.diaIDs)
|
|
57
57
|
.flat());
|
|
58
|
-
let distances = distinctValues(group.map((group) => group.
|
|
58
|
+
let distances = distinctValues(group.map((group) => group.pathLength));
|
|
59
59
|
let multiplicity = joinPatterns(group
|
|
60
60
|
.filter((group) => group.multiplicity)
|
|
61
61
|
.map((group) => group.multiplicity));
|
|
@@ -66,7 +66,7 @@ function groupJCouplings(signal, comparator, tolerance) {
|
|
|
66
66
|
if (diaIDs.length === 1)
|
|
67
67
|
newJ.diaIDs = diaIDs;
|
|
68
68
|
if (distances.length === 1 && distances[0])
|
|
69
|
-
newJ.
|
|
69
|
+
newJ.pathLength = distances[0];
|
|
70
70
|
if (assignment.length > 0)
|
|
71
71
|
newJ.assignment = assignment;
|
|
72
72
|
if (atoms.length > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signalJoinCouplings.js","sourceRoot":"","sources":["../../src/signal/signalJoinCouplings.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"signalJoinCouplings.js","sourceRoot":"","sources":["../../src/signal/signalJoinCouplings.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ import sum from 'ml-array-sum';
|
|
|
3
3
|
import { signalJoinCouplings } from '../signal/signalJoinCouplings';
|
|
4
4
|
const localeCompare = (a, b) => a.localeCompare(b);
|
|
5
5
|
const localeCompareJcouplingKeys = (a, b) => {
|
|
6
|
-
const aa = `${a.diaIDs.join(' ')}${a.
|
|
7
|
-
const bb = `${b.diaIDs.join(' ')}${b.
|
|
6
|
+
const aa = `${a.diaIDs.join(' ')}${a.pathLength}`;
|
|
7
|
+
const bb = `${b.diaIDs.join(' ')}${b.pathLength}`;
|
|
8
8
|
return localeCompare(aa, bb);
|
|
9
9
|
};
|
|
10
10
|
function checkForMandatory(signals) {
|
|
@@ -16,8 +16,8 @@ function checkForMandatory(signals) {
|
|
|
16
16
|
for (const jcoupling of signal.js) {
|
|
17
17
|
if (!jcoupling.diaIDs)
|
|
18
18
|
throw new Error('there is not diaIDs');
|
|
19
|
-
if (!jcoupling.
|
|
20
|
-
throw new Error('there is not
|
|
19
|
+
if (!jcoupling.pathLength)
|
|
20
|
+
throw new Error('there is not pathLength');
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|
|
@@ -35,7 +35,7 @@ export function signalsJoin(signals, options = {}) {
|
|
|
35
35
|
signal.js = signal.js.sort(localeCompareJcouplingKeys);
|
|
36
36
|
const keyDiaIDs = signal.diaIDs.join(' ');
|
|
37
37
|
let id = `${keyDiaIDs} ${signal.js
|
|
38
|
-
.map((j) => `${j.diaIDs.join(' ')} ${j.
|
|
38
|
+
.map((j) => `${j.diaIDs.join(' ')} ${j.pathLength}`)
|
|
39
39
|
.sort(localeCompare)
|
|
40
40
|
.join(' ')}`;
|
|
41
41
|
if (!groupedSignals[id]) {
|
|
@@ -46,13 +46,13 @@ export function signalsJoin(signals, options = {}) {
|
|
|
46
46
|
// for each group we need to combine assignments and average couplings
|
|
47
47
|
let newSignals = [];
|
|
48
48
|
Object.values(groupedSignals).forEach((group) => {
|
|
49
|
-
// joining couplings only if diaID and
|
|
49
|
+
// joining couplings only if diaID and pathLength are equal
|
|
50
50
|
let js = [];
|
|
51
51
|
for (let i = 0; i < group[0].js.length; i++) {
|
|
52
52
|
const coupling = group[0].js[i];
|
|
53
53
|
js.push({
|
|
54
54
|
diaIDs: coupling.diaIDs,
|
|
55
|
-
|
|
55
|
+
pathLength: coupling.pathLength,
|
|
56
56
|
multiplicity: coupling.multiplicity,
|
|
57
57
|
coupling: mean(group.map((item) => item.js[i].coupling)),
|
|
58
58
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signalsJoin.js","sourceRoot":"","sources":["../../src/signals/signalsJoin.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,eAAe,CAAC;AACjC,OAAO,GAAG,MAAM,cAAc,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAuBpE,MAAM,aAAa,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACnE,MAAM,0BAA0B,GAAG,CACjC,CAA0B,EAC1B,CAA0B,EAC1B,EAAE;IACF,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"signalsJoin.js","sourceRoot":"","sources":["../../src/signals/signalsJoin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splitSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/splitSpinSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAenC,MAAM,UAAU,eAAe,CAC7B,UAAsB,EACtB,UAAkC,EAAE;IAEpC,IAAI,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;IACrE,IAAI,EAAE,SAAS,GAAG,GAAG,EAAE,cAAc,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IACtD,IAAI,KAAK,GAAG,cAAc,CAAC,cAAc,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;IACzE,IAAI,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,WAAW,GAAsB,EAAE,CAAC;IACxC,IAAI,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;IACnC,YAAY,CAAC,YAAY,EAAE,WAAW,EAAE;QACtC,cAAc;QACd,KAAK,EAAE,KAAK;QACZ,MAAM;QACN,YAAY;KACb,CAAC,CAAC;IACH,IAAI,cAAc,GAAG,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAChE,IAAI,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC;IACtC,IAAI,QAAQ,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;QAClC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/B,IAAI,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,IAAI,OAAO,KAAK,CAAC;gBAAE,SAAS;YAC5B,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9C;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AASD,SAAS,YAAY,
|
|
1
|
+
{"version":3,"file":"splitSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/splitSpinSystem.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nmr-parser.js","sourceRoot":"","sources":["../../../src/types/modules/nmr-parser.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"joinPatterns.js","sourceRoot":"","sources":["../../src/utilities/joinPatterns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"joinPatterns.js","sourceRoot":"","sources":["../../src/utilities/joinPatterns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,UAAU,YAAY,CAAC,QAAkB;IAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QAC3C,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CACb,WAAW,OAAO,cAAc,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACxE,CAAC;SACH;QACD,OAAO,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAED,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC"}
|
|
@@ -16,7 +16,7 @@ const smallFilter = [
|
|
|
16
16
|
[0, 1, 3, 7, 7, 7, 3, 1, 0],
|
|
17
17
|
[0, 0, 1, 2, 2, 2, 1, 0, 0],
|
|
18
18
|
];
|
|
19
|
-
export function
|
|
19
|
+
export function xyzAutoZonesPicking(spectraData, options) {
|
|
20
20
|
let { sizeToPad = 14, realTopDetection = true, thresholdFactor = 0.5, nuclei = ['1H', '1H'], observedFrequencies, enhanceSymmetry = false, clean = true, maxPercentCutOff = 0.03, tolerances = [24, 24], convolutionByFFT = true, kernel: kernelOptions, } = options;
|
|
21
21
|
if (!Array.isArray(observedFrequencies) &&
|
|
22
22
|
!ArrayBuffer.isView(observedFrequencies)) {
|
|
@@ -78,7 +78,40 @@ export function xyzAutoPeaksPicking(spectraData, options) {
|
|
|
78
78
|
if (enhanceSymmetry) {
|
|
79
79
|
signals = PeakOptimizer.enhanceSymmetry(signals);
|
|
80
80
|
}
|
|
81
|
-
return signals;
|
|
81
|
+
return formatZones(signals);
|
|
82
|
+
}
|
|
83
|
+
function formatZones(signals) {
|
|
84
|
+
let zones = [];
|
|
85
|
+
for (const signal of signals) {
|
|
86
|
+
let minMax1 = [Number.MAX_VALUE, 0];
|
|
87
|
+
let minMax2 = [Number.MAX_VALUE, 0];
|
|
88
|
+
for (const peak of signal.peaks || []) {
|
|
89
|
+
if (peak.minX < minMax1[0]) {
|
|
90
|
+
minMax1[0] = peak.minX;
|
|
91
|
+
}
|
|
92
|
+
if (peak.maxX > minMax1[1]) {
|
|
93
|
+
minMax1[1] = peak.maxX;
|
|
94
|
+
}
|
|
95
|
+
if (peak.minY < minMax2[0]) {
|
|
96
|
+
minMax2[0] = peak.minY;
|
|
97
|
+
}
|
|
98
|
+
if (peak.maxY > minMax2[1]) {
|
|
99
|
+
minMax2[1] = peak.maxY;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
zones.push({
|
|
103
|
+
x: {
|
|
104
|
+
from: minMax1[0],
|
|
105
|
+
to: minMax1[1],
|
|
106
|
+
},
|
|
107
|
+
y: {
|
|
108
|
+
from: minMax2[0],
|
|
109
|
+
to: minMax2[1],
|
|
110
|
+
},
|
|
111
|
+
signals: [signal],
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
return zones;
|
|
82
115
|
}
|
|
83
116
|
const createSignals2D = (peaks, options) => {
|
|
84
117
|
let { nCols, nRows, absoluteData, originalData, observedFrequencies, tolerances, nuclei, realTopDetection, minY, maxY, minX, maxX, } = options;
|
|
@@ -107,9 +140,6 @@ const createSignals2D = (peaks, options) => {
|
|
|
107
140
|
peaks[i].maxX = minX + dx * peaks[i].maxX;
|
|
108
141
|
peaks[i].maxY = minY + dy * peaks[i].maxY;
|
|
109
142
|
// Still having problems to correctly detect peaks on those areas. So I'm removing everything there.
|
|
110
|
-
if (peaks[i].y < -1 || peaks[i].y >= 210) {
|
|
111
|
-
peaks.splice(i, 1);
|
|
112
|
-
}
|
|
113
143
|
}
|
|
114
144
|
// The connectivity matrix is an square and symmetric matrix, so we'll only store the upper diagonal in an
|
|
115
145
|
// array like form
|
|
@@ -143,8 +173,6 @@ const createSignals2D = (peaks, options) => {
|
|
|
143
173
|
},
|
|
144
174
|
};
|
|
145
175
|
let peaks2D = [];
|
|
146
|
-
let minMax1 = [Number.MAX_VALUE, 0];
|
|
147
|
-
let minMax2 = [Number.MAX_VALUE, 0];
|
|
148
176
|
let sumZ = 0;
|
|
149
177
|
for (let jPeak = 0; jPeak < cluster.length; jPeak++) {
|
|
150
178
|
if (cluster[jPeak] === 1) {
|
|
@@ -152,24 +180,8 @@ const createSignals2D = (peaks, options) => {
|
|
|
152
180
|
signal.x.delta += peaks[jPeak].x * peaks[jPeak].z;
|
|
153
181
|
signal.y.delta += peaks[jPeak].y * peaks[jPeak].z;
|
|
154
182
|
sumZ += peaks[jPeak].z;
|
|
155
|
-
if (peaks[jPeak].minX < minMax1[0]) {
|
|
156
|
-
minMax1[0] = peaks[jPeak].minX;
|
|
157
|
-
}
|
|
158
|
-
if (peaks[jPeak].maxX > minMax1[1]) {
|
|
159
|
-
minMax1[1] = peaks[jPeak].maxX;
|
|
160
|
-
}
|
|
161
|
-
if (peaks[jPeak].minY < minMax2[0]) {
|
|
162
|
-
minMax2[0] = peaks[jPeak].minY;
|
|
163
|
-
}
|
|
164
|
-
if (peaks[jPeak].maxY > minMax2[1]) {
|
|
165
|
-
minMax2[1] = peaks[jPeak].maxY;
|
|
166
|
-
}
|
|
167
183
|
}
|
|
168
184
|
}
|
|
169
|
-
signal.x.from = minMax1[0];
|
|
170
|
-
signal.y.from = minMax2[0];
|
|
171
|
-
signal.x.to = minMax1[1];
|
|
172
|
-
signal.y.to = minMax2[1];
|
|
173
185
|
signal.x.delta /= sumZ;
|
|
174
186
|
signal.y.delta /= sumZ;
|
|
175
187
|
signal.peaks = peaks2D;
|
|
@@ -207,4 +219,4 @@ const padData = (spectraData, options) => {
|
|
|
207
219
|
maxY: maxY + yOffset * yInterval,
|
|
208
220
|
};
|
|
209
221
|
};
|
|
210
|
-
//# sourceMappingURL=
|
|
222
|
+
//# sourceMappingURL=xyzAutoZonesPicking.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"xyzAutoZonesPicking.js","sourceRoot":"","sources":["../../src/xyz/xyzAutoZonesPicking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyzJResAnalyzer.js","sourceRoot":"","sources":["../../src/xyz/xyzJResAnalyzer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"xyzJResAnalyzer.js","sourceRoot":"","sources":["../../src/xyz/xyzJResAnalyzer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nmr-processing",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"description": "Pure functions allowing to process NMR spectra.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -16,9 +16,12 @@
|
|
|
16
16
|
"scripts": {
|
|
17
17
|
"clean": "rimraf lib lib-esm",
|
|
18
18
|
"build": "npm run tsc && cheminfo-build",
|
|
19
|
-
"
|
|
19
|
+
"check-types": "tsc --noEmit",
|
|
20
|
+
"eslint": "eslint src --cache",
|
|
20
21
|
"eslint-fix": "npm run eslint -- --fix",
|
|
21
22
|
"prepack": "npm run tsc",
|
|
23
|
+
"prettier": "prettier --check src",
|
|
24
|
+
"prettier-write": "prettier --write src",
|
|
22
25
|
"test": "npm run test-coverage && npm run eslint",
|
|
23
26
|
"test-coverage": "npm run test-only -- --coverage",
|
|
24
27
|
"test-only": "jest",
|
|
@@ -46,45 +49,45 @@
|
|
|
46
49
|
"trailingComma": "all"
|
|
47
50
|
},
|
|
48
51
|
"devDependencies": {
|
|
49
|
-
"@types/jest": "^27.0.
|
|
52
|
+
"@types/jest": "^27.0.3",
|
|
50
53
|
"cheminfo-build": "^1.1.11",
|
|
51
|
-
"cheminfo-types": "^0.
|
|
52
|
-
"eslint": "^8.0
|
|
53
|
-
"eslint-config-cheminfo-typescript": "^10.
|
|
54
|
+
"cheminfo-types": "^0.8.0",
|
|
55
|
+
"eslint": "^8.3.0",
|
|
56
|
+
"eslint-config-cheminfo-typescript": "^10.2.4",
|
|
54
57
|
"esm": "^3.2.25",
|
|
55
|
-
"jest": "^27.2
|
|
58
|
+
"jest": "^27.4.2",
|
|
56
59
|
"jest-matcher-deep-close-to": "^3.0.2",
|
|
57
60
|
"md5": "^2.3.0",
|
|
58
61
|
"ml-array-median": "^1.1.5",
|
|
59
62
|
"nmr-xy-testdata": "^0.2.1",
|
|
60
63
|
"openchemlib": "^7.4.3",
|
|
61
|
-
"prettier": "^2.
|
|
64
|
+
"prettier": "^2.5.0",
|
|
62
65
|
"rimraf": "^3.0.2",
|
|
63
|
-
"ts-jest": "^27.0.
|
|
64
|
-
"typescript": "^4.
|
|
66
|
+
"ts-jest": "^27.0.7",
|
|
67
|
+
"typescript": "^4.5.2"
|
|
65
68
|
},
|
|
66
69
|
"dependencies": {
|
|
67
70
|
"assign-deep": "^1.0.1",
|
|
68
71
|
"binary-search": "^1.3.6",
|
|
69
72
|
"cross-fetch": "^3.1.4",
|
|
70
73
|
"form-data": "^4.0.0",
|
|
71
|
-
"is-any-array": "^
|
|
74
|
+
"is-any-array": "^2.0.0",
|
|
72
75
|
"ml-array-mean": "^1.1.5",
|
|
73
76
|
"ml-array-rescale": "^1.3.6",
|
|
74
77
|
"ml-array-sequential-fill": "^1.1.7",
|
|
75
78
|
"ml-array-sum": "^1.1.5",
|
|
76
|
-
"ml-gsd": "^9.0.
|
|
79
|
+
"ml-gsd": "^9.0.3",
|
|
77
80
|
"ml-hclust": "^3.1.0",
|
|
78
81
|
"ml-levenberg-marquardt": "^3.1.1",
|
|
79
|
-
"ml-matrix": "^6.8.
|
|
82
|
+
"ml-matrix": "^6.8.2",
|
|
80
83
|
"ml-matrix-convolution": "^1.0.0",
|
|
81
84
|
"ml-matrix-peaks-finder": "^1.0.0",
|
|
82
|
-
"ml-peak-shape-generator": "^
|
|
85
|
+
"ml-peak-shape-generator": "^4.0.1",
|
|
83
86
|
"ml-simple-clustering": "^0.1.0",
|
|
84
87
|
"ml-sparse-matrix": "^2.1.0",
|
|
85
88
|
"ml-spectra-processing": "^6.8.0",
|
|
86
89
|
"ml-tree-set": "^0.1.1",
|
|
87
|
-
"openchemlib-utils": "^1.
|
|
88
|
-
"spectrum-generator": "^6.0.
|
|
90
|
+
"openchemlib-utils": "^1.6.0",
|
|
91
|
+
"spectrum-generator": "^6.0.2"
|
|
89
92
|
}
|
|
90
93
|
}
|
|
@@ -8,7 +8,10 @@ import {
|
|
|
8
8
|
} from '../prediction/predictCarbon';
|
|
9
9
|
import type { NMRSignal1D } from '../types/NMRSignal1D';
|
|
10
10
|
|
|
11
|
-
import type {
|
|
11
|
+
import type {
|
|
12
|
+
NMRSignal1DWithAtomsAndDiaIDs,
|
|
13
|
+
Targets,
|
|
14
|
+
} from './get1HAssignments';
|
|
12
15
|
import { RestrictionByCS, buildAssignments } from './utils/buildAssignments';
|
|
13
16
|
import generateID from './utils/generateID';
|
|
14
17
|
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import treeSet from 'ml-tree-set';
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
Targets,
|
|
5
|
-
NMRSignal1DWithAtomsAndDiaIDs,
|
|
6
|
-
} from '../get1HAssignments';
|
|
3
|
+
import { Targets, NMRSignal1DWithAtomsAndDiaIDs } from '../get1HAssignments';
|
|
7
4
|
|
|
8
5
|
import { createMapPossibleAssignments } from './createMapPossibleAssignments';
|
|
9
6
|
import { exploreTreeRec } from './exploreTreeRec';
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { MakeMandatory } from '../../types/MakeMandatory';
|
|
2
2
|
import type { Targets } from '../get1HAssignments';
|
|
3
3
|
|
|
4
|
-
import type {
|
|
4
|
+
import type {
|
|
5
|
+
RestrictionByCS,
|
|
6
|
+
Predictions1Dassignments,
|
|
7
|
+
} from './buildAssignments';
|
|
5
8
|
|
|
6
9
|
type RestrictionByCSMandatory = MakeMandatory<
|
|
7
10
|
RestrictionByCS,
|
package/src/index.ts
CHANGED
|
@@ -27,7 +27,7 @@ export * from './utilities/rangeFromSignal';
|
|
|
27
27
|
export * from './xy/xyAutoPeaksPicking';
|
|
28
28
|
export * from './xy/xyAutoRangesPicking';
|
|
29
29
|
|
|
30
|
-
export * from './xyz/
|
|
30
|
+
export * from './xyz/xyzAutoZonesPicking';
|
|
31
31
|
export * from './xyz/xyzJResAnalyzer';
|
|
32
32
|
|
|
33
33
|
export * from './databases/getDatabase';
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import LM from 'ml-levenberg-marquardt';
|
|
2
|
+
import type { Peak2D } from 'ml-matrix-peaks-finder';
|
|
2
3
|
import { Gaussian2D } from 'ml-peak-shape-generator';
|
|
3
4
|
|
|
4
|
-
import type { MPFPeak } from '../../types/MPFPeak';
|
|
5
|
-
|
|
6
5
|
const direction8X = [-1, -1, -1, 0, 0, 1, 1, 1];
|
|
7
6
|
const direction8Y = [-1, 0, 1, -1, 1, -1, 0, 1];
|
|
8
7
|
const direction16X = [-2, -2, -2, -2, -2, -1, -1, 0, 0, 1, 1, 2, 2, 2, 2, 2];
|
|
@@ -10,7 +9,7 @@ const direction16Y = [-2, -1, 0, 1, 2, -2, 2, -2, 2, -2, 2, -2, -1, 0, 1, 2];
|
|
|
10
9
|
|
|
11
10
|
type Data = number[] | Float64Array;
|
|
12
11
|
|
|
13
|
-
export function determineRealTop(peaks:
|
|
12
|
+
export function determineRealTop(peaks: Peak2D[], options: any) {
|
|
14
13
|
let { nCols, absoluteData, originalData, minX, maxX, minY, maxY } = options;
|
|
15
14
|
for (let i = 0; i < peaks.length; i++) {
|
|
16
15
|
let xIndex = Math.round(peaks[i].x);
|
|
@@ -148,7 +147,7 @@ function paramGaussian2D(intervalX: number, intervalY: number, nCols: number) {
|
|
|
148
147
|
let xIndex = t % nCols;
|
|
149
148
|
let yIndex = (t - xIndex) / nCols;
|
|
150
149
|
for (let i = 0; i < nL; i++) {
|
|
151
|
-
gaussian2D.fwhm = {x: p[i + 3 * nL], y: p[i + 4 * nL]};
|
|
150
|
+
gaussian2D.fwhm = { x: p[i + 3 * nL], y: p[i + 4 * nL] };
|
|
152
151
|
result +=
|
|
153
152
|
p[i + 2 * nL] *
|
|
154
153
|
gaussian2D.fct(
|
|
@@ -154,7 +154,11 @@ export default {
|
|
|
154
154
|
k = 1;
|
|
155
155
|
let nFlagged = 2;
|
|
156
156
|
maxFlagged = Math.pow(2, n) - 1;
|
|
157
|
-
while (
|
|
157
|
+
while (
|
|
158
|
+
jCouplings.length < n &&
|
|
159
|
+
nFlagged < maxFlagged &&
|
|
160
|
+
k < peaks.length
|
|
161
|
+
) {
|
|
158
162
|
counter += 1;
|
|
159
163
|
// 4.1. Increment j. Set k to the number of the first unflagged component.
|
|
160
164
|
j++;
|
|
@@ -222,8 +226,7 @@ function updateSignal(signal: SignalInternMandatory, jCouplings: number[]) {
|
|
|
222
226
|
signal.startX = peaks[0].x / signal.observe - peaks[0].width;
|
|
223
227
|
signal.stopX =
|
|
224
228
|
peaks[nbPeaks - 1].x / signal.observe + peaks[nbPeaks - 1].width;
|
|
225
|
-
signal.integralData.from =
|
|
226
|
-
peaks[0].x / signal.observe - peaks[0].width * 3;
|
|
229
|
+
signal.integralData.from = peaks[0].x / signal.observe - peaks[0].width * 3;
|
|
227
230
|
signal.integralData.to =
|
|
228
231
|
peaks[nbPeaks - 1].x / signal.observe + peaks[nbPeaks - 1].width * 3;
|
|
229
232
|
// Compile the pattern and format the constant couplings
|
|
@@ -525,10 +528,7 @@ function symmetrize(
|
|
|
525
528
|
|
|
526
529
|
if (Math.abs(diffL - diffR) < maxError) {
|
|
527
530
|
avg = Math.min(peaks[left].intensity, peaks[right].intensity);
|
|
528
|
-
avgWidth = Math.min(
|
|
529
|
-
peaks[left].width,
|
|
530
|
-
peaks[right].width,
|
|
531
|
-
);
|
|
531
|
+
avgWidth = Math.min(peaks[left].width, peaks[right].width);
|
|
532
532
|
peaks[left].intensity = peaks[right].intensity = avg;
|
|
533
533
|
peaks[left].width = peaks[right].width = avgWidth;
|
|
534
534
|
middle = [
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Peak2D } from 'ml-matrix-peaks-finder';
|
|
2
|
+
|
|
2
3
|
import type { NMRSignal2D } from '../../types/NMRSignal2D';
|
|
3
4
|
|
|
4
5
|
let diagonalError = 0.05;
|
|
5
6
|
let tolerance = 0.05;
|
|
6
7
|
|
|
7
|
-
export function clean(peaks:
|
|
8
|
+
export function clean(peaks: Peak2D[], threshold: number) {
|
|
8
9
|
let max = Number.NEGATIVE_INFINITY;
|
|
9
10
|
// double min = Double.MAX_VALUE;
|
|
10
11
|
for (let i = peaks.length - 1; i >= 0; i--) {
|
|
@@ -151,7 +152,7 @@ function completeMissingIfNeeded(
|
|
|
151
152
|
},
|
|
152
153
|
peaks: [{ x: thisSignal.x.delta, y: thisSignal.x.delta, z: 1 }],
|
|
153
154
|
};
|
|
154
|
-
newSignal.peaks = [{ x: thisSignal.x.delta, y: thisSignal.x.delta, z: 1 }]
|
|
155
|
+
newSignal.peaks = [{ x: thisSignal.x.delta, y: thisSignal.x.delta, z: 1 }];
|
|
155
156
|
output.push(newSignal);
|
|
156
157
|
tmpProp = [0, thisProp[1]];
|
|
157
158
|
properties.push(tmpProp);
|
|
@@ -10,7 +10,6 @@ import { predictProton, PredictProtonOptions } from './predictProton';
|
|
|
10
10
|
import { getPredictions } from './utils/getPredictions';
|
|
11
11
|
import type { Predictor } from './utils/predict2D';
|
|
12
12
|
|
|
13
|
-
|
|
14
13
|
export interface PredictAllOptions {
|
|
15
14
|
/**
|
|
16
15
|
* nucleus label to use in the X axis
|
|
@@ -93,13 +92,14 @@ export async function predictAll(
|
|
|
93
92
|
predictions,
|
|
94
93
|
);
|
|
95
94
|
|
|
96
|
-
if (!xPrediction || !yPrediction)
|
|
97
|
-
|
|
95
|
+
if (!xPrediction || !yPrediction) {
|
|
96
|
+
throw new Error('predictions are not availaible');
|
|
97
|
+
}
|
|
98
98
|
|
|
99
99
|
predictions = {
|
|
100
100
|
H: xPrediction,
|
|
101
|
-
C: yPrediction
|
|
102
|
-
}
|
|
101
|
+
C: yPrediction,
|
|
102
|
+
};
|
|
103
103
|
|
|
104
104
|
const { molfile, diaIDs } = xPrediction;
|
|
105
105
|
|
|
@@ -49,7 +49,10 @@ export interface PredictHSQCOptions {
|
|
|
49
49
|
* @returns {Promise<object>} - object with molfile, diaIDs, 2D signals joined signals and zones.
|
|
50
50
|
*/
|
|
51
51
|
|
|
52
|
-
export async function predictHSQC(
|
|
52
|
+
export async function predictHSQC(
|
|
53
|
+
molecule: Molecule,
|
|
54
|
+
options: PredictHSQCOptions = {},
|
|
55
|
+
) {
|
|
53
56
|
let {
|
|
54
57
|
minLength = 1,
|
|
55
58
|
maxLength = 1,
|
|
@@ -102,7 +102,7 @@ function protonParser(
|
|
|
102
102
|
atoms: [linked],
|
|
103
103
|
diaIDs: [diaIDs[linked]],
|
|
104
104
|
multiplicity: 'd',
|
|
105
|
-
|
|
105
|
+
pathLength: distanceMatrix[atom][linked],
|
|
106
106
|
});
|
|
107
107
|
signal.js.sort((a, b) => b.coupling - a.coupling);
|
|
108
108
|
}
|
|
@@ -24,8 +24,7 @@ export function getFilteredIDiaIDs(
|
|
|
24
24
|
|
|
25
25
|
const molfile = molecule.toMolfile();
|
|
26
26
|
|
|
27
|
-
let groupedDiaIDs =
|
|
28
|
-
getGroupedDiastereotopicAtomIDs(molecule);
|
|
27
|
+
let groupedDiaIDs = getGroupedDiastereotopicAtomIDs(molecule);
|
|
29
28
|
|
|
30
29
|
let carbonDiaIDs = groupedDiaIDs
|
|
31
30
|
.filter((e) => e.atomLabel === 'C')
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
const nucleusMap: {[key: string]: string
|
|
1
|
+
const nucleusMap: { [key: string]: string } = {
|
|
2
2
|
h: '1H',
|
|
3
3
|
c: '13C',
|
|
4
4
|
};
|
|
5
5
|
|
|
6
|
-
export function getNuclei(input: {[key: string]: string}) {
|
|
7
|
-
return Object.values(input).map((e) =>
|
|
6
|
+
export function getNuclei(input: { [key: string]: string }) {
|
|
7
|
+
return Object.values(input).map((e) => nucleusMap[e.toLowerCase()]);
|
|
8
8
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { Molecule } from
|
|
1
|
+
import type { Molecule } from 'openchemlib';
|
|
2
2
|
|
|
3
|
-
import type { Prediction1D } from
|
|
3
|
+
import type { Prediction1D } from '../../types/prediction1D';
|
|
4
4
|
|
|
5
5
|
import type { Predictions, PredictOptions, Predictors } from './predict2D';
|
|
6
6
|
|
|
@@ -21,4 +21,4 @@ export async function getPredictions(
|
|
|
21
21
|
: undefined;
|
|
22
22
|
}
|
|
23
23
|
return prediction;
|
|
24
|
-
}
|
|
24
|
+
}
|