nmr-processing 9.3.8 → 9.4.1-pre.1683777881
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/get1HAssignments.js.map +1 -1
- package/lib/assignment/getAssignments.js.map +1 -1
- package/lib/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib/constants/MultiplicityPatterns.d.ts +7 -0
- package/lib/constants/MultiplicityPatterns.js +31 -0
- package/lib/constants/MultiplicityPatterns.js.map +1 -0
- package/lib/constants/couplingPatterns.js +2 -11
- package/lib/constants/couplingPatterns.js.map +1 -1
- package/lib/constants/couplingValues.js +11 -15
- package/lib/constants/couplingValues.js.map +1 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/prediction/predictAll.js.map +1 -1
- package/lib/prediction/predictCarbon.d.ts +0 -4
- package/lib/prediction/predictCarbon.js +12 -18
- package/lib/prediction/predictCarbon.js.map +1 -1
- package/lib/prediction/predictProton.js.map +1 -1
- package/lib/prediction/utils/fetchPrediction.js +3 -0
- package/lib/prediction/utils/fetchPrediction.js.map +1 -1
- package/lib/prediction/utils/getFilteredIDiaIDs.d.ts +1 -1
- package/lib/prediction/utils/getFilteredIDiaIDs.js.map +1 -1
- package/lib/prediction/utils/predict2D.js.map +1 -1
- package/lib/ranges/rangesToXY.d.ts +1 -2
- package/lib/ranges/rangesToXY.js.map +1 -1
- package/lib/signals/addDummySignals.js +3 -2
- package/lib/signals/addDummySignals.js.map +1 -1
- package/lib/utilities/splitPatterns.js +8 -1
- package/lib/utilities/splitPatterns.js.map +1 -1
- package/lib-esm/assignment/get13CAssignments.js.map +1 -1
- package/lib-esm/assignment/get1HAssignments.js.map +1 -1
- package/lib-esm/assignment/getAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib-esm/constants/MultiplicityPatterns.js +28 -0
- package/lib-esm/constants/MultiplicityPatterns.js.map +1 -0
- package/lib-esm/constants/couplingPatterns.js +2 -11
- package/lib-esm/constants/couplingPatterns.js.map +1 -1
- package/lib-esm/constants/couplingValues.js +11 -15
- package/lib-esm/constants/couplingValues.js.map +1 -1
- package/lib-esm/index.js +3 -0
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/prediction/predictAll.js.map +1 -1
- package/lib-esm/prediction/predictCarbon.js +12 -15
- package/lib-esm/prediction/predictCarbon.js.map +1 -1
- package/lib-esm/prediction/predictProton.js.map +1 -1
- package/lib-esm/prediction/utils/fetchPrediction.js +3 -0
- package/lib-esm/prediction/utils/fetchPrediction.js.map +1 -1
- package/lib-esm/prediction/utils/getFilteredIDiaIDs.js.map +1 -1
- package/lib-esm/prediction/utils/predict2D.js.map +1 -1
- package/lib-esm/ranges/rangesToXY.js.map +1 -1
- package/lib-esm/signals/addDummySignals.js +3 -2
- package/lib-esm/signals/addDummySignals.js.map +1 -1
- package/lib-esm/utilities/splitPatterns.js +8 -1
- package/lib-esm/utilities/splitPatterns.js.map +1 -1
- package/package.json +3 -3
- package/src/assignment/get13CAssignments.ts +1 -1
- package/src/assignment/get1HAssignments.ts +1 -1
- package/src/assignment/getAssignments.ts +1 -1
- package/src/assignment/utils/getAssignment/buildAssignments.ts +1 -1
- package/src/constants/MultiplicityPatterns.ts +35 -0
- package/src/constants/couplingPatterns.ts +3 -11
- package/src/constants/couplingValues.ts +10 -15
- package/src/index.ts +4 -0
- package/src/prediction/predictAll.ts +1 -1
- package/src/prediction/predictCarbon.ts +15 -27
- package/src/prediction/predictProton.ts +1 -1
- package/src/prediction/utils/fetchPrediction.ts +5 -0
- package/src/prediction/utils/getFilteredIDiaIDs.ts +1 -1
- package/src/prediction/utils/predict2D.ts +1 -1
- package/src/ranges/rangesToXY.ts +5 -3
- package/src/signals/addDummySignals.ts +1 -2
- package/src/utilities/splitPatterns.ts +11 -2
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export const MultiplicityPatterns = [
|
|
2
|
+
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s'] },
|
|
3
|
+
{ label: 'doublet', value: 'd', multiplicity: 2, names: [] },
|
|
4
|
+
{ label: 'triplet', value: 't', multiplicity: 3, names: [] },
|
|
5
|
+
{ label: 'quartet', value: 'q', multiplicity: 4, names: [] },
|
|
6
|
+
{
|
|
7
|
+
label: 'quintet',
|
|
8
|
+
value: 'i',
|
|
9
|
+
multiplicity: 5,
|
|
10
|
+
names: ['quint', 'qui', 'qnt', 'pentet', 'pnt', 'pent'],
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
label: 'sextet',
|
|
14
|
+
value: 'h',
|
|
15
|
+
multiplicity: 6,
|
|
16
|
+
names: ['x', 'sxt', 'sext', 'hexuplet'],
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
label: 'septet',
|
|
20
|
+
value: 'p',
|
|
21
|
+
multiplicity: 7,
|
|
22
|
+
names: ['sept', 'spt', 'heptet', 'hpt', 'hept'],
|
|
23
|
+
},
|
|
24
|
+
{ label: 'octet', value: 'o', multiplicity: 8, names: ['oct'] },
|
|
25
|
+
{ label: 'nonet', value: 'n', multiplicity: 9, names: ['non'] },
|
|
26
|
+
{ label: 'massive', value: 'm', multiplicity: null, names: [] },
|
|
27
|
+
];
|
|
28
|
+
//# sourceMappingURL=MultiplicityPatterns.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MultiplicityPatterns.js","sourceRoot":"","sources":["../../src/constants/MultiplicityPatterns.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,oBAAoB,GAA0B;IACzD,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE;IAClE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;IAC5D,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;IAC5D,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;IAC5D;QACE,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,GAAG;QACV,YAAY,EAAE,CAAC;QACf,KAAK,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC;KACxD;IACD;QACE,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,GAAG;QACV,YAAY,EAAE,CAAC;QACf,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC;KACxC;IACD;QACE,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,GAAG;QACV,YAAY,EAAE,CAAC;QACf,KAAK,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC;KAChD;IACD,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE;IAC/D,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE;IAC/D,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;CAChE,CAAC"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
'd',
|
|
4
|
-
't',
|
|
5
|
-
'q',
|
|
6
|
-
'quint',
|
|
7
|
-
'h',
|
|
8
|
-
'sept',
|
|
9
|
-
'o',
|
|
10
|
-
'n',
|
|
11
|
-
];
|
|
1
|
+
import { MultiplicityPatterns } from "./MultiplicityPatterns";
|
|
2
|
+
export const couplingPatterns = MultiplicityPatterns.map((m) => m.value);
|
|
12
3
|
//# sourceMappingURL=couplingPatterns.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"couplingPatterns.js","sourceRoot":"","sources":["../../src/constants/couplingPatterns.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG
|
|
1
|
+
{"version":3,"file":"couplingPatterns.js","sourceRoot":"","sources":["../../src/constants/couplingPatterns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC"}
|
|
@@ -1,16 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
o: 7,
|
|
13
|
-
non: 8,
|
|
14
|
-
n: 8,
|
|
15
|
-
};
|
|
1
|
+
import { MultiplicityPatterns } from "./MultiplicityPatterns";
|
|
2
|
+
const result = {};
|
|
3
|
+
for (const { value, multiplicity, names } of MultiplicityPatterns) {
|
|
4
|
+
if (multiplicity)
|
|
5
|
+
result[value] = multiplicity - 1;
|
|
6
|
+
for (const name of names) {
|
|
7
|
+
if (multiplicity)
|
|
8
|
+
result[name] = multiplicity - 1;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
export const couplingValues = result;
|
|
16
12
|
//# sourceMappingURL=couplingValues.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"couplingValues.js","sourceRoot":"","sources":["../../src/constants/couplingValues.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"couplingValues.js","sourceRoot":"","sources":["../../src/constants/couplingValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,MAAM,GAA8B,EAAE,CAAC;AAC7C,KAAK,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAC,IAAI,oBAAoB,EAAE;IAChE,IAAI,YAAY;QAAE,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC;IACnD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,YAAY;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,GAAE,CAAC,CAAE;KACnD;CACF;AACD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC"}
|
package/lib-esm/index.js
CHANGED
|
@@ -21,7 +21,9 @@ export * from './signals/signalsToXY';
|
|
|
21
21
|
export * from './signals/signals2DToZ';
|
|
22
22
|
export * from './signals/optimizeSignals';
|
|
23
23
|
export * from './signals/signalsToFID';
|
|
24
|
+
export * from './signal/signalJoinCouplings';
|
|
24
25
|
export * from './utilities/resurrect';
|
|
26
|
+
export * from './utilities/splitPatterns';
|
|
25
27
|
export * from './utilities/rangeFromSignal';
|
|
26
28
|
export * from './utilities/getFrequency';
|
|
27
29
|
export * from './xy/xyAutoPeaksPicking';
|
|
@@ -35,4 +37,5 @@ export * from './databases/protonImpurities';
|
|
|
35
37
|
export * from './peaks/solventSuppression';
|
|
36
38
|
export * from './ranges/markSolventSignal';
|
|
37
39
|
export * from './apodization/apodization';
|
|
40
|
+
export * from './constants/MultiplicityPatterns';
|
|
38
41
|
//# sourceMappingURL=index.js.map
|
package/lib-esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAE/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAE/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AAEzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AAEtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAE3C,cAAc,2BAA2B,CAAC;AAE1C,cAAc,kCAAkC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictAll.js","sourceRoot":"","sources":["../../src/prediction/predictAll.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"predictAll.js","sourceRoot":"","sources":["../../src/prediction/predictAll.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAmDxD;;;GAGG;AAEH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,QAAkB,EAClB,UAA6B,EAAE;IAE/B,IAAI,EACF,IAAI,GAAG,GAAG,EACV,EAAE,GAAG,GAAG,EACR,SAAS,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,EAClD,WAAW,EACX,YAAY,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAClC,cAAc,GAAG,EAAE,GACpB,GAAG,OAAO,CAAC;IAEZ,MAAM,MAAM,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAElD,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,SAAS,EACT,WAAW,CACZ,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,EAAE,EACF,QAAQ,EACR,cAAc,EACd,SAAS,EACT,WAAW,CACZ,CAAC;IAEF,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;KACnD;IAED,WAAW,GAAG;QACZ,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;KACf,CAAC;IAEF,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAEhC,MAAM,OAAO,GAAQ;QACnB,MAAM,EAAE,WAAW,CAAC,CAAC;QACrB,MAAM,EAAE,WAAW,CAAC,CAAC;KACtB,CAAC;IAEF,OAAO,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE;QACzC,WAAW;QACX,YAAY;KACb,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE;QACzC,WAAW;QACX,YAAY;KACb,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE;QACzC,WAAW;QACX,YAAY;KACb,CAAC,CAAC;IAEH,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;QAC5B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;KAC5B;IAED,OAAO;QACL,OAAO;QACP,MAAM;QACN,GAAG,OAAO;KACX,CAAC;AACJ,CAAC"}
|
|
@@ -1,21 +1,10 @@
|
|
|
1
1
|
import { v4 as generateID } from '@lukeed/uuid';
|
|
2
|
-
import fetch from 'cross-fetch';
|
|
3
2
|
import { getDiastereotopicAtomIDs } from 'openchemlib-utils';
|
|
4
3
|
import { setIDs } from '../peaks/util/setIDs';
|
|
5
4
|
import { signalsToRanges } from '../signals/signalsToRanges';
|
|
6
5
|
import { fetchPrediction } from './utils/fetchPrediction';
|
|
7
6
|
import { getFilteredIDiaIDs } from './utils/getFilteredIDiaIDs';
|
|
8
7
|
import { queryByHose } from './utils/queryByHOSE';
|
|
9
|
-
const cache = {};
|
|
10
|
-
async function loadDB(url = 'https://www.lactame.com/lib/nmr-processing-data/20210711/carbon.js') {
|
|
11
|
-
if (cache[url]) {
|
|
12
|
-
return cache[url];
|
|
13
|
-
}
|
|
14
|
-
const response = await fetch(url);
|
|
15
|
-
const database = await response.json();
|
|
16
|
-
cache[url] = database;
|
|
17
|
-
return database;
|
|
18
|
-
}
|
|
19
8
|
function checkFromPrediction(signal) {
|
|
20
9
|
if (!signal.atoms)
|
|
21
10
|
throw new Error('There is not atoms');
|
|
@@ -29,12 +18,20 @@ function checkFromPrediction(signal) {
|
|
|
29
18
|
* @returns {Promise<object>} - object with molfile, diaIDs, signals, joined signals by diaIDs and ranges.
|
|
30
19
|
*/
|
|
31
20
|
export async function predictCarbon(molecule, options = {}) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
21
|
+
if (molecule.getAllAtoms() === 0) {
|
|
22
|
+
return {
|
|
23
|
+
molfile: molecule.toMolfile(),
|
|
24
|
+
nucleus: '13C',
|
|
25
|
+
diaIDs: [],
|
|
26
|
+
joinedSignals: [],
|
|
27
|
+
signals: [],
|
|
28
|
+
ranges: [],
|
|
29
|
+
molecule,
|
|
30
|
+
};
|
|
35
31
|
}
|
|
32
|
+
let { database, webserviceURL = 'https://nmr-prediction.service.zakodium.com/v1/predict/carbon', diaIDs = getDiastereotopicAtomIDs(molecule), } = options;
|
|
36
33
|
if (!database)
|
|
37
|
-
|
|
34
|
+
return fetchPrediction(molecule, { webserviceURL });
|
|
38
35
|
if (!database) {
|
|
39
36
|
throw new Error('There is not a database');
|
|
40
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictCarbon.js","sourceRoot":"","sources":["../../src/prediction/predictCarbon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"predictCarbon.js","sourceRoot":"","sources":["../../src/prediction/predictCarbon.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictProton.js","sourceRoot":"","sources":["../../src/prediction/predictProton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,QAAQ,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"predictProton.js","sourceRoot":"","sources":["../../src/prediction/predictProton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,iCAAiC,EACjC,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAsB7D,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAkB,EAClB,UAAgC,EAAE;IAElC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1B,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;IACrC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAChC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAErC,IAAI,MAAM,CAAC;IACX,IAAI,KAAK,EAAE;QACT,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;KACzB;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAChC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,yCAAyC,EAAE;YACtE,MAAM,EAAE,MAAM;YACd,+DAA+D;YAC/D,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SACxB;KACF;IAED,MAAM,EAAE,MAAM,GAAG,wBAAwB,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO;QACL,OAAO;QACP,MAAM;QACN,OAAO,EAAE,IAAI;QACb,aAAa;QACb,OAAO;QACP,MAAM,EAAE,eAAe,CAAC,aAAa,CAAC;QACtC,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,MAAc,EACd,QAAkB,EAClB,MAAgB;IAEhB,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC1B,MAAM,KAAK,CAAC,wBAAwB,MAAM,EAAE,CAAC,CAAC;KAC/C;IACD,IAAI,cAAc,GAAG,qBAAqB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;QACtB,IAAI,MAAM,GAAa,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,MAAM,GAAgB;YACxB,EAAE,EAAE,UAAU,EAAE;YAChB,KAAK,EAAE,CAAC,IAAI,CAAC;YACb,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,EAAE,CAAC;YACV,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,EAAE,EAAE,EAAE;SACP,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC5C,IAAI,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;gBACb,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClC,KAAK,EAAE,CAAC,MAAM,CAAC;gBACf,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACxB,YAAY,EAAE,GAAG;gBACjB,UAAU,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;aACzC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;SACnD;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACtB;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -9,6 +9,9 @@ export async function fetchPrediction(molecule, options) {
|
|
|
9
9
|
body: JSON.stringify({ molfile: molecule.toMolfile() }),
|
|
10
10
|
method: 'POST',
|
|
11
11
|
});
|
|
12
|
+
if (response.status >= 400) {
|
|
13
|
+
throw new Error(response.statusText);
|
|
14
|
+
}
|
|
12
15
|
const prediction = (await response.json()).data;
|
|
13
16
|
prediction.molecule = molecule
|
|
14
17
|
.getOCL()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchPrediction.js","sourceRoot":"","sources":["../../../src/prediction/utils/fetchPrediction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AASpC,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAkB,EAClB,OAA+B;IAE/B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE;QAC1C,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB;YAC1B,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;QACvD,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fetchPrediction.js","sourceRoot":"","sources":["../../../src/prediction/utils/fetchPrediction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AASpC,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAkB,EAClB,OAA+B;IAE/B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE;QAC1C,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB;YAC1B,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;QACvD,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;KACtC;IACD,MAAM,UAAU,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;IAEhD,UAAU,CAAC,QAAQ,GAAG,QAAQ;SAC3B,MAAM,EAAE;SACR,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFilteredIDiaIDs.js","sourceRoot":"","sources":["../../../src/prediction/utils/getFilteredIDiaIDs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getFilteredIDiaIDs.js","sourceRoot":"","sources":["../../../src/prediction/utils/getFilteredIDiaIDs.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gCAAgC,EAChC,iCAAiC,EACjC,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAS3B,MAAM,UAAU,kBAAkB,CAChC,QAAkB,EAClB,OAAoD;IAEpD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE1C,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAChC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IAC/B,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAErC,IAAI,aAAa,GAAG,0BAA0B,CAAC,MAAM,EAAE,QAAQ,EAAE;QAC/D,SAAS,EAAE,GAAG;KACf,CAAC,CAAC;IAEH,IAAI,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7C,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,EAAE;YAC/B,OAAO,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;SAC9B;QACD,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAQ,CAAC;IAEV,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC9B,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;QAChC,KAAK,CAAC,IAAI,GAAG,gCAAgC,CAC3C,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EACpC;YACE,aAAa;SACd,CACF,CAAC;KACH;IAED,IAAI,QAAQ,GAAG;QACb,OAAO;QACP,YAAY,EAAE,YAAqC;KACpD,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predict2D.js","sourceRoot":"","sources":["../../../src/prediction/utils/predict2D.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAW,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"predict2D.js","sourceRoot":"","sources":["../../../src/prediction/utils/predict2D.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAW,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,EACL,+BAA+B,EAC/B,YAAY,EACZ,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAO3B,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAQjD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA0FlD,SAAS,WAAW,CAClB,OAAyB;IAEzB,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;AACH,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,QAAkB,EAClB,UAA4B,EAAE;IAE9B,WAAW,CAAC,OAAO,CAAC,CAAC;IAErB,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAEhC,IAAI,EACF,IAAI,EACJ,EAAE,EACF,MAAM,EACN,SAAS,GAAG,CAAC,EACb,SAAS,EACT,cAAc,GAAG,EAAE,EACnB,WAAW,EACX,SAAS,EACT,YAAY,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAClC,eAAe,GAAG,KAAK,GACxB,GAAG,OAAO,CAAC;IAEZ,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,EAAE;QACvC,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;QACX,SAAS;QACT,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM;QAC1B,CAAC,CAAC,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC;QAC9C,CAAC,CAAC,+BAA+B,CAAC,QAAQ,CAAC,CAAC;IAE9C,IAAI,kBAAkB,GAA6C,EAAE,CAAC;IACtE,KAAK,IAAI,KAAK,IAAI,aAAa,EAAE;QAC/B,kBAAkB,CAAC,IAAI,CAAC;YACtB,GAAG,KAAK;YACR,QAAQ,EAAE,IAAI,CAAC,KAAK,CAClB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9B;SACd,CAAC,CAAC;KACJ;IAED,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,SAAS,EACT,WAAW,CACZ,CAAC;IAEF,MAAM,WAAW,GACf,IAAI,KAAK,EAAE;QACT,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,MAAM,cAAc,CAClB,EAAE,EACF,QAAQ,EACR,cAAc,EACd,SAAS,EACT,WAAW,CACZ,CAAC;IAER,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;KACnD;IAED,MAAM,OAAO,GAAoC;QAC/C,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;KACf,CAAC;IAEF,MAAM,cAAc,GAAoB;QACtC,CAAC,EAAE,EAAE;QACL,CAAC,EAAE,EAAE;KACN,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;QACjC,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE;YAChD,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC7D,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;SACjD;KACF;IACD,IAAI,KAAK,GAAmC,EAAE,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,kBAAkB,EAAE;QACtC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAExC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,SAAS;QAEhD,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC;QACpC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;YAC/B,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC;gBAAE,SAAS;YAE1D,IAAI,WAAW,GAAgC;gBAC7C,CAAC,EAAE,QAAQ;gBACX,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;aACtB,CAAC;YAEF,MAAM,GAAG,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAE5D,IAAI,GAAG,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;gBAC/D,SAAS;aACV;YAED,IAAI,IAAI,GAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;YAC7C,IAAI,MAAM,GAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YACrD,KAAK,IAAI,IAAI,IAAI,WAAW,EAAE;gBAC5B,IAAI,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;gBAC/C,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;gBACvD,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;aACxD;YAED,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;YACtB,KAAK,CAAC,GAAG,CAAC,GAAG,MAAqB,CAAC;SACpC;KACF;IAED,IAAI,eAAe,EAAE;QACnB,mBAAmB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC;KAClE;IAED,iCAAiC;IACjC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,WAAW,CAAC,aAAa,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAErE,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,SAAS,EAAE;QAC7B,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM;QACxB,MAAM,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAC/B,aAAa;QACb,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC;QACpC,KAAK;QACL,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,aAA4B;IAChD,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;QAClC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE;YACxC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE;gBACxC,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBACnD,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACzB;SACF;KACF;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AAMD,SAAS,mBAAmB,CAC1B,KAAqC,EACrC,OAAmC;IAEnC,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAEpC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;YAAE,SAAS;QACvC,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC;YAAE,SAAS;QAEzC,IAAI,MAAM,GAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,IAAI,GAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACzB,KAAK,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;SACxD;QAED,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QAEtB,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,MAAqB,CAAC;KAC9D;AACH,CAAC;AAOD,SAAS,WAAW,CAAC,OAAsB,EAAE,OAA2B;IACtE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEtE,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAEjC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;IACvC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAChD,CAAC;IAEF,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,OAAO,CAAC,MAAM;YAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACxD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;gBACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;aAC7B;SACF;QAED,KAAK,CAAC,IAAI,CAAC;YACT,EAAE,EAAE,UAAU,EAAE;YAChB,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YAC7C,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;KACJ;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,MAAM,CAAC,OAAsB,EAAE,OAA2B;IACjE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC3C,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QACjD,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QACjD,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QACjD,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;KAClD;IACD,OAAO;QACL,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE;QACrE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,EAAE;KAClE,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAAmB,EAAE,WAAmB;IAC7D,IAAI,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;IACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,OAAO,CAAC,MAAM,GAAG,WAAW,EAAE;YAChC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACzB;KACF;IACD,OAAO,QAAQ,CAAC,MAAM,GAAG,cAAc;QACrC,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC;QACtC,CAAC,CAAC,QAAQ,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rangesToXY.js","sourceRoot":"","sources":["../../src/ranges/rangesToXY.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"rangesToXY.js","sourceRoot":"","sources":["../../src/ranges/rangesToXY.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export function addDummySignals(signals) {
|
|
|
9
9
|
}, 0) + 1;
|
|
10
10
|
signals.forEach((signal, s) => {
|
|
11
11
|
const { js: jCouplings = [], atoms: signalAssignment = [nextAtomToAssign++], } = signal;
|
|
12
|
-
let { newCouplings, tempSignals } = checkCouplings(jCouplings,
|
|
12
|
+
let { newCouplings, tempSignals } = checkCouplings(jCouplings, signalAssignment, nextAtomToAssign + signals.length);
|
|
13
13
|
if (tempSignals.length > 0)
|
|
14
14
|
newSignals.push(...tempSignals);
|
|
15
15
|
newSignals[s].js = newCouplings;
|
|
@@ -17,7 +17,7 @@ export function addDummySignals(signals) {
|
|
|
17
17
|
});
|
|
18
18
|
return newSignals.sort((a, b) => a.delta - b.delta);
|
|
19
19
|
}
|
|
20
|
-
function checkCouplings(jCouplings,
|
|
20
|
+
function checkCouplings(jCouplings, signalAssignment, nextAtomToAssign) {
|
|
21
21
|
let tempSignals = [];
|
|
22
22
|
const newCouplings = jCouplings.reduce((newCouplings, jCoupling) => {
|
|
23
23
|
const { atoms = [], multiplicity, coupling } = jCoupling;
|
|
@@ -33,6 +33,7 @@ function checkCouplings(jCouplings, signals, signalAssignment, nextAtomToAssign)
|
|
|
33
33
|
});
|
|
34
34
|
tempSignals.push(formatSignal(coupling, [nextAtomToAssign], signalAssignment));
|
|
35
35
|
}
|
|
36
|
+
newCouplings.push(...tempCouplings);
|
|
36
37
|
}
|
|
37
38
|
else {
|
|
38
39
|
newCouplings.push(jCoupling);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addDummySignals.js","sourceRoot":"","sources":["../../src/signals/addDummySignals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAKjE,MAAM,UAAU,eAAe,CAAC,OAAsB;IACpD,IAAI,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAEpE,IAAI,gBAAgB,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,gBAAgB;YAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACpB,CAAC,CAAC,gBAAgB,CAAC;IACvB,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IACZ,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5B,MAAM,EACJ,EAAE,EAAE,UAAU,GAAG,EAAE,EACnB,KAAK,EAAE,gBAAgB,GAAG,CAAC,gBAAgB,EAAE,CAAC,GAC/C,GAAG,MAAM,CAAC;QACX,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,cAAc,CAChD,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"addDummySignals.js","sourceRoot":"","sources":["../../src/signals/addDummySignals.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
|
+
import { MultiplicityPatterns } from "../constants/MultiplicityPatterns";
|
|
2
|
+
let possiblePatterns = [];
|
|
3
|
+
for (const { label, value, names } of MultiplicityPatterns) {
|
|
4
|
+
possiblePatterns.push(label, value, ...names);
|
|
5
|
+
}
|
|
6
|
+
possiblePatterns = possiblePatterns.sort((a, b) => b.length - a.length);
|
|
1
7
|
export function splitPatterns(multiplet) {
|
|
2
8
|
if (/^\s*$/.exec(multiplet))
|
|
3
9
|
return [];
|
|
4
|
-
|
|
10
|
+
const regexp = new RegExp(possiblePatterns.join('|'), 'g');
|
|
11
|
+
let result = multiplet.match(regexp);
|
|
5
12
|
if (result)
|
|
6
13
|
return result.map((entry) => entry.trim());
|
|
7
14
|
return [multiplet];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splitPatterns.js","sourceRoot":"","sources":["../../src/utilities/splitPatterns.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,CAC1B,
|
|
1
|
+
{"version":3,"file":"splitPatterns.js","sourceRoot":"","sources":["../../src/utilities/splitPatterns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,IAAI,gBAAgB,GAAa,EAAE,CAAC;AACpC,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,oBAAoB,EAAE;IAC1D,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC;CAC/C;AACD,gBAAgB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,CAC1B,MAAM,CACP,CAAC;IACF,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACvD,OAAO,CAAC,SAAS,CAAC,CAAC;AACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nmr-processing",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.4.1-pre.1683777881",
|
|
4
4
|
"description": "Pure functions allowing to process NMR spectra.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"typescript": "^5.0.2"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@lukeed/uuid": "^2.0.
|
|
57
|
+
"@lukeed/uuid": "^2.0.1",
|
|
58
58
|
"binary-search": "^1.3.6",
|
|
59
59
|
"cross-fetch": "^3.1.5",
|
|
60
60
|
"form-data": "^4.0.0",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"ml-peak-shape-generator": "^4.1.2",
|
|
75
75
|
"ml-simple-clustering": "^0.1.0",
|
|
76
76
|
"ml-sparse-matrix": "^2.1.0",
|
|
77
|
-
"ml-spectra-processing": "^12.
|
|
77
|
+
"ml-spectra-processing": "^12.4.0",
|
|
78
78
|
"ml-tree-set": "^0.1.1",
|
|
79
79
|
"nmr-correlation": "^2.3.3",
|
|
80
80
|
"nmredata": "^0.9.2",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { v4 as generateID } from '@lukeed/uuid';
|
|
2
|
-
import { addDiastereotopicMissingChirality } from 'openchemlib-utils';
|
|
3
2
|
import { Molecule } from 'openchemlib/full';
|
|
3
|
+
import { addDiastereotopicMissingChirality } from 'openchemlib-utils';
|
|
4
4
|
|
|
5
5
|
import { NMRRange, NMRRangeWithIntegration } from '..';
|
|
6
6
|
import {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { v4 as generateID } from '@lukeed/uuid';
|
|
2
|
-
import { addDiastereotopicMissingChirality } from 'openchemlib-utils';
|
|
3
2
|
import { Molecule } from 'openchemlib/full';
|
|
3
|
+
import { addDiastereotopicMissingChirality } from 'openchemlib-utils';
|
|
4
4
|
|
|
5
5
|
import { NMRRange } from '..';
|
|
6
6
|
import {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { addDiastereotopicMissingChirality } from 'openchemlib-utils';
|
|
2
1
|
import { Molecule } from 'openchemlib/full';
|
|
2
|
+
import { addDiastereotopicMissingChirality } from 'openchemlib-utils';
|
|
3
3
|
|
|
4
4
|
import { NMRSignal1D } from '..';
|
|
5
5
|
import type { PredictCarbonOptions } from '../prediction/predictCarbon';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import TreeSet from 'ml-tree-set';
|
|
2
2
|
import { Values } from 'nmr-correlation';
|
|
3
|
-
import { getConnectivityMatrix } from 'openchemlib-utils';
|
|
4
3
|
import { Molecule } from 'openchemlib/full';
|
|
4
|
+
import { getConnectivityMatrix } from 'openchemlib-utils';
|
|
5
5
|
|
|
6
6
|
import {
|
|
7
7
|
NMRSignal1D,
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export interface MultipletDefinition {
|
|
2
|
+
label: string;
|
|
3
|
+
value: string;
|
|
4
|
+
names: string[];
|
|
5
|
+
multiplicity: number | null;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export const MultiplicityPatterns: MultipletDefinition[] = [
|
|
9
|
+
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s'] },
|
|
10
|
+
{ label: 'doublet', value: 'd', multiplicity: 2, names: [] },
|
|
11
|
+
{ label: 'triplet', value: 't', multiplicity: 3, names: [] },
|
|
12
|
+
{ label: 'quartet', value: 'q', multiplicity: 4, names: [] },
|
|
13
|
+
{
|
|
14
|
+
label: 'quintet',
|
|
15
|
+
value: 'i',
|
|
16
|
+
multiplicity: 5,
|
|
17
|
+
names: ['quint', 'qui', 'qnt', 'pentet', 'pnt', 'pent'],
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
label: 'sextet',
|
|
21
|
+
value: 'h',
|
|
22
|
+
multiplicity: 6,
|
|
23
|
+
names: ['x', 'sxt', 'sext', 'hexuplet'],
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
label: 'septet',
|
|
27
|
+
value: 'p',
|
|
28
|
+
multiplicity: 7,
|
|
29
|
+
names: ['sept', 'spt', 'heptet', 'hpt', 'hept'],
|
|
30
|
+
},
|
|
31
|
+
{ label: 'octet', value: 'o', multiplicity: 8, names: ['oct'] },
|
|
32
|
+
{ label: 'nonet', value: 'n', multiplicity: 9, names: ['non'] },
|
|
33
|
+
{ label: 'massive', value: 'm', multiplicity: null, names: [] },
|
|
34
|
+
];
|
|
35
|
+
|
|
@@ -1,11 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
't',
|
|
5
|
-
'q',
|
|
6
|
-
'quint',
|
|
7
|
-
'h',
|
|
8
|
-
'sept',
|
|
9
|
-
'o',
|
|
10
|
-
'n',
|
|
11
|
-
];
|
|
1
|
+
import { MultiplicityPatterns } from "./MultiplicityPatterns";
|
|
2
|
+
|
|
3
|
+
export const couplingPatterns = MultiplicityPatterns.map((m) => m.value);
|
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
oct: 7,
|
|
12
|
-
o: 7,
|
|
13
|
-
non: 8,
|
|
14
|
-
n: 8,
|
|
15
|
-
};
|
|
1
|
+
import { MultiplicityPatterns } from "./MultiplicityPatterns";
|
|
2
|
+
|
|
3
|
+
const result: { [key: string]: number } = {};
|
|
4
|
+
for (const { value, multiplicity, names} of MultiplicityPatterns) {
|
|
5
|
+
if (multiplicity) result[value] = multiplicity - 1;
|
|
6
|
+
for (const name of names) {
|
|
7
|
+
if (multiplicity) result[name] = multiplicity -1 ;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
export const couplingValues = result;
|
package/src/index.ts
CHANGED
|
@@ -26,8 +26,10 @@ export * from './signals/signalsToXY';
|
|
|
26
26
|
export * from './signals/signals2DToZ';
|
|
27
27
|
export * from './signals/optimizeSignals';
|
|
28
28
|
export * from './signals/signalsToFID';
|
|
29
|
+
export * from './signal/signalJoinCouplings';
|
|
29
30
|
|
|
30
31
|
export * from './utilities/resurrect';
|
|
32
|
+
export * from './utilities/splitPatterns';
|
|
31
33
|
export * from './utilities/rangeFromSignal';
|
|
32
34
|
export * from './utilities/getFrequency';
|
|
33
35
|
|
|
@@ -47,6 +49,8 @@ export * from './ranges/markSolventSignal';
|
|
|
47
49
|
|
|
48
50
|
export * from './apodization/apodization';
|
|
49
51
|
|
|
52
|
+
export * from './constants/MultiplicityPatterns';
|
|
53
|
+
|
|
50
54
|
export type { NMRSignal1D } from './signals/NMRSignal1D';
|
|
51
55
|
export type { NMRSignal2D, Signal2DProjection } from './xyz/NMRSignal2D';
|
|
52
56
|
export type { NMRRange } from './xy/NMRRange';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { getDiastereotopicAtomIDs } from 'openchemlib-utils';
|
|
2
1
|
import type { Molecule } from 'openchemlib/full';
|
|
2
|
+
import { getDiastereotopicAtomIDs } from 'openchemlib-utils';
|
|
3
3
|
|
|
4
4
|
import type { Prediction1D } from './Prediction1D';
|
|
5
5
|
import { predictCOSY } from './predictCOSY';
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { v4 as generateID } from '@lukeed/uuid';
|
|
2
|
-
import fetch from 'cross-fetch';
|
|
3
|
-
import { getDiastereotopicAtomIDs } from 'openchemlib-utils';
|
|
4
2
|
import type { Molecule } from 'openchemlib/full';
|
|
3
|
+
import { getDiastereotopicAtomIDs } from 'openchemlib-utils';
|
|
5
4
|
|
|
6
5
|
import { setIDs } from '../peaks/util/setIDs';
|
|
7
6
|
import type { NMRSignal1D } from '../signals/NMRSignal1D';
|
|
@@ -14,25 +13,7 @@ import { fetchPrediction } from './utils/fetchPrediction';
|
|
|
14
13
|
import { getFilteredIDiaIDs } from './utils/getFilteredIDiaIDs';
|
|
15
14
|
import { Prediction, queryByHose } from './utils/queryByHOSE';
|
|
16
15
|
|
|
17
|
-
const cache: { [key: string]: DataBaseStructure } = {};
|
|
18
|
-
|
|
19
|
-
async function loadDB(
|
|
20
|
-
url = 'https://www.lactame.com/lib/nmr-processing-data/20210711/carbon.js',
|
|
21
|
-
) {
|
|
22
|
-
if (cache[url]) {
|
|
23
|
-
return cache[url];
|
|
24
|
-
}
|
|
25
|
-
const response = await fetch(url);
|
|
26
|
-
const database: DataBaseStructure = await response.json();
|
|
27
|
-
cache[url] = database;
|
|
28
|
-
return database;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
16
|
export interface PredictCarbonOptions {
|
|
32
|
-
/**
|
|
33
|
-
* URL pointing to a database in json format
|
|
34
|
-
*/
|
|
35
|
-
url?: string;
|
|
36
17
|
/**
|
|
37
18
|
* custom database, each entry in the levels should has
|
|
38
19
|
* an array as value [median] or [median, mean, sd, min, max, nb] for statistic purpose.
|
|
@@ -76,18 +57,25 @@ export async function predictCarbon(
|
|
|
76
57
|
molecule: Molecule,
|
|
77
58
|
options: PredictCarbonOptions = {},
|
|
78
59
|
): Promise<Prediction1D> {
|
|
60
|
+
if (molecule.getAllAtoms() === 0) {
|
|
61
|
+
return {
|
|
62
|
+
molfile: molecule.toMolfile(),
|
|
63
|
+
nucleus: '13C',
|
|
64
|
+
diaIDs: [],
|
|
65
|
+
joinedSignals: [],
|
|
66
|
+
signals: [],
|
|
67
|
+
ranges: [],
|
|
68
|
+
molecule,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
|
|
79
72
|
let {
|
|
80
|
-
url,
|
|
81
73
|
database,
|
|
82
|
-
webserviceURL,
|
|
74
|
+
webserviceURL = 'https://nmr-prediction.service.zakodium.com/v1/predict/carbon',
|
|
83
75
|
diaIDs = getDiastereotopicAtomIDs(molecule),
|
|
84
76
|
} = options;
|
|
85
77
|
|
|
86
|
-
if (
|
|
87
|
-
return fetchPrediction(molecule, { webserviceURL });
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
if (!database) database = await loadDB(url);
|
|
78
|
+
if (!database) return fetchPrediction(molecule, { webserviceURL });
|
|
91
79
|
|
|
92
80
|
if (!database) {
|
|
93
81
|
throw new Error('There is not a database');
|