nmr-processing 9.7.7-pre.1689587612 → 9.7.7
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/constants/MultiplicityPatterns.js +1 -1
- package/lib/constants/MultiplicityPatterns.js.map +1 -1
- package/lib/multiplicity/findMultiplet.js +1 -1
- package/lib/multiplicity/findMultiplet.js.map +1 -1
- package/lib/signals/simulation/simulate1D.js +1 -1
- package/lib/signals/simulation/simulate1D.js.map +1 -1
- package/lib/signals/simulation/simulateXYPeaks.js +1 -1
- package/lib/signals/simulation/simulateXYPeaks.js.map +1 -1
- package/lib/signals/spinSystem.d.ts +2 -2
- package/lib/signals/utils/ensureSpinSystemProps.d.ts +2 -2
- package/lib/signals/utils/ensureSpinSystemProps.js +12 -8
- package/lib/signals/utils/ensureSpinSystemProps.js.map +1 -1
- package/lib/utilities/resurrect.js +2 -0
- package/lib/utilities/resurrect.js.map +1 -1
- package/lib/utilities/resurrectRange.js +1 -1
- package/lib/utilities/resurrectRange.js.map +1 -1
- package/lib-esm/constants/MultiplicityPatterns.js +1 -1
- package/lib-esm/constants/MultiplicityPatterns.js.map +1 -1
- package/lib-esm/multiplicity/findMultiplet.js +1 -1
- package/lib-esm/multiplicity/findMultiplet.js.map +1 -1
- package/lib-esm/signals/simulation/simulate1D.js +1 -1
- package/lib-esm/signals/simulation/simulate1D.js.map +1 -1
- package/lib-esm/signals/simulation/simulateXYPeaks.js +1 -1
- package/lib-esm/signals/simulation/simulateXYPeaks.js.map +1 -1
- package/lib-esm/signals/utils/ensureSpinSystemProps.js +12 -8
- package/lib-esm/signals/utils/ensureSpinSystemProps.js.map +1 -1
- package/lib-esm/utilities/resurrect.js +2 -0
- package/lib-esm/utilities/resurrect.js.map +1 -1
- package/lib-esm/utilities/resurrectRange.js +1 -1
- package/lib-esm/utilities/resurrectRange.js.map +1 -1
- package/package.json +1 -1
- package/src/constants/MultiplicityPatterns.ts +1 -1
- package/src/multiplicity/findMultiplet.ts +1 -1
- package/src/signals/simulation/simulate1D.ts +1 -1
- package/src/signals/simulation/simulateXYPeaks.ts +1 -1
- package/src/signals/spinSystem.ts +2 -2
- package/src/signals/utils/ensureSpinSystemProps.ts +16 -12
- package/src/utilities/resurrect.ts +2 -0
- package/src/utilities/resurrectRange.ts +1 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MultiplicityPatterns = void 0;
|
|
4
4
|
exports.MultiplicityPatterns = [
|
|
5
|
-
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s'] },
|
|
5
|
+
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s', 'br. s'] },
|
|
6
6
|
{ label: 'triplet', value: 't', multiplicity: 3, names: [] },
|
|
7
7
|
{ label: 'doublet', value: 'd', multiplicity: 2, names: [] },
|
|
8
8
|
{ label: 'quartet', value: 'q', multiplicity: 4, names: [] },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiplicityPatterns.js","sourceRoot":"","sources":["../../src/constants/MultiplicityPatterns.ts"],"names":[],"mappings":";;;AAQa,QAAA,oBAAoB,GAA0B;IACzD,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"MultiplicityPatterns.js","sourceRoot":"","sources":["../../src/constants/MultiplicityPatterns.ts"],"names":[],"mappings":";;;AAQa,QAAA,oBAAoB,GAA0B;IACzD,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;IAC3E,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,GAAG,EAAE,OAAO;QACZ,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,GAAG,EAAE,MAAM;QACX,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"}
|
|
@@ -9,7 +9,7 @@ const __1 = require("..");
|
|
|
9
9
|
function findMultiplet(name) {
|
|
10
10
|
return __1.MultiplicityPatterns.find((multiplet) => {
|
|
11
11
|
const { label, value, names } = multiplet;
|
|
12
|
-
return [label, value, ...names].includes(name);
|
|
12
|
+
return [label, value, ...names].includes(name.replace(/\./, ''));
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
15
|
exports.findMultiplet = findMultiplet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findMultiplet.js","sourceRoot":"","sources":["../../src/multiplicity/findMultiplet.ts"],"names":[],"mappings":";;;AAAA,0BAA0C;AAE1C;;;GAGG;AAEH,SAAgB,aAAa,CAAC,IAAY;IACxC,OAAO,wBAAoB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QAC1C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"findMultiplet.js","sourceRoot":"","sources":["../../src/multiplicity/findMultiplet.ts"],"names":[],"mappings":";;;AAAA,0BAA0C;AAE1C;;;GAGG;AAEH,SAAgB,aAAa,CAAC,IAAY;IACxC,OAAO,wBAAoB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QAC1C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC;AALD,sCAKC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.simulate1D = void 0;
|
|
4
4
|
const spectrum_generator_1 = require("spectrum-generator");
|
|
5
|
-
const simulateXYPeaks_1 = require("./simulateXYPeaks");
|
|
6
5
|
const ensureSpinSystemProps_1 = require("../utils/ensureSpinSystemProps");
|
|
6
|
+
const simulateXYPeaks_1 = require("./simulateXYPeaks");
|
|
7
7
|
/**
|
|
8
8
|
* This function simulates a one dimensional nmr spectrum. This function returns an array containing the relative intensities of the spectrum in the specified simulation window (from-to).
|
|
9
9
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulate1D.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulate1D.ts"],"names":[],"mappings":";;;AACA,2DAAsD;
|
|
1
|
+
{"version":3,"file":"simulate1D.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulate1D.ts"],"names":[],"mappings":";;;AACA,2DAAsD;AAGtD,0EAAuE;AAGvE,uDAAoD;AAEpD;;GAEG;AACH,SAAgB,UAAU,CACxB,eAA2B,EAC3B,UAA6B,EAAE;IAE/B,IAAI,EACF,SAAS,GAAG,CAAC,EACb,SAAS,EAAE,YAAY,GAAG,GAAG,EAC7B,IAAI,GAAG,CAAC,EACR,EAAE,GAAG,EAAE,EACP,QAAQ,GAAG,IAAI,EACf,KAAK,GAAG;QACN,IAAI,EAAE,UAAU;KACjB,GACF,GAAG,OAAO,CAAC;IAEZ,MAAM,UAAU,GAAG,IAAA,6CAAqB,EAAC,eAAe,CAAC,CAAC;IAC1D,IAAI,SAAS,GAAG,SAAS,GAAG,YAAY,CAAC;IAEzC,MAAM,OAAO,GAAG,IAAA,iCAAe,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAErD,OAAO,IAAA,qCAAgB,EAAC,OAAO,EAAE;QAC/B,SAAS,EAAE;YACT,IAAI;YACJ,EAAE;YACF,QAAQ;SACT;QACD,WAAW,EAAE;YACX,KAAK;YACL,KAAK,EAAE,SAAS;SACjB;KACF,CAAC,CAAC;AACL,CAAC;AA/BD,gCA+BC"}
|
|
@@ -7,8 +7,8 @@ exports.simulateXYPeaks = void 0;
|
|
|
7
7
|
const binary_search_1 = __importDefault(require("binary-search"));
|
|
8
8
|
const ml_matrix_1 = require("ml-matrix");
|
|
9
9
|
const ml_sparse_matrix_1 = require("ml-sparse-matrix");
|
|
10
|
-
const getPauliMatrix_1 = __importDefault(require("./getPauliMatrix"));
|
|
11
10
|
const ensureSpinSystemProps_1 = require("../utils/ensureSpinSystemProps");
|
|
11
|
+
const getPauliMatrix_1 = __importDefault(require("./getPauliMatrix"));
|
|
12
12
|
const smallValue = 1e-2;
|
|
13
13
|
function simulateXYPeaks(
|
|
14
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulateXYPeaks.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulateXYPeaks.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAyC;AACzC,yCAAwC;AAGxC,uDAAgD;
|
|
1
|
+
{"version":3,"file":"simulateXYPeaks.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulateXYPeaks.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export interface SpinSystem {
|
|
|
7
7
|
/**
|
|
8
8
|
* Matrix of coupling values between spins.
|
|
9
9
|
*/
|
|
10
|
-
couplingConstants: Matrix;
|
|
10
|
+
couplingConstants: Matrix | number[][];
|
|
11
11
|
/**
|
|
12
12
|
* Array of chemical shifts of the spin system
|
|
13
13
|
*/
|
|
@@ -19,5 +19,5 @@ export interface SpinSystem {
|
|
|
19
19
|
/**
|
|
20
20
|
* Binary matrix based on the coupling constants.
|
|
21
21
|
*/
|
|
22
|
-
connectivity?: Matrix;
|
|
22
|
+
connectivity?: Matrix | number[][];
|
|
23
23
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import Matrix from 'ml-matrix';
|
|
2
2
|
import { SpinSystem } from '../spinSystem';
|
|
3
3
|
export declare function ensureSpinSystemProps(spinSystem: SpinSystem): {
|
|
4
|
+
levels: any[];
|
|
4
5
|
clusters: number[][];
|
|
6
|
+
connectivity: Matrix;
|
|
5
7
|
couplingConstants: Matrix;
|
|
6
8
|
chemicalShifts: number[];
|
|
7
|
-
levels: any[];
|
|
8
|
-
connectivity: Matrix;
|
|
9
9
|
};
|
|
@@ -7,16 +7,20 @@ exports.ensureSpinSystemProps = void 0;
|
|
|
7
7
|
const ml_matrix_1 = __importDefault(require("ml-matrix"));
|
|
8
8
|
const ml_simple_clustering_1 = __importDefault(require("ml-simple-clustering"));
|
|
9
9
|
function ensureSpinSystemProps(spinSystem) {
|
|
10
|
-
const { couplingConstants } = spinSystem;
|
|
11
|
-
const
|
|
10
|
+
const { couplingConstants, connectivity } = spinSystem;
|
|
11
|
+
const nCouplingConstants = ml_matrix_1.default.checkMatrix(couplingConstants);
|
|
12
|
+
const nConnectivity = connectivity
|
|
13
|
+
? ml_matrix_1.default.checkMatrix(connectivity)
|
|
14
|
+
: connectivityMatrixFromCouplingMatrix(nCouplingConstants);
|
|
15
|
+
const { levels = new Array(nConnectivity.rows).fill(2), clusters = (0, ml_simple_clustering_1.default)(nConnectivity.to2DArray(), {
|
|
16
|
+
out: 'indexes',
|
|
17
|
+
}), } = spinSystem;
|
|
12
18
|
return {
|
|
13
|
-
levels,
|
|
14
|
-
clusters: clusters ||
|
|
15
|
-
(0, ml_simple_clustering_1.default)(connectivity.to2DArray(), {
|
|
16
|
-
out: 'indexes',
|
|
17
|
-
}),
|
|
18
|
-
connectivity,
|
|
19
19
|
...spinSystem,
|
|
20
|
+
levels,
|
|
21
|
+
clusters,
|
|
22
|
+
connectivity: nConnectivity,
|
|
23
|
+
couplingConstants: nCouplingConstants,
|
|
20
24
|
};
|
|
21
25
|
}
|
|
22
26
|
exports.ensureSpinSystemProps = ensureSpinSystemProps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureSpinSystemProps.js","sourceRoot":"","sources":["../../../src/signals/utils/ensureSpinSystemProps.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA+B;
|
|
1
|
+
{"version":3,"file":"ensureSpinSystemProps.js","sourceRoot":"","sources":["../../../src/signals/utils/ensureSpinSystemProps.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA+B;AAC/B,gFAAoD;AAIpD,SAAgB,qBAAqB,CAAC,UAAsB;IAC1D,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;IAEvD,MAAM,kBAAkB,GAAG,mBAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,YAAY;QAChC,CAAC,CAAC,mBAAM,CAAC,WAAW,CAAC,YAAY,CAAC;QAClC,CAAC,CAAC,oCAAoC,CAAC,kBAAkB,CAAC,CAAC;IAE7D,MAAM,EACJ,MAAM,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAC9C,QAAQ,GAAG,IAAA,8BAAgB,EAAC,aAAa,CAAC,SAAS,EAAE,EAAE;QACrD,GAAG,EAAE,SAAS;KACf,CAAC,GACH,GAAG,UAAU,CAAC;IAEf,OAAO;QACL,GAAG,UAAU;QACb,MAAM;QACN,QAAQ;QACR,YAAY,EAAE,aAAa;QAC3B,iBAAiB,EAAE,kBAAkB;KACtC,CAAC;AACJ,CAAC;AAtBD,sDAsBC;AAED,SAAS,oCAAoC,CAAC,iBAAyB;IACrE,MAAM,YAAY,GAAG,mBAAM,CAAC,IAAI,CAC9B,iBAAiB,CAAC,IAAI,EACtB,iBAAiB,CAAC,IAAI,CACvB,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAClD,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;gBACrC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC3B;SACF;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -9,6 +9,7 @@ function resurrect(acsString) {
|
|
|
9
9
|
ranges: [],
|
|
10
10
|
acsString,
|
|
11
11
|
normalized: acsString
|
|
12
|
+
.replace(/\.\s*$/, '')
|
|
12
13
|
.replace(/[\r\n\t]/g, ' ')
|
|
13
14
|
.replace(/[;:]/g, ',')
|
|
14
15
|
.replace(/\}/g, ')')
|
|
@@ -67,6 +68,7 @@ function createParts(data) {
|
|
|
67
68
|
.map((part) => part.replace(/^\s*(.*?)\s*$/, '$1'))
|
|
68
69
|
.filter((part) => part)
|
|
69
70
|
.map((part) => `${part})`)
|
|
71
|
+
.map((part) => part.replace(/\(([^()]+)\)(?!$)/g, '[$1]'))
|
|
70
72
|
.map((part) => part.split(/[,;](?![^()]*\))/))
|
|
71
73
|
.flat()
|
|
72
74
|
.map((part) => part.replace(/^\s*(.*?)\s*$/, '$1'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resurrect.js","sourceRoot":"","sources":["../../src/utilities/resurrect.ts"],"names":[],"mappings":";;;AAEA,qDAAkD;AAClD,yDAAsD;AActD,SAAgB,SAAS,CAAC,SAAiB;IACzC,MAAM,IAAI,GAAQ;QAChB,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,EAAE;QACV,SAAS;QACT,UAAU,EAAE,SAAS;aAClB,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC;aACzB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;aACrB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;aACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;aACnB,OAAO,CAAC,yCAAyC,EAAE,GAAG,CAAC;KAC3D,CAAC;IACF,WAAW,CAAC,IAAI,CAAC,CAAC;IAClB,UAAU,CAAC,IAAI,CAAC,CAAC;IACjB,OAAO,IAAI,CAAC;AACd,CAAC;
|
|
1
|
+
{"version":3,"file":"resurrect.js","sourceRoot":"","sources":["../../src/utilities/resurrect.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ function resurrectRange(part, options = {}) {
|
|
|
22
22
|
if (integrationParts.length === 1) {
|
|
23
23
|
range.integration = Number(integrationParts[0].replace('H', ''));
|
|
24
24
|
}
|
|
25
|
-
const multiplicityParts = insideParts.filter((part) => part.match(/^([br ]*)[a-zA-Z]
|
|
25
|
+
const multiplicityParts = insideParts.filter((part) => part.match(/^([br ]*)\.*\s*[a-zA-Z]+\.*$/));
|
|
26
26
|
if (multiplicityParts.length === 1) {
|
|
27
27
|
const multiplicity = multiplicityParts[0];
|
|
28
28
|
if (multiplicity === 'm') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":";;;AAAA,iEAA8D;AAI9D,uDAAoD;AACpD,yDAAsD;AAEtD,SAAgB,cAAc,CAAC,IAAY,EAAE,UAAe,EAAE;IAC5D,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,SAAS,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,KAAK,GAAG,IAAA,mCAAgB,EAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO;IAE1B,MAAM,WAAW,GAAG,2CAA2C,CAAC,IAAI,CAClE,KAAK,CAAC,MAAM,CACb,CAAC;IAEF,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM;QAAE,OAAO;IAEhD,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IAE9C,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,MAAM,GAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;IACjD,IAAI,KAAK,GAAa,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;IACtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CACxD,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAC3B,CAAC;IACF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;KAClE;IAED,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CACzD,IAAI,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export const MultiplicityPatterns = [
|
|
2
|
-
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s'] },
|
|
2
|
+
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s', 'br. s'] },
|
|
3
3
|
{ label: 'triplet', value: 't', multiplicity: 3, names: [] },
|
|
4
4
|
{ label: 'doublet', value: 'd', multiplicity: 2, names: [] },
|
|
5
5
|
{ label: 'quartet', value: 'q', multiplicity: 4, names: [] },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiplicityPatterns.js","sourceRoot":"","sources":["../../src/constants/MultiplicityPatterns.ts"],"names":[],"mappings":"AAQA,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;
|
|
1
|
+
{"version":3,"file":"MultiplicityPatterns.js","sourceRoot":"","sources":["../../src/constants/MultiplicityPatterns.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,oBAAoB,GAA0B;IACzD,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;IAC3E,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,GAAG,EAAE,OAAO;QACZ,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,GAAG,EAAE,MAAM;QACX,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"}
|
|
@@ -6,7 +6,7 @@ import { MultiplicityPatterns } from '..';
|
|
|
6
6
|
export function findMultiplet(name) {
|
|
7
7
|
return MultiplicityPatterns.find((multiplet) => {
|
|
8
8
|
const { label, value, names } = multiplet;
|
|
9
|
-
return [label, value, ...names].includes(name);
|
|
9
|
+
return [label, value, ...names].includes(name.replace(/\./, ''));
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
12
|
//# sourceMappingURL=findMultiplet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findMultiplet.js","sourceRoot":"","sources":["../../src/multiplicity/findMultiplet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAE1C;;;GAGG;AAEH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QAC1C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"findMultiplet.js","sourceRoot":"","sources":["../../src/multiplicity/findMultiplet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAE1C;;;GAGG;AAEH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QAC1C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { generateSpectrum } from 'spectrum-generator';
|
|
2
|
-
import { simulateXYPeaks } from './simulateXYPeaks';
|
|
3
2
|
import { ensureSpinSystemProps } from '../utils/ensureSpinSystemProps';
|
|
3
|
+
import { simulateXYPeaks } from './simulateXYPeaks';
|
|
4
4
|
/**
|
|
5
5
|
* This function simulates a one dimensional nmr spectrum. This function returns an array containing the relative intensities of the spectrum in the specified simulation window (from-to).
|
|
6
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulate1D.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulate1D.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"simulate1D.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulate1D.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;GAEG;AACH,MAAM,UAAU,UAAU,CACxB,eAA2B,EAC3B,UAA6B,EAAE;IAE/B,IAAI,EACF,SAAS,GAAG,CAAC,EACb,SAAS,EAAE,YAAY,GAAG,GAAG,EAC7B,IAAI,GAAG,CAAC,EACR,EAAE,GAAG,EAAE,EACP,QAAQ,GAAG,IAAI,EACf,KAAK,GAAG;QACN,IAAI,EAAE,UAAU;KACjB,GACF,GAAG,OAAO,CAAC;IAEZ,MAAM,UAAU,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAC1D,IAAI,SAAS,GAAG,SAAS,GAAG,YAAY,CAAC;IAEzC,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAErD,OAAO,gBAAgB,CAAC,OAAO,EAAE;QAC/B,SAAS,EAAE;YACT,IAAI;YACJ,EAAE;YACF,QAAQ;SACT;QACD,WAAW,EAAE;YACX,KAAK;YACL,KAAK,EAAE,SAAS;SACjB;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import binarySearch from 'binary-search';
|
|
2
2
|
import { Matrix, EVD } from 'ml-matrix';
|
|
3
3
|
import { SparseMatrix } from 'ml-sparse-matrix';
|
|
4
|
-
import getPauliMatrix from './getPauliMatrix';
|
|
5
4
|
import { ensureSpinSystemProps } from '../utils/ensureSpinSystemProps';
|
|
5
|
+
import getPauliMatrix from './getPauliMatrix';
|
|
6
6
|
const smallValue = 1e-2;
|
|
7
7
|
export function simulateXYPeaks(
|
|
8
8
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulateXYPeaks.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulateXYPeaks.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"simulateXYPeaks.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulateXYPeaks.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,UAAU,GAAG,IAAI,CAAC;AAwCxB,MAAM,UAAU,eAAe;AAC7B;;GAEG;AACH,eAA2B,EAC3B,UAA6B,EAAE;IAE/B,IAAI,EACF,SAAS,GAAG,CAAC,EACb,cAAc,GAAG,CAAC,EAClB,SAAS,EAAE,YAAY,GAAG,GAAG,GAC9B,GAAG,OAAO,CAAC;IAEZ,MAAM,UAAU,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAE1D,MAAM,cAAc,GAAG,UAAU,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IACzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC9C,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;KACtD;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAEjC,MAAM,OAAO,GAAoC,EAAE,CAAC;IACpD,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE;QACzC,IAAI,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CACrC,CAAC;QACF,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,WAAW,GAAa,EAAE,CAAC;QAC/B,IAAI,WAAW,GAAa,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,MAAM,GAAG,cAAc,EAAE;YACnC,6EAA6E;YAC7E,2CAA2C;YAC3C,uEAAuE;YACvE,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC;gBAAC,CAAC;YAC7B,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAC3B,WAAW,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACvC,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;oBAClB,IAAI,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBACrE,IAAI,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC;oBACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;wBACpC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;wBACtC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;qBACtB;iBACF;aACF;YAED,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAClC,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC;YAC1B,MAAM,GAAG,CAAC,CAAC;YAEX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC7B,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACrB;SACF;aAAM;YACL,MAAM,WAAW,GAAG,cAAc,CAChC,cAAc,EACd,UAAU,CAAC,iBAAiB,EAC5B,MAAM,EACN,UAAU,CAAC,YAAY,EACvB,WAAW,CACZ,CAAC;YACF,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC;YACjC,uDAAuD;YACvD,+CAA+C;YAC/C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;YACjC,MAAM,CAAC,GAAG,GAAG,CAAC,iBAAiB,CAAC;YAChC,MAAM,KAAK,GAAG,GAAG,CAAC,eAAe,CAAC;YAClC,MAAM,gBAAgB,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;YAC/B,MAAM,GAAG,CAAC,CAAC;YACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;gBAChC,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEjD,IAAI,IAAI,GAAG,CAAC,CAAC;gBACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBAC1B,IAAI,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEjC,IAAI,GAAG,CAAC,CAAC;gBACT,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;oBACpC,IAAI,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,OAAO,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBAC5D,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oBACnB,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBAClD,MAAM,EAAE,CAAC;iBACV;qBAAM;oBACL,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC/C;aACF;YACD,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC3C,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1C,IAAI,CAAC,GAAG,CAAC,EAAE;oBACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;wBAClC,IAAI,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC1B,IAAI,OAAO,KAAK,CAAC,EAAE;4BACjB,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;yBAC5C;qBACF;iBACF;gBACD,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;YAEH,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC3B,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,EAAE;gBAClE,IAAI,CAAC,GAAG,CAAC,EAAE;oBACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;wBAClC,IAAI,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC1B,IAAI,OAAO,KAAK,CAAC,EAAE;4BACjB,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;yBAC9C;qBACF;iBACF;gBACD,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;YACH,MAAM,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;YAEzB,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,MAAM,WAAW,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE;gBACtD,SAAS,EAAE,UAAU;aACtB,CAAC,CAAC;YACH,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAEtC,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE;gBACxD,SAAS,EAAE,UAAU;aACtB,CAAC,CAAC;YACH,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBACtC,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;YACH,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YACvC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBACtC,IAAI,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3C,GAAG,IAAI,GAAG,CAAC;gBAEX,IAAI,IAAI,GAAG,CAAC;gBACZ,IAAI,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClC,IAAI,QAAQ,GAAG,YAAY,CACzB,WAAW,EACX,OAAO,EACP,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAChC,CAAC;gBACF,IAAI,QAAQ,GAAG,CAAC,EAAE;oBAChB,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;oBAC9C,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;iBAC3C;qBAAM;oBACL,WAAW,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;iBAC9B;YACH,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC;QACnC,IAAI,OAAO,GAAG,CAAC,EAAE;YACf,MAAM,IAAI,IAAI,CAAC;YACf,MAAM,IAAI,GAAG,SAAS,GAAG,EAAE,CAAC;YAC5B,IAAI,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;gBAChC,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC,GAAG,IAAI,EAAE;oBACrD,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;oBACvB,OAAO,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC1B,KAAK,EAAE,CAAC;iBACT;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC;wBACX,CAAC,EAAE,CAAC,OAAO,GAAG,KAAK,GAAG,YAAY;wBAClC,CAAC,EAAE,IAAI,GAAG,MAAM;qBACjB,CAAC,CAAC;oBACH,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;oBACzB,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;oBACtB,KAAK,GAAG,CAAC,CAAC;iBACX;aACF;YAED,OAAO,CAAC,IAAI,CAAC;gBACX,CAAC,EAAE,CAAC,OAAO,GAAG,KAAK,GAAG,YAAY;gBAClC,CAAC,EAAE,IAAI,GAAG,MAAM;aACjB,CAAC,CAAC;SACJ;KACF;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,YAAY,CAAC,CAAe,EAAE,GAAW;IAChD,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG;YAAE,OAAO,CAAC,CAAC;QACjC,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC;AACD;;;;;;;;GAQG;AACH,SAAS,cAAc,CACrB,cAAwB,EACxB,iBAAkC,EAClC,YAAsB,EACtB,SAA0B,EAC1B,OAAiB;IAEjB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,OAAO,IAAI,OAAO,EAAE;QAC7B,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;KAClC;IAED,MAAM,UAAU,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEtD,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QAC7C,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAErB,MAAM,CAAC,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAE1C,IAAI,EAAE,EAAE,EAAE,CAAC;QACX,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC5B,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SAClC;QACD,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5B,IAAI,GAAG,CAAC,CAAC;QACT,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7C,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SAClC;QACD,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC/D,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QACpC,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YAChD,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,CAAC,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE1C,IAAI,EAAE,EAAE,EAAE,CAAC;gBACX,IAAI,IAAI,GAAG,CAAC,CAAC;gBACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;oBAC7B,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;iBAClC;gBACD,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE5B,IAAI,GAAG,CAAC,CAAC;gBACT,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC9C,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;iBAClC;gBACD,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE5B,MAAM,KAAK,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;qBACnC,gBAAgB,CAAC,EAAE,CAAC;qBACpB,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvD,KAAK,CAAC,GAAG,CACP,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;qBACrB,gBAAgB,CAAC,EAAE,CAAC;qBACpB,GAAG,CAAC,CAAC,CAAC,CAAC;qBACP,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CACvD,CAAC;gBACF,KAAK,CAAC,GAAG,CACP,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;qBACrB,gBAAgB,CAAC,EAAE,CAAC;qBACpB,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CACvD,CAAC;gBAEF,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC5D;SACF;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
import Matrix from 'ml-matrix';
|
|
2
2
|
import simpleClustering from 'ml-simple-clustering';
|
|
3
3
|
export function ensureSpinSystemProps(spinSystem) {
|
|
4
|
-
const { couplingConstants } = spinSystem;
|
|
5
|
-
const
|
|
4
|
+
const { couplingConstants, connectivity } = spinSystem;
|
|
5
|
+
const nCouplingConstants = Matrix.checkMatrix(couplingConstants);
|
|
6
|
+
const nConnectivity = connectivity
|
|
7
|
+
? Matrix.checkMatrix(connectivity)
|
|
8
|
+
: connectivityMatrixFromCouplingMatrix(nCouplingConstants);
|
|
9
|
+
const { levels = new Array(nConnectivity.rows).fill(2), clusters = simpleClustering(nConnectivity.to2DArray(), {
|
|
10
|
+
out: 'indexes',
|
|
11
|
+
}), } = spinSystem;
|
|
6
12
|
return {
|
|
7
|
-
levels,
|
|
8
|
-
clusters: clusters ||
|
|
9
|
-
simpleClustering(connectivity.to2DArray(), {
|
|
10
|
-
out: 'indexes',
|
|
11
|
-
}),
|
|
12
|
-
connectivity,
|
|
13
13
|
...spinSystem,
|
|
14
|
+
levels,
|
|
15
|
+
clusters,
|
|
16
|
+
connectivity: nConnectivity,
|
|
17
|
+
couplingConstants: nCouplingConstants,
|
|
14
18
|
};
|
|
15
19
|
}
|
|
16
20
|
function connectivityMatrixFromCouplingMatrix(couplingConstants) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureSpinSystemProps.js","sourceRoot":"","sources":["../../../src/signals/utils/ensureSpinSystemProps.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ensureSpinSystemProps.js","sourceRoot":"","sources":["../../../src/signals/utils/ensureSpinSystemProps.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,gBAAgB,MAAM,sBAAsB,CAAC;AAIpD,MAAM,UAAU,qBAAqB,CAAC,UAAsB;IAC1D,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;IAEvD,MAAM,kBAAkB,GAAG,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,YAAY;QAChC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC;QAClC,CAAC,CAAC,oCAAoC,CAAC,kBAAkB,CAAC,CAAC;IAE7D,MAAM,EACJ,MAAM,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAC9C,QAAQ,GAAG,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE;QACrD,GAAG,EAAE,SAAS;KACf,CAAC,GACH,GAAG,UAAU,CAAC;IAEf,OAAO;QACL,GAAG,UAAU;QACb,MAAM;QACN,QAAQ;QACR,YAAY,EAAE,aAAa;QAC3B,iBAAiB,EAAE,kBAAkB;KACtC,CAAC;AACJ,CAAC;AAED,SAAS,oCAAoC,CAAC,iBAAyB;IACrE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAC9B,iBAAiB,CAAC,IAAI,EACtB,iBAAiB,CAAC,IAAI,CACvB,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAClD,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;gBACrC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC3B;SACF;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -6,6 +6,7 @@ export function resurrect(acsString) {
|
|
|
6
6
|
ranges: [],
|
|
7
7
|
acsString,
|
|
8
8
|
normalized: acsString
|
|
9
|
+
.replace(/\.\s*$/, '')
|
|
9
10
|
.replace(/[\r\n\t]/g, ' ')
|
|
10
11
|
.replace(/[;:]/g, ',')
|
|
11
12
|
.replace(/\}/g, ')')
|
|
@@ -63,6 +64,7 @@ function createParts(data) {
|
|
|
63
64
|
.map((part) => part.replace(/^\s*(.*?)\s*$/, '$1'))
|
|
64
65
|
.filter((part) => part)
|
|
65
66
|
.map((part) => `${part})`)
|
|
67
|
+
.map((part) => part.replace(/\(([^()]+)\)(?!$)/g, '[$1]'))
|
|
66
68
|
.map((part) => part.split(/[,;](?![^()]*\))/))
|
|
67
69
|
.flat()
|
|
68
70
|
.map((part) => part.replace(/^\s*(.*?)\s*$/, '$1'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resurrect.js","sourceRoot":"","sources":["../../src/utilities/resurrect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resurrect.js","sourceRoot":"","sources":["../../src/utilities/resurrect.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export function resurrectRange(part, options = {}) {
|
|
|
19
19
|
if (integrationParts.length === 1) {
|
|
20
20
|
range.integration = Number(integrationParts[0].replace('H', ''));
|
|
21
21
|
}
|
|
22
|
-
const multiplicityParts = insideParts.filter((part) => part.match(/^([br ]*)[a-zA-Z]
|
|
22
|
+
const multiplicityParts = insideParts.filter((part) => part.match(/^([br ]*)\.*\s*[a-zA-Z]+\.*$/));
|
|
23
23
|
if (multiplicityParts.length === 1) {
|
|
24
24
|
const multiplicity = multiplicityParts[0];
|
|
25
25
|
if (multiplicity === 'm') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAI9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,UAAe,EAAE;IAC5D,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,SAAS,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO;IAE1B,MAAM,WAAW,GAAG,2CAA2C,CAAC,IAAI,CAClE,KAAK,CAAC,MAAM,CACb,CAAC;IAEF,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM;QAAE,OAAO;IAEhD,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IAE9C,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,MAAM,GAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;IACjD,IAAI,KAAK,GAAa,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;IACtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CACxD,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAC3B,CAAC;IACF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;KAClE;IAED,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CACzD,IAAI,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@ export interface MultipletDefinition {
|
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
export const MultiplicityPatterns: MultipletDefinition[] = [
|
|
10
|
-
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s'] },
|
|
10
|
+
{ label: 'singlet', value: 's', multiplicity: 1, names: ['br s', 'br. s'] },
|
|
11
11
|
{ label: 'triplet', value: 't', multiplicity: 3, names: [] },
|
|
12
12
|
{ label: 'doublet', value: 'd', multiplicity: 2, names: [] },
|
|
13
13
|
{ label: 'quartet', value: 'q', multiplicity: 4, names: [] },
|
|
@@ -8,6 +8,6 @@ import { MultiplicityPatterns } from '..';
|
|
|
8
8
|
export function findMultiplet(name: string) {
|
|
9
9
|
return MultiplicityPatterns.find((multiplet) => {
|
|
10
10
|
const { label, value, names } = multiplet;
|
|
11
|
-
return [label, value, ...names].includes(name);
|
|
11
|
+
return [label, value, ...names].includes(name.replace(/\./, ''));
|
|
12
12
|
});
|
|
13
13
|
}
|
|
@@ -2,10 +2,10 @@ import { DataXY } from 'cheminfo-types';
|
|
|
2
2
|
import { generateSpectrum } from 'spectrum-generator';
|
|
3
3
|
|
|
4
4
|
import type { SpinSystem } from '../spinSystem';
|
|
5
|
+
import { ensureSpinSystemProps } from '../utils/ensureSpinSystemProps';
|
|
5
6
|
|
|
6
7
|
import type { Simulate1DOptions } from './simulateXYPeaks';
|
|
7
8
|
import { simulateXYPeaks } from './simulateXYPeaks';
|
|
8
|
-
import { ensureSpinSystemProps } from '../utils/ensureSpinSystemProps';
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
11
|
* This function simulates a one dimensional nmr spectrum. This function returns an array containing the relative intensities of the spectrum in the specified simulation window (from-to).
|
|
@@ -5,9 +5,9 @@ import type { Shape1D } from 'ml-peak-shape-generator';
|
|
|
5
5
|
import { SparseMatrix } from 'ml-sparse-matrix';
|
|
6
6
|
|
|
7
7
|
import type { SpinSystem } from '../spinSystem';
|
|
8
|
+
import { ensureSpinSystemProps } from '../utils/ensureSpinSystemProps';
|
|
8
9
|
|
|
9
10
|
import getPauliMatrix from './getPauliMatrix';
|
|
10
|
-
import { ensureSpinSystemProps } from '../utils/ensureSpinSystemProps';
|
|
11
11
|
|
|
12
12
|
const smallValue = 1e-2;
|
|
13
13
|
|
|
@@ -8,7 +8,7 @@ export interface SpinSystem {
|
|
|
8
8
|
/**
|
|
9
9
|
* Matrix of coupling values between spins.
|
|
10
10
|
*/
|
|
11
|
-
couplingConstants: Matrix;
|
|
11
|
+
couplingConstants: Matrix | number[][];
|
|
12
12
|
/**
|
|
13
13
|
* Array of chemical shifts of the spin system
|
|
14
14
|
*/
|
|
@@ -20,5 +20,5 @@ export interface SpinSystem {
|
|
|
20
20
|
/**
|
|
21
21
|
* Binary matrix based on the coupling constants.
|
|
22
22
|
*/
|
|
23
|
-
connectivity?: Matrix;
|
|
23
|
+
connectivity?: Matrix | number[][];
|
|
24
24
|
}
|
|
@@ -1,25 +1,29 @@
|
|
|
1
1
|
import Matrix from 'ml-matrix';
|
|
2
|
-
import { SpinSystem } from '../spinSystem';
|
|
3
2
|
import simpleClustering from 'ml-simple-clustering';
|
|
4
3
|
|
|
4
|
+
import { SpinSystem } from '../spinSystem';
|
|
5
|
+
|
|
5
6
|
export function ensureSpinSystemProps(spinSystem: SpinSystem) {
|
|
6
|
-
const { couplingConstants } = spinSystem;
|
|
7
|
+
const { couplingConstants, connectivity } = spinSystem;
|
|
8
|
+
|
|
9
|
+
const nCouplingConstants = Matrix.checkMatrix(couplingConstants);
|
|
10
|
+
const nConnectivity = connectivity
|
|
11
|
+
? Matrix.checkMatrix(connectivity)
|
|
12
|
+
: connectivityMatrixFromCouplingMatrix(nCouplingConstants);
|
|
7
13
|
|
|
8
14
|
const {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
15
|
+
levels = new Array(nConnectivity.rows).fill(2),
|
|
16
|
+
clusters = simpleClustering(nConnectivity.to2DArray(), {
|
|
17
|
+
out: 'indexes',
|
|
18
|
+
}),
|
|
12
19
|
} = spinSystem;
|
|
13
20
|
|
|
14
21
|
return {
|
|
15
|
-
levels,
|
|
16
|
-
clusters:
|
|
17
|
-
clusters ||
|
|
18
|
-
simpleClustering(connectivity.to2DArray(), {
|
|
19
|
-
out: 'indexes',
|
|
20
|
-
}),
|
|
21
|
-
connectivity,
|
|
22
22
|
...spinSystem,
|
|
23
|
+
levels,
|
|
24
|
+
clusters,
|
|
25
|
+
connectivity: nConnectivity,
|
|
26
|
+
couplingConstants: nCouplingConstants,
|
|
23
27
|
};
|
|
24
28
|
}
|
|
25
29
|
|
|
@@ -21,6 +21,7 @@ export function resurrect(acsString: string) {
|
|
|
21
21
|
ranges: [],
|
|
22
22
|
acsString,
|
|
23
23
|
normalized: acsString
|
|
24
|
+
.replace(/\.\s*$/, '')
|
|
24
25
|
.replace(/[\r\n\t]/g, ' ')
|
|
25
26
|
.replace(/[;:]/g, ',')
|
|
26
27
|
.replace(/\}/g, ')')
|
|
@@ -83,6 +84,7 @@ function createParts(data: DataResurrect) {
|
|
|
83
84
|
.map((part) => part.replace(/^\s*(.*?)\s*$/, '$1'))
|
|
84
85
|
.filter((part) => part)
|
|
85
86
|
.map((part) => `${part})`)
|
|
87
|
+
.map((part) => part.replace(/\(([^()]+)\)(?!$)/g, '[$1]'))
|
|
86
88
|
.map((part) => part.split(/[,;](?![^()]*\))/))
|
|
87
89
|
.flat()
|
|
88
90
|
.map((part) => part.replace(/^\s*(.*?)\s*$/, '$1'))
|
|
@@ -31,7 +31,7 @@ export function resurrectRange(part: string, options: any = {}) {
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
const multiplicityParts = insideParts.filter((part: any) =>
|
|
34
|
-
part.match(/^([br ]*)[a-zA-Z]
|
|
34
|
+
part.match(/^([br ]*)\.*\s*[a-zA-Z]+\.*$/),
|
|
35
35
|
);
|
|
36
36
|
if (multiplicityParts.length === 1) {
|
|
37
37
|
const multiplicity = multiplicityParts[0];
|