nmr-processing 8.0.0 → 8.3.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/apodization/apodization.d.ts +22 -0
- package/lib/apodization/apodization.js +18 -0
- package/lib/apodization/apodization.js.map +1 -0
- package/lib/apodization/applyWindow.d.ts +28 -0
- package/lib/apodization/applyWindow.js +20 -0
- package/lib/apodization/applyWindow.js.map +1 -0
- package/lib/apodization/compose.d.ts +23 -0
- package/lib/apodization/compose.js +25 -0
- package/lib/apodization/compose.js.map +1 -0
- package/lib/apodization/getFunction.d.ts +2 -0
- package/lib/apodization/getFunction.js +18 -0
- package/lib/apodization/getFunction.js.map +1 -0
- package/lib/apodization/shapes/WindowFunctions.d.ts +12 -0
- package/lib/apodization/shapes/WindowFunctions.js +3 -0
- package/lib/apodization/shapes/WindowFunctions.js.map +1 -0
- package/lib/apodization/shapes/exponential.d.ts +11 -0
- package/lib/apodization/shapes/exponential.js +10 -0
- package/lib/apodization/shapes/exponential.js.map +1 -0
- package/lib/apodization/shapes/lorentzToGauss.d.ts +26 -0
- package/lib/apodization/shapes/lorentzToGauss.js +15 -0
- package/lib/apodization/shapes/lorentzToGauss.js.map +1 -0
- package/lib/apodization/utils/getData.d.ts +4 -0
- package/lib/apodization/utils/getData.js +21 -0
- package/lib/apodization/utils/getData.js.map +1 -0
- package/lib/assignment/utils/buildAssignments.d.ts +2 -2
- package/lib/assignment/utils/exploreTreeRec.js +1 -1
- package/lib/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib/assignment/utils/getAssignment/checkIDs.d.ts +1 -1
- package/lib/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib/databases/DatabaseNMREntry.d.ts +2 -0
- package/lib/index.d.ts +5 -1
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/peaks/NMRPeak1D.d.ts +0 -1
- package/lib/peaks/peaksToRanges.d.ts +16 -0
- package/lib/peaks/peaksToRanges.js +3 -2
- package/lib/peaks/peaksToRanges.js.map +1 -1
- package/lib/peaks/solventSuppression.d.ts +6 -0
- package/lib/peaks/solventSuppression.js +158 -0
- package/lib/peaks/solventSuppression.js.map +1 -0
- package/lib/peaks/util/jAnalyzer.d.ts +1 -1
- package/lib/peaks/util/jAnalyzer.js +26 -31
- package/lib/peaks/util/jAnalyzer.js.map +1 -1
- package/lib/peaks/util/peakOptimizer.js +12 -16
- package/lib/peaks/util/peakOptimizer.js.map +1 -1
- package/lib/prediction/predictAllSpectra.js +7 -9
- package/lib/prediction/predictAllSpectra.js.map +1 -1
- package/lib/prediction/predictCarbon.js +1 -1
- package/lib/prediction/predictCarbon.js.map +1 -1
- package/lib/prediction/utils/queryByHOSE.js +1 -1
- package/lib/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib/ranges/markSolventSignal.d.ts +3 -0
- package/lib/ranges/markSolventSignal.js +107 -0
- package/lib/ranges/markSolventSignal.js.map +1 -0
- package/lib/ranges/rangesToACS.js +8 -4
- package/lib/ranges/rangesToACS.js.map +1 -1
- package/lib/ranges/rangesToXY.js +27 -3
- package/lib/ranges/rangesToXY.js.map +1 -1
- package/lib/signals/addDummySignals.d.ts +2 -0
- package/lib/signals/addDummySignals.js +56 -0
- package/lib/signals/addDummySignals.js.map +1 -0
- package/lib/signals/hackSignalsToXY.js +2 -48
- package/lib/signals/hackSignalsToXY.js.map +1 -1
- package/lib/signals/simulation/getPauliMatrix.js.map +1 -1
- package/lib/signals/simulation/simulate1D.d.ts +1 -39
- package/lib/signals/simulation/simulate1D.js +13 -240
- package/lib/signals/simulation/simulate1D.js.map +1 -1
- package/lib/signals/simulation/simulateXYPeaks.d.ts +47 -0
- package/lib/signals/simulation/simulateXYPeaks.js +246 -0
- package/lib/signals/simulation/simulateXYPeaks.js.map +1 -0
- package/lib/signals/simulation/splitSpinSystem.js +11 -13
- package/lib/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib/utilities/getFrequency.d.ts +1 -1
- package/lib/utilities/getFrequency.js +4 -4
- package/lib/utilities/getFrequency.js.map +1 -1
- package/lib/utilities/rangeFromSignal.d.ts +9 -5
- package/lib/utilities/rangeFromSignal.js +7 -7
- package/lib/utilities/rangeFromSignal.js.map +1 -1
- package/lib/utilities/resurrectRange.js +4 -7
- package/lib/utilities/resurrectRange.js.map +1 -1
- package/lib/xyz/util/formatZone.d.ts +3 -0
- package/lib/xyz/util/formatZone.js +38 -0
- package/lib/xyz/util/formatZone.js.map +1 -0
- package/lib/xyz/xyzAutoZonesPicking.d.ts +1 -2
- package/lib/xyz/xyzAutoZonesPicking.js +2 -34
- package/lib/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/lib/xyz/xyzJResAnalyzer.d.ts +6 -1
- package/lib/xyz/xyzJResAnalyzer.js +9 -8
- package/lib/xyz/xyzJResAnalyzer.js.map +1 -1
- package/lib-esm/apodization/apodization.js +14 -0
- package/lib-esm/apodization/apodization.js.map +1 -0
- package/lib-esm/apodization/applyWindow.js +16 -0
- package/lib-esm/apodization/applyWindow.js.map +1 -0
- package/lib-esm/apodization/compose.js +21 -0
- package/lib-esm/apodization/compose.js.map +1 -0
- package/lib-esm/apodization/getFunction.js +14 -0
- package/lib-esm/apodization/getFunction.js.map +1 -0
- package/lib-esm/apodization/shapes/WindowFunctions.js +2 -0
- package/lib-esm/apodization/shapes/WindowFunctions.js.map +1 -0
- package/lib-esm/apodization/shapes/exponential.js +6 -0
- package/lib-esm/apodization/shapes/exponential.js.map +1 -0
- package/lib-esm/apodization/shapes/lorentzToGauss.js +11 -0
- package/lib-esm/apodization/shapes/lorentzToGauss.js.map +1 -0
- package/lib-esm/apodization/utils/getData.js +17 -0
- package/lib-esm/apodization/utils/getData.js.map +1 -0
- package/lib-esm/assignment/utils/buildAssignments.js +3 -3
- package/lib-esm/assignment/utils/exploreTreeRec.js +1 -1
- package/lib-esm/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js +3 -3
- package/lib-esm/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib-esm/index.js +5 -1
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/peaks/peaksToRanges.js +2 -2
- package/lib-esm/peaks/peaksToRanges.js.map +1 -1
- package/lib-esm/peaks/solventSuppression.js +154 -0
- package/lib-esm/peaks/solventSuppression.js.map +1 -0
- package/lib-esm/peaks/util/jAnalyzer.js +26 -31
- package/lib-esm/peaks/util/jAnalyzer.js.map +1 -1
- package/lib-esm/peaks/util/peakOptimizer.js +12 -16
- package/lib-esm/peaks/util/peakOptimizer.js.map +1 -1
- package/lib-esm/prediction/predictAllSpectra.js +7 -9
- package/lib-esm/prediction/predictAllSpectra.js.map +1 -1
- package/lib-esm/prediction/predictCarbon.js +1 -1
- package/lib-esm/prediction/predictCarbon.js.map +1 -1
- package/lib-esm/prediction/utils/queryByHOSE.js +1 -1
- package/lib-esm/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib-esm/ranges/markSolventSignal.js +100 -0
- package/lib-esm/ranges/markSolventSignal.js.map +1 -0
- package/lib-esm/ranges/rangesToACS.js +8 -4
- package/lib-esm/ranges/rangesToACS.js.map +1 -1
- package/lib-esm/ranges/rangesToXY.js +27 -3
- package/lib-esm/ranges/rangesToXY.js.map +1 -1
- package/lib-esm/signals/addDummySignals.js +52 -0
- package/lib-esm/signals/addDummySignals.js.map +1 -0
- package/lib-esm/signals/hackSignalsToXY.js +2 -48
- package/lib-esm/signals/hackSignalsToXY.js.map +1 -1
- package/lib-esm/signals/simulation/getPauliMatrix.js.map +1 -1
- package/lib-esm/signals/simulation/simulate1D.js +14 -238
- package/lib-esm/signals/simulation/simulate1D.js.map +1 -1
- package/lib-esm/signals/simulation/simulateXYPeaks.js +239 -0
- package/lib-esm/signals/simulation/simulateXYPeaks.js.map +1 -0
- package/lib-esm/signals/simulation/splitSpinSystem.js +11 -13
- package/lib-esm/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib-esm/utilities/getFrequency.js +1 -1
- package/lib-esm/utilities/getFrequency.js.map +1 -1
- package/lib-esm/utilities/rangeFromSignal.js +7 -7
- package/lib-esm/utilities/rangeFromSignal.js.map +1 -1
- package/lib-esm/utilities/resurrectRange.js +4 -7
- package/lib-esm/utilities/resurrectRange.js.map +1 -1
- package/lib-esm/xyz/util/formatZone.js +34 -0
- package/lib-esm/xyz/util/formatZone.js.map +1 -0
- package/lib-esm/xyz/xyzAutoZonesPicking.js +1 -33
- package/lib-esm/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/lib-esm/xyz/xyzJResAnalyzer.js +9 -8
- package/lib-esm/xyz/xyzJResAnalyzer.js.map +1 -1
- package/package.json +16 -14
- package/src/apodization/apodization.ts +34 -0
- package/src/apodization/applyWindow.ts +51 -0
- package/src/apodization/compose.ts +47 -0
- package/src/apodization/getFunction.ts +15 -0
- package/src/apodization/shapes/WindowFunctions.ts +14 -0
- package/src/apodization/shapes/exponential.ts +16 -0
- package/src/apodization/shapes/lorentzToGauss.ts +41 -0
- package/src/apodization/utils/getData.ts +15 -0
- package/src/assignment/utils/buildAssignments.ts +4 -4
- package/src/assignment/utils/exploreTreeRec.ts +1 -1
- package/src/assignment/utils/getAssignment/buildAssignments.ts +3 -3
- package/src/assignment/utils/getAssignment/checkIDs.ts +1 -1
- package/src/databases/DatabaseNMREntry.ts +3 -0
- package/src/index.ts +7 -1
- package/src/peaks/NMRPeak1D.ts +0 -1
- package/src/peaks/peaksToRanges.ts +2 -2
- package/src/peaks/solventSuppression.ts +214 -0
- package/src/peaks/util/jAnalyzer.ts +27 -31
- package/src/peaks/util/peakOptimizer.ts +11 -15
- package/src/prediction/predictAllSpectra.ts +6 -8
- package/src/prediction/predictCarbon.ts +1 -1
- package/src/prediction/utils/queryByHOSE.ts +1 -1
- package/src/ranges/markSolventSignal.ts +121 -0
- package/src/ranges/rangesToACS.ts +9 -10
- package/src/ranges/rangesToXY.ts +33 -4
- package/src/signals/addDummySignals.ts +77 -0
- package/src/signals/hackSignalsToXY.ts +2 -72
- package/src/signals/simulation/getPauliMatrix.ts +1 -1
- package/src/signals/simulation/simulate1D.ts +14 -319
- package/src/signals/simulation/simulateXYPeaks.ts +332 -0
- package/src/signals/simulation/splitSpinSystem.ts +10 -12
- package/src/utilities/getFrequency.ts +1 -1
- package/src/utilities/rangeFromSignal.ts +19 -11
- package/src/utilities/resurrectRange.ts +4 -7
- package/src/xyz/util/formatZone.ts +36 -0
- package/src/xyz/xyzAutoZonesPicking.ts +1 -35
- package/src/xyz/xyzJResAnalyzer.ts +14 -7
- package/lib/constants/gyromagneticRatio.d.ts +0 -6
- package/lib/constants/gyromagneticRatio.js +0 -26
- package/lib/constants/gyromagneticRatio.js.map +0 -1
- package/lib-esm/constants/gyromagneticRatio.js +0 -23
- package/lib-esm/constants/gyromagneticRatio.js.map +0 -1
- package/src/constants/gyromagneticRatio.ts +0 -49
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splitSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/splitSpinSystem.ts"],"names":[],"mappings":";;;AAAA,yCAAkC;AAElC,yCAAmC;AAenC,SAAgB,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,IAAA,iBAAK,EAAC,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;AA7BD,0CA6BC;AASD,SAAS,YAAY,CACnB,OAAgB,EAChB,WAA8B,EAC9B,OAA4B;IAE5B,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAC9D,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,IAAI,cAAc,EAAE;QAC5C,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,KAAK,IAAI,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE;YAClC,IAAI,KAAK,CAAC,IAAI,IAAI,cAAc,EAAE;gBAChC,IAAI,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;gBAClD,2EAA2E;gBAC3E,IAAI,KAAK,GAAG,CAAC,CAAC;gBACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC/B,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;wBACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;4BAC/B,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;gCACpD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCAChB,KAAK,EAAE,CAAC;6BACT;yBACF;wBACD,KAAK,EAAE,CAAC;qBACT;iBACF;gBACD,IAAI,KAAK,IAAI,cAAc,EAAE;oBAC3B,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC3B;qBAAM
|
|
1
|
+
{"version":3,"file":"splitSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/splitSpinSystem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFrequency = void 0;
|
|
4
|
-
const
|
|
4
|
+
const gyromagnetic_ratio_1 = require("gyromagnetic-ratio");
|
|
5
5
|
/**
|
|
6
6
|
* calculate the frequency of a nucleus with respect to a reference nucleus
|
|
7
7
|
*/
|
|
@@ -12,14 +12,14 @@ function getFrequency(
|
|
|
12
12
|
nucleus, observedNucleusData) {
|
|
13
13
|
const { nucleus: obsNucleus, frequency } = observedNucleusData;
|
|
14
14
|
checkExistence(nucleus, obsNucleus);
|
|
15
|
-
return ((frequency *
|
|
16
|
-
|
|
15
|
+
return ((frequency * gyromagnetic_ratio_1.gyromagneticRatio[nucleus]) /
|
|
16
|
+
gyromagnetic_ratio_1.gyromagneticRatio[obsNucleus]);
|
|
17
17
|
}
|
|
18
18
|
exports.getFrequency = getFrequency;
|
|
19
19
|
function checkExistence(...nucleus) {
|
|
20
20
|
let nuclei = [];
|
|
21
21
|
for (const n of nucleus) {
|
|
22
|
-
if (!(n in
|
|
22
|
+
if (!(n in gyromagnetic_ratio_1.gyromagneticRatio)) {
|
|
23
23
|
nuclei.push(n);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFrequency.js","sourceRoot":"","sources":["../../src/utilities/getFrequency.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getFrequency.js","sourceRoot":"","sources":["../../src/utilities/getFrequency.ts"],"names":[],"mappings":";;;AAAA,2DAA+D;AAgB/D;;GAEG;AACH,SAAgB,YAAY;AAC1B;;GAEG;AACH,OAAgB,EAChB,mBAAwC;IAExC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC;IAE/D,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpC,OAAO,CACL,CAAC,SAAS,GAAG,sCAAiB,CAAC,OAAiB,CAAC,CAAC;QAClD,sCAAiB,CAAC,UAAoB,CAAC,CACxC,CAAC;AACJ,CAAC;AAfD,oCAeC;AAED,SAAS,cAAc,CAAC,GAAG,OAAkB;IAC3C,IAAI,MAAM,GAAa,EAAE,CAAC;IAC1B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,IAAI,CAAC,CAAC,CAAC,IAAI,sCAAiB,CAAC,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;KACF;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;KAC3D;AACH,CAAC"}
|
|
@@ -4,14 +4,18 @@ export interface RangeFromSignalOptions {
|
|
|
4
4
|
* nucleus
|
|
5
5
|
* @default '1h'
|
|
6
6
|
*/
|
|
7
|
-
nucleus
|
|
7
|
+
nucleus?: string;
|
|
8
8
|
/**
|
|
9
|
-
* frequency
|
|
9
|
+
* frequency observedhttps://www.wiley.com/en-us/NMR+Data+Processing-p-9780471039006#content-section
|
|
10
10
|
* @default 400
|
|
11
11
|
*/
|
|
12
|
-
frequency
|
|
12
|
+
frequency?: number;
|
|
13
|
+
/**
|
|
14
|
+
* tolerance to the halfWidth, default depends of the nucleus
|
|
15
|
+
*/
|
|
16
|
+
tolerance?: number;
|
|
13
17
|
}
|
|
14
|
-
export declare function rangeFromSignal(signal: NMRSignal1D, options
|
|
18
|
+
export declare function rangeFromSignal(signal: NMRSignal1D, options: RangeFromSignalOptions): {
|
|
15
19
|
from: number;
|
|
16
|
-
to:
|
|
20
|
+
to: number;
|
|
17
21
|
};
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.rangeFromSignal = void 0;
|
|
4
4
|
const couplingValues_1 = require("../constants/couplingValues");
|
|
5
|
-
function rangeFromSignal(signal, options
|
|
5
|
+
function rangeFromSignal(signal, options) {
|
|
6
6
|
const { nucleus = '1h', frequency = 400 } = options;
|
|
7
7
|
const { tolerance = getTolerance(nucleus) / frequency } = options;
|
|
8
|
-
let halfWidth =
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
let halfWidth = 0;
|
|
9
|
+
for (const js of signal.js || []) {
|
|
10
|
+
const { coupling, multiplicity = 'd' } = js;
|
|
11
|
+
halfWidth += (couplingValues_1.couplingValues[multiplicity] * coupling) / frequency;
|
|
12
|
+
}
|
|
13
|
+
halfWidth = tolerance + halfWidth / 2;
|
|
14
14
|
return {
|
|
15
15
|
from: signal.delta - halfWidth,
|
|
16
16
|
to: signal.delta + halfWidth,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rangeFromSignal.js","sourceRoot":"","sources":["../../src/utilities/rangeFromSignal.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;
|
|
1
|
+
{"version":3,"file":"rangeFromSignal.js","sourceRoot":"","sources":["../../src/utilities/rangeFromSignal.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAoB7D,SAAgB,eAAe,CAC7B,MAAmB,EACnB,OAA+B;IAE/B,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,SAAS,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IAElE,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE;QAChC,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;QAC5C,SAAS,IAAI,CAAC,+BAAc,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,GAAG,SAAS,CAAC;KACpE;IAED,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,CAAC,CAAC;IACtC,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS;QAC9B,EAAE,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS;KAC7B,CAAC;AACJ,CAAC;AAlBD,0CAkBC;AAED,SAAS,YAAY,CAAC,OAAe;IACnC,QAAQ,OAAO,CAAC,iBAAiB,EAAE,EAAE;QACnC,KAAK,IAAI;YACP,OAAO,GAAG,CAAC;QACb,KAAK,KAAK;YACR,OAAO,CAAC,CAAC;QACX;YACE,OAAO,CAAC,CAAC;KACZ;AACH,CAAC"}
|
|
@@ -37,13 +37,10 @@ function resurrectRange(part, options = {}) {
|
|
|
37
37
|
signal.multiplicity = multiplicity;
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
else {
|
|
41
|
-
//
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
signal.delta = from;
|
|
45
|
-
signal.multiplicity = multiplicity;
|
|
46
|
-
}
|
|
40
|
+
else if (!isARange) {
|
|
41
|
+
// a complex signal
|
|
42
|
+
signal.delta = from;
|
|
43
|
+
signal.multiplicity = multiplicity;
|
|
47
44
|
}
|
|
48
45
|
}
|
|
49
46
|
const jCouplings = insideParts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":";;;AAGA,uDAAoD;AACpD,yDAAsD;AACtD,mDAAgD;AAEhD,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;IAEtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CACxD,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CACxB,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,aAAa,CAAC,CAC1B,CAAC;IACF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,MAAM,YAAY,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,YAAY,KAAK,GAAG,EAAE;YACxB,IAAI,QAAQ,EAAE;gBACZ,eAAe;gBACf,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC/B,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;aACpC;iBAAM;gBACL,mBAAmB;gBACnB,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;gBACpB,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;aACpC;SACF;aAAM
|
|
1
|
+
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatZones = void 0;
|
|
4
|
+
function formatZones(signals) {
|
|
5
|
+
let zones = [];
|
|
6
|
+
for (const signal of signals) {
|
|
7
|
+
let minMax1 = [Number.MAX_VALUE, 0];
|
|
8
|
+
let minMax2 = [Number.MAX_VALUE, 0];
|
|
9
|
+
for (const peak of signal.peaks || []) {
|
|
10
|
+
if (peak.minX < minMax1[0]) {
|
|
11
|
+
minMax1[0] = peak.minX;
|
|
12
|
+
}
|
|
13
|
+
if (peak.maxX > minMax1[1]) {
|
|
14
|
+
minMax1[1] = peak.maxX;
|
|
15
|
+
}
|
|
16
|
+
if (peak.minY < minMax2[0]) {
|
|
17
|
+
minMax2[0] = peak.minY;
|
|
18
|
+
}
|
|
19
|
+
if (peak.maxY > minMax2[1]) {
|
|
20
|
+
minMax2[1] = peak.maxY;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
zones.push({
|
|
24
|
+
x: {
|
|
25
|
+
from: minMax1[0],
|
|
26
|
+
to: minMax1[1],
|
|
27
|
+
},
|
|
28
|
+
y: {
|
|
29
|
+
from: minMax2[0],
|
|
30
|
+
to: minMax2[1],
|
|
31
|
+
},
|
|
32
|
+
signals: [signal],
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
return zones;
|
|
36
|
+
}
|
|
37
|
+
exports.formatZones = formatZones;
|
|
38
|
+
//# sourceMappingURL=formatZone.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatZone.js","sourceRoot":"","sources":["../../../src/xyz/util/formatZone.ts"],"names":[],"mappings":";;;AAGA,SAAgB,WAAW,CAAC,OAAsB;IAChD,IAAI,KAAK,GAAc,EAAE,CAAC;IAC1B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACpC,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE;YACrC,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;SACF;QACD,KAAK,CAAC,IAAI,CAAC;YACT,CAAC,EAAE;gBACD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;aACf;YACD,CAAC,EAAE;gBACD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;aACf;YACD,OAAO,EAAE,CAAC,MAAM,CAAC;SAClB,CAAC,CAAC;KACJ;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAhCD,kCAgCC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { NMRZone } from '..';
|
|
2
1
|
import type { GetKernelOptions } from '../peaks/util/getKernel';
|
|
3
2
|
export interface Data2D {
|
|
4
3
|
z: number[][] | Float64Array[];
|
|
@@ -62,7 +61,7 @@ export interface XYZAutoZonesPickingOptions {
|
|
|
62
61
|
*/
|
|
63
62
|
kernel?: GetKernelOptions;
|
|
64
63
|
}
|
|
65
|
-
export declare function xyzAutoZonesPicking(spectraData: Data2D, options: XYZAutoZonesPickingOptions): NMRZone[];
|
|
64
|
+
export declare function xyzAutoZonesPicking(spectraData: Data2D, options: XYZAutoZonesPickingOptions): import("./NMRZone").NMRZone[];
|
|
66
65
|
/**
|
|
67
66
|
* This function converts a set of 2D-peaks in 2D-signals. Each signal could be composed
|
|
68
67
|
* of many 2D-peaks, and it has some additional information related to the NMR spectrum.
|
|
@@ -34,6 +34,7 @@ const ml_simple_clustering_1 = __importDefault(require("ml-simple-clustering"));
|
|
|
34
34
|
const determineRealTop_1 = require("../peaks/util/determineRealTop");
|
|
35
35
|
const getKernel_1 = require("../peaks/util/getKernel");
|
|
36
36
|
const PeakOptimizer = __importStar(require("../peaks/util/peakOptimizer"));
|
|
37
|
+
const formatZone_1 = require("./util/formatZone");
|
|
37
38
|
const smallFilter = [
|
|
38
39
|
[0, 0, 1, 2, 2, 2, 1, 0, 0],
|
|
39
40
|
[0, 1, 4, 7, 7, 7, 4, 1, 0],
|
|
@@ -107,42 +108,9 @@ function xyzAutoZonesPicking(spectraData, options) {
|
|
|
107
108
|
if (enhanceSymmetry) {
|
|
108
109
|
signals = PeakOptimizer.enhanceSymmetry(signals);
|
|
109
110
|
}
|
|
110
|
-
return formatZones(signals);
|
|
111
|
+
return (0, formatZone_1.formatZones)(signals);
|
|
111
112
|
}
|
|
112
113
|
exports.xyzAutoZonesPicking = xyzAutoZonesPicking;
|
|
113
|
-
function formatZones(signals) {
|
|
114
|
-
let zones = [];
|
|
115
|
-
for (const signal of signals) {
|
|
116
|
-
let minMax1 = [Number.MAX_VALUE, 0];
|
|
117
|
-
let minMax2 = [Number.MAX_VALUE, 0];
|
|
118
|
-
for (const peak of signal.peaks || []) {
|
|
119
|
-
if (peak.minX < minMax1[0]) {
|
|
120
|
-
minMax1[0] = peak.minX;
|
|
121
|
-
}
|
|
122
|
-
if (peak.maxX > minMax1[1]) {
|
|
123
|
-
minMax1[1] = peak.maxX;
|
|
124
|
-
}
|
|
125
|
-
if (peak.minY < minMax2[0]) {
|
|
126
|
-
minMax2[0] = peak.minY;
|
|
127
|
-
}
|
|
128
|
-
if (peak.maxY > minMax2[1]) {
|
|
129
|
-
minMax2[1] = peak.maxY;
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
zones.push({
|
|
133
|
-
x: {
|
|
134
|
-
from: minMax1[0],
|
|
135
|
-
to: minMax1[1],
|
|
136
|
-
},
|
|
137
|
-
y: {
|
|
138
|
-
from: minMax2[0],
|
|
139
|
-
to: minMax2[1],
|
|
140
|
-
},
|
|
141
|
-
signals: [signal],
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
return zones;
|
|
145
|
-
}
|
|
146
114
|
const createSignals2D = (peaks, options) => {
|
|
147
115
|
let { nCols, nRows, absoluteData, originalData, observedFrequencies, tolerances, nuclei, realTopDetection, minY, maxY, minX, maxX, } = options;
|
|
148
116
|
let [nucleusX, nucleusY] = nuclei;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyzAutoZonesPicking.js","sourceRoot":"","sources":["../../src/xyz/xyzAutoZonesPicking.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAmC;AACnC,mEAAqD;AACrD,0EAA4D;AAE5D,gFAAoD;
|
|
1
|
+
{"version":3,"file":"xyzAutoZonesPicking.js","sourceRoot":"","sources":["../../src/xyz/xyzAutoZonesPicking.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,11 @@ interface XYZJResAnalyzerOptions extends CompilePatternOptions {
|
|
|
19
19
|
* @default 0
|
|
20
20
|
*/
|
|
21
21
|
reference?: number;
|
|
22
|
+
/**
|
|
23
|
+
* if it is true returns zones instead of signals 2D
|
|
24
|
+
* @default false
|
|
25
|
+
*/
|
|
26
|
+
getZones?: boolean;
|
|
22
27
|
}
|
|
23
|
-
export declare function xyzJResAnalyzer(signals: NMRSignal2D[], options?: XYZJResAnalyzerOptions): NMRSignal2D[];
|
|
28
|
+
export declare function xyzJResAnalyzer(signals: NMRSignal2D[], options?: XYZJResAnalyzerOptions): NMRSignal2D[] | import("./NMRZone").NMRZone[];
|
|
24
29
|
export {};
|
|
@@ -6,25 +6,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.xyzJResAnalyzer = void 0;
|
|
7
7
|
const ml_simple_clustering_1 = __importDefault(require("ml-simple-clustering"));
|
|
8
8
|
const jAnalyzer_1 = __importDefault(require("../peaks/util/jAnalyzer"));
|
|
9
|
+
const formatZone_1 = require("./util/formatZone");
|
|
9
10
|
function xyzJResAnalyzer(signals, options = {}) {
|
|
10
|
-
let { reference = 0, referenceMaxShiftError = 0.08, tolerances = [10, 100], nuclei = ['1H', '1H'], observedFrequencies = [400, 400], jAnalyzer = {
|
|
11
|
+
let { reference = 0, getZones = false, referenceMaxShiftError = 0.08, tolerances = [10, 100], nuclei = ['1H', '1H'], observedFrequencies = [400, 400], jAnalyzer = {
|
|
11
12
|
jAxisKey: { jAxis: 'y', intensity: 'z' },
|
|
12
13
|
}, } = options;
|
|
13
|
-
let temporalSignals = compilePattern(signals, {
|
|
14
|
+
let temporalSignals = compilePattern([...signals], {
|
|
14
15
|
observedFrequencies,
|
|
15
16
|
tolerances,
|
|
16
17
|
nuclei,
|
|
17
18
|
jAnalyzer,
|
|
18
19
|
});
|
|
19
20
|
//check if the signal are symmetric around the reference
|
|
20
|
-
let
|
|
21
|
+
let signals2D = [];
|
|
21
22
|
for (const tempSignal of temporalSignals) {
|
|
22
23
|
let delta = tempSignal.y.delta;
|
|
23
24
|
if (Math.abs(delta - reference) > referenceMaxShiftError)
|
|
24
25
|
continue;
|
|
25
|
-
|
|
26
|
+
signals2D.push(tempSignal);
|
|
26
27
|
}
|
|
27
|
-
return
|
|
28
|
+
return getZones ? (0, formatZone_1.formatZones)(signals2D) : signals2D;
|
|
28
29
|
}
|
|
29
30
|
exports.xyzJResAnalyzer = xyzJResAnalyzer;
|
|
30
31
|
function compilePattern(signals, options) {
|
|
@@ -74,9 +75,9 @@ function compilePattern(signals, options) {
|
|
|
74
75
|
}
|
|
75
76
|
if (peaksO.length > 0) {
|
|
76
77
|
peaksO.reverse();
|
|
77
|
-
let
|
|
78
|
-
for (const
|
|
79
|
-
newSignals.push(
|
|
78
|
+
let signals2D = createSignals2D(peaksO, signalOptions);
|
|
79
|
+
for (const signal of signals2D) {
|
|
80
|
+
newSignals.push(signal);
|
|
80
81
|
}
|
|
81
82
|
}
|
|
82
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyzJResAnalyzer.js","sourceRoot":"","sources":["../../src/xyz/xyzJResAnalyzer.ts"],"names":[],"mappings":";;;;;;AACA,gFAAoD;AAGpD,wEAAgD;
|
|
1
|
+
{"version":3,"file":"xyzJResAnalyzer.js","sourceRoot":"","sources":["../../src/xyz/xyzJResAnalyzer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { applyWindow } from './applyWindow';
|
|
2
|
+
import { compose } from './compose';
|
|
3
|
+
export function apodization(data, options) {
|
|
4
|
+
const { compose: composeOptions, pointsToShift } = options;
|
|
5
|
+
const windowData = compose(composeOptions);
|
|
6
|
+
const applyWindowOptions = {
|
|
7
|
+
windowData,
|
|
8
|
+
pointsToShift,
|
|
9
|
+
};
|
|
10
|
+
const re = applyWindow(data.re, applyWindowOptions);
|
|
11
|
+
const im = applyWindow(data.im, applyWindowOptions);
|
|
12
|
+
return { re, im, windowData };
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=apodization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apodization.js","sourceRoot":"","sources":["../../src/apodization/apodization.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAgB,MAAM,WAAW,CAAC;AAiBlD,MAAM,UAAU,WAAW,CAAC,IAAc,EAAE,OAA2B;IACrE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAE3C,MAAM,kBAAkB,GAAG;QACzB,UAAU;QACV,aAAa;KACd,CAAC;IAEF,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;IAEpD,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC;AAChC,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* pure function that applies a window function to the input data.
|
|
3
|
+
*/
|
|
4
|
+
export function applyWindow(data, options) {
|
|
5
|
+
const dataLength = data.length;
|
|
6
|
+
const { windowData, start = 0, length = dataLength, pointsToShift = 0, output = new Float64Array(data), } = options;
|
|
7
|
+
const firstEndPoint = Math.min(start + length, dataLength - pointsToShift);
|
|
8
|
+
for (let i = start, j = 0; i < firstEndPoint; i++) {
|
|
9
|
+
output[i] *= windowData[j++];
|
|
10
|
+
}
|
|
11
|
+
for (let i = dataLength - 1, j = 0; i > dataLength - pointsToShift - 1; i--) {
|
|
12
|
+
output[i] *= windowData[j++];
|
|
13
|
+
}
|
|
14
|
+
return output;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=applyWindow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"applyWindow.js","sourceRoot":"","sources":["../../src/apodization/applyWindow.ts"],"names":[],"mappings":"AA0BA;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,IAAiB,EAAE,OAA2B;IACxE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAE/B,MAAM,EACJ,UAAU,EACV,KAAK,GAAG,CAAC,EACT,MAAM,GAAG,UAAU,EACnB,aAAa,GAAG,CAAC,EACjB,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,GAChC,GAAG,OAAO,CAAC;IAEZ,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC;IAC3E,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE;QACjD,MAAM,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;KAC9B;IAED,KAAK,IAAI,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,GAAG,aAAa,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3E,MAAM,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;KAC9B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { applyWindow } from './applyWindow';
|
|
2
|
+
import { getFunction } from './getFunction';
|
|
3
|
+
import { getData } from './utils/getData';
|
|
4
|
+
export function compose(shapeOptions) {
|
|
5
|
+
const { length: dataLength, shapes = [] } = shapeOptions;
|
|
6
|
+
let data = new Float64Array(dataLength).fill(1);
|
|
7
|
+
shapes.forEach((options) => {
|
|
8
|
+
const { shape, start = 0 } = options;
|
|
9
|
+
const { options: shapeOptions } = shape;
|
|
10
|
+
const length = 'length' in shapeOptions ? shapeOptions.length : dataLength - start;
|
|
11
|
+
const windowData = getData(getFunction(shape), length);
|
|
12
|
+
applyWindow(data, {
|
|
13
|
+
windowData,
|
|
14
|
+
length,
|
|
15
|
+
start,
|
|
16
|
+
output: data,
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
return data;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=compose.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/apodization/compose.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAyB1C,MAAM,UAAU,OAAO,CAAC,YAA0B;IAChD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,YAAY,CAAC;IACzD,IAAI,IAAI,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;QACrC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;QACxC,MAAM,MAAM,GACV,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;QAEtE,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;QACvD,WAAW,CAAC,IAAI,EAAE;YAChB,UAAU;YACV,MAAM;YACN,KAAK;YACL,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { exponential } from './shapes/exponential';
|
|
2
|
+
import { lorentzToGauss } from './shapes/lorentzToGauss';
|
|
3
|
+
export function getFunction(shape) {
|
|
4
|
+
const { kind, options } = shape;
|
|
5
|
+
switch (kind) {
|
|
6
|
+
case 'exponential':
|
|
7
|
+
return exponential(options);
|
|
8
|
+
case 'lorentzToGauss':
|
|
9
|
+
return lorentzToGauss(options);
|
|
10
|
+
default:
|
|
11
|
+
throw Error(`Unknown distribution ${kind}`);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=getFunction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getFunction.js","sourceRoot":"","sources":["../../src/apodization/getFunction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,UAAU,WAAW,CAAC,KAAsB;IAChD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,QAAQ,IAAI,EAAE;QACZ,KAAK,aAAa;YAChB,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9B,KAAK,gBAAgB;YACnB,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;QACjC;YACE,MAAM,KAAK,CAAC,wBAAwB,IAAc,EAAE,CAAC,CAAC;KACzD;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WindowFunctions.js","sourceRoot":"","sources":["../../../src/apodization/shapes/WindowFunctions.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exponential.js","sourceRoot":"","sources":["../../../src/apodization/shapes/exponential.ts"],"names":[],"mappings":"AAWA,MAAM,UAAU,WAAW,CAAC,OAA2B;IACrD,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACnC,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;AAC9C,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export function lorentzToGauss(options) {
|
|
2
|
+
const { dw, length, gaussianHz = 0, exponentialHz = 0, center = 0 } = options;
|
|
3
|
+
if (center > 1 || center < 0) {
|
|
4
|
+
throw new Error('The center of gaussian shape should be inside of the window function: 0 - 1');
|
|
5
|
+
}
|
|
6
|
+
const C5 = Math.pow(0.6 * Math.PI * gaussianHz * dw, 2);
|
|
7
|
+
const C2 = center * (length - 1);
|
|
8
|
+
const C6 = Math.PI * dw * exponentialHz;
|
|
9
|
+
return (i) => Math.exp(i * C6 - Math.pow(C2 - i, 2) * C5);
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=lorentzToGauss.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lorentzToGauss.js","sourceRoot":"","sources":["../../../src/apodization/shapes/lorentzToGauss.ts"],"names":[],"mappings":"AA0BA,MAAM,UAAU,cAAc,CAAC,OAA8B;IAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,CAAC,EAAE,aAAa,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAE9E,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;KACH;IAED,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,UAAU,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;IAExC,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* generate and scale the data of a window function
|
|
3
|
+
*/
|
|
4
|
+
export function getData(func, length) {
|
|
5
|
+
const data = new Float64Array(length);
|
|
6
|
+
let max = Number.MIN_SAFE_INTEGER;
|
|
7
|
+
for (let i = 0; i < length; i++) {
|
|
8
|
+
const value = func(i);
|
|
9
|
+
data[i] = value;
|
|
10
|
+
if (value > max)
|
|
11
|
+
max = value;
|
|
12
|
+
}
|
|
13
|
+
for (let i = 0; i < length; i++)
|
|
14
|
+
data[i] /= max;
|
|
15
|
+
return data;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=getData.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getData.js","sourceRoot":"","sources":["../../../src/apodization/utils/getData.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,OAAO,CAAC,IAA2B,EAAE,MAAc;IACjE,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QAChB,IAAI,KAAK,GAAG,GAAG;YAAE,GAAG,GAAG,KAAK,CAAC;KAC9B;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE;QAAE,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;IAChD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import TreeSet from 'ml-tree-set';
|
|
2
2
|
import { createMapPossibleAssignments } from './createMapPossibleAssignments';
|
|
3
3
|
import { exploreTreeRec } from './exploreTreeRec';
|
|
4
4
|
const comparator = (a, b) => {
|
|
@@ -10,7 +10,7 @@ export async function buildAssignments(props) {
|
|
|
10
10
|
let date = new Date();
|
|
11
11
|
let timeStart = date.getTime();
|
|
12
12
|
let store = {
|
|
13
|
-
solutions: new
|
|
13
|
+
solutions: new TreeSet(comparator),
|
|
14
14
|
nSolutions: 0,
|
|
15
15
|
};
|
|
16
16
|
let nSources = joinedSignals.length;
|
|
@@ -37,7 +37,7 @@ export async function buildAssignments(props) {
|
|
|
37
37
|
const diaIDPeerPossibleAssignment = Object.keys(possibleAssignmentMap);
|
|
38
38
|
let partial = fillPartial(nSources);
|
|
39
39
|
store = {
|
|
40
|
-
solutions: new
|
|
40
|
+
solutions: new TreeSet(comparator),
|
|
41
41
|
nSolutions: 0,
|
|
42
42
|
};
|
|
43
43
|
exploreTreeRec({
|
|
@@ -51,7 +51,7 @@ function addSolution(store, props) {
|
|
|
51
51
|
store.nSolutions++;
|
|
52
52
|
let solution = {
|
|
53
53
|
assignment: JSON.parse(JSON.stringify(partial)),
|
|
54
|
-
score
|
|
54
|
+
score,
|
|
55
55
|
};
|
|
56
56
|
if (store.nSolutions >= maxSolutions) {
|
|
57
57
|
if (solution.score > store.solutions.last().score) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exploreTreeRec.js","sourceRoot":"","sources":["../../../src/assignment/utils/exploreTreeRec.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAgB9C,MAAM,UAAU,cAAc,CAC5B,KAA0B,EAC1B,YAAoB,EACpB,OAA6B,EAC7B,KAAuB;IAEvB,MAAM,EACJ,QAAQ,EACR,eAAe,EACf,OAAO,EACP,SAAS,EACT,YAAY,EACZ,OAAO,EACP,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EACzB,2BAA2B,GAC5B,GAAG,KAAK,CAAC;IAEV,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;IAC/B,IAAI,WAAW,CAAC,OAAO,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE;QAC/C,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACzD,KAAK,IAAI,QAAQ,IAAI,mBAAmB,EAAE;QACxC,OAAO,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;QACjC,IAAI,KAAK,GAAG,YAAY,CAAC,OAAO,EAAE;YAChC,yBAAyB;YACzB,2BAA2B;YAC3B,mBAAmB;YACnB,eAAe;YACf,WAAW;YACX,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,IAAI,QAAQ,KAAK,GAAG,EAAE;gBACpB,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;aAC9B;YACD,SAAS;SACV;QAED,IAAI,YAAY,KAAK,QAAQ,GAAG,CAAC,IAAI,KAAK,IAAI,eAAe,EAAE;YAC7D,WAAW,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;SACnE;aAAM,IAAI,YAAY,GAAG,QAAQ,GAAG,CAAC,EAAE;YACtC,cAAc,CACZ;gBACE,QAAQ;gBACR,eAAe;gBACf,OAAO;gBACP,SAAS;gBACT,YAAY;gBACZ,OAAO;gBACP,WAAW;gBACX,eAAe;gBACf,mBAAmB;gBACnB,qBAAqB;gBACrB,yBAAyB;gBACzB,2BAA2B;aAC5B,EACD,YAAY,GAAG,CAAC,EAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EACnC,KAAK,CACN,CAAC;SACH;KACF;AACH,CAAC;AAcD,SAAS,WAAW,CAAC,KAAuB,EAAE,KAAuB;IACnE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC1D,KAAK,IAAI,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACvD,KAAK,CAAC,UAAU,EAAE,CAAC;IACnB,IAAI,QAAQ,GAAuB;QACjC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC/C,KAAK
|
|
1
|
+
{"version":3,"file":"exploreTreeRec.js","sourceRoot":"","sources":["../../../src/assignment/utils/exploreTreeRec.ts"],"names":[],"mappings":"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"}
|