nmr-processing 9.1.0 → 9.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib/index.d.ts +3 -2
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/prediction/{prediction1D.d.ts → Prediction1D.d.ts} +0 -0
- package/lib/prediction/{prediction1D.js → Prediction1D.js} +1 -1
- package/lib/prediction/Prediction1D.js.map +1 -0
- package/lib/prediction/predictAll.d.ts +1 -1
- package/lib/prediction/predictAll.js.map +1 -1
- package/lib/prediction/predictAllSpectra.js +2 -2
- package/lib/prediction/predictAllSpectra.js.map +1 -1
- package/lib/prediction/predictCOSY.d.ts +1 -1
- package/lib/prediction/predictCOSY.js.map +1 -1
- package/lib/prediction/predictCarbon.d.ts +1 -1
- package/lib/prediction/predictHMBC.d.ts +1 -1
- package/lib/prediction/predictHMBC.js.map +1 -1
- package/lib/prediction/predictHSQC.d.ts +1 -1
- package/lib/prediction/predictHSQC.js.map +1 -1
- package/lib/prediction/predictProton.d.ts +1 -1
- package/lib/prediction/utils/fetchPrediction.d.ts +1 -1
- package/lib/prediction/utils/getPredictions.d.ts +1 -1
- package/lib/prediction/utils/predict2D.d.ts +1 -1
- package/lib/prediction/utils/predict2D.js +1 -1
- package/lib/prediction/utils/predict2D.js.map +1 -1
- package/lib/signals/{jcoupling.d.ts → Jcoupling.d.ts} +0 -0
- package/lib/signals/{jcoupling.js → Jcoupling.js} +1 -1
- package/lib/signals/Jcoupling.js.map +1 -0
- package/lib/signals/NMRSignal1D.d.ts +1 -1
- package/lib/signals/addDummySignals.js +12 -7
- package/lib/signals/addDummySignals.js.map +1 -1
- package/lib/signals/optimization/defaultParameters.d.ts +1 -0
- package/lib/signals/optimization/defaultParameters.js +36 -0
- package/lib/signals/optimization/defaultParameters.js.map +1 -0
- package/lib/signals/optimization/directOptimization.d.ts +20 -0
- package/lib/signals/optimization/directOptimization.js +32 -0
- package/lib/signals/optimization/directOptimization.js.map +1 -0
- package/lib/signals/optimization/getInternalSignals.d.ts +54 -0
- package/lib/signals/optimization/getInternalSignals.js +150 -0
- package/lib/signals/optimization/getInternalSignals.js.map +1 -0
- package/lib/signals/optimization/getSumOfShapes.d.ts +4 -0
- package/lib/signals/optimization/getSumOfShapes.js +46 -0
- package/lib/signals/optimization/getSumOfShapes.js.map +1 -0
- package/lib/signals/optimization/signalsToPointXY.d.ts +9 -0
- package/lib/signals/optimization/signalsToPointXY.js +24 -0
- package/lib/signals/optimization/signalsToPointXY.js.map +1 -0
- package/lib/signals/optimizeSignals.d.ts +40 -0
- package/lib/signals/optimizeSignals.js +108 -0
- package/lib/signals/optimizeSignals.js.map +1 -0
- package/lib/signals/signalsJoin.d.ts +1 -1
- package/lib/signals/simulation/simulateXYPeaks.js +1 -1
- package/lib/signals/simulation/simulateXYPeaks.js.map +1 -1
- package/lib/xy/xyAutoPeaksPicking.d.ts +2 -2
- package/lib/xy/xyAutoPeaksPicking.js +2 -2
- package/lib/xy/xyAutoPeaksPicking.js.map +1 -1
- package/lib/xy/xyPeaksOptimization.js +2 -1
- package/lib/xy/xyPeaksOptimization.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib-esm/index.js +1 -0
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/prediction/Prediction1D.js +2 -0
- package/lib-esm/prediction/Prediction1D.js.map +1 -0
- package/lib-esm/prediction/predictAll.js.map +1 -1
- package/lib-esm/prediction/predictAllSpectra.js +2 -2
- package/lib-esm/prediction/predictAllSpectra.js.map +1 -1
- package/lib-esm/prediction/predictCOSY.js.map +1 -1
- package/lib-esm/prediction/predictHMBC.js.map +1 -1
- package/lib-esm/prediction/predictHSQC.js.map +1 -1
- package/lib-esm/prediction/utils/predict2D.js +1 -1
- package/lib-esm/prediction/utils/predict2D.js.map +1 -1
- package/lib-esm/signals/Jcoupling.js +2 -0
- package/lib-esm/signals/Jcoupling.js.map +1 -0
- package/lib-esm/signals/addDummySignals.js +12 -7
- package/lib-esm/signals/addDummySignals.js.map +1 -1
- package/lib-esm/signals/optimization/defaultParameters.js +33 -0
- package/lib-esm/signals/optimization/defaultParameters.js.map +1 -0
- package/lib-esm/signals/optimization/directOptimization.js +25 -0
- package/lib-esm/signals/optimization/directOptimization.js.map +1 -0
- package/lib-esm/signals/optimization/getInternalSignals.js +146 -0
- package/lib-esm/signals/optimization/getInternalSignals.js.map +1 -0
- package/lib-esm/signals/optimization/getSumOfShapes.js +42 -0
- package/lib-esm/signals/optimization/getSumOfShapes.js.map +1 -0
- package/lib-esm/signals/optimization/signalsToPointXY.js +20 -0
- package/lib-esm/signals/optimization/signalsToPointXY.js.map +1 -0
- package/lib-esm/signals/optimizeSignals.js +104 -0
- package/lib-esm/signals/optimizeSignals.js.map +1 -0
- package/lib-esm/signals/simulation/simulateXYPeaks.js +1 -1
- package/lib-esm/signals/simulation/simulateXYPeaks.js.map +1 -1
- package/lib-esm/xy/xyAutoPeaksPicking.js +3 -3
- package/lib-esm/xy/xyAutoPeaksPicking.js.map +1 -1
- package/lib-esm/xy/xyPeaksOptimization.js +2 -1
- package/lib-esm/xy/xyPeaksOptimization.js.map +1 -1
- package/package.json +3 -2
- package/src/assignment/utils/getAssignment/buildAssignments.ts +1 -1
- package/src/index.ts +3 -2
- package/src/prediction/{prediction1D.ts → Prediction1D.ts} +0 -0
- package/src/prediction/predictAll.ts +1 -1
- package/src/prediction/predictAllSpectra.ts +2 -2
- package/src/prediction/predictCOSY.ts +1 -1
- package/src/prediction/predictCarbon.ts +1 -1
- package/src/prediction/predictHMBC.ts +1 -1
- package/src/prediction/predictHSQC.ts +1 -1
- package/src/prediction/predictProton.ts +1 -1
- package/src/prediction/utils/fetchPrediction.ts +1 -1
- package/src/prediction/utils/getPredictions.ts +1 -1
- package/src/prediction/utils/predict2D.ts +2 -2
- package/src/signal/signalJoinCouplings.ts +1 -1
- package/src/signals/{jcoupling.ts → Jcoupling.ts} +0 -0
- package/src/signals/NMRSignal1D.ts +1 -1
- package/src/signals/addDummySignals.ts +17 -7
- package/src/signals/optimization/defaultParameters.ts +45 -0
- package/src/signals/optimization/directOptimization.ts +49 -0
- package/src/signals/optimization/getInternalSignals.ts +287 -0
- package/src/signals/optimization/getSumOfShapes.ts +54 -0
- package/src/signals/optimization/signalsToPointXY.ts +37 -0
- package/src/signals/optimizeSignals.ts +173 -0
- package/src/signals/signalsJoin.ts +1 -1
- package/src/signals/signalsToXY.ts +1 -1
- package/src/signals/simulation/signalsToSpinSystem.ts +1 -1
- package/src/signals/simulation/simulateXYPeaks.ts +1 -2
- package/src/xy/xyAutoPeaksPicking.ts +10 -6
- package/src/xy/xyPeaksOptimization.ts +3 -1
- package/lib/prediction/prediction1D.js.map +0 -1
- package/lib/signals/jcoupling.js.map +0 -1
- package/lib-esm/prediction/prediction1D.js +0 -2
- package/lib-esm/prediction/prediction1D.js.map +0 -1
- package/lib-esm/signals/jcoupling.js +0 -2
- package/lib-esm/signals/jcoupling.js.map +0 -1
|
@@ -11,8 +11,8 @@ export async function predictAllSpectra(molecule, options = {}) {
|
|
|
11
11
|
...{
|
|
12
12
|
proton: { from: 0, to: 14 },
|
|
13
13
|
carbon: { from: 0, to: 200 },
|
|
14
|
-
nbPoints:
|
|
15
|
-
lineWidth:
|
|
14
|
+
nbPoints: 65536,
|
|
15
|
+
lineWidth: 1,
|
|
16
16
|
},
|
|
17
17
|
...(simulationOptions.oneD || {}),
|
|
18
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictAllSpectra.js","sourceRoot":"","sources":["../../src/prediction/predictAllSpectra.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAsB,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAqB,UAAU,EAAE,MAAM,cAAc,CAAC;AA8B7D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAkB,EAClB,UAAoC,EAAE;IAEtC,MAAM,EACJ,UAAU,EAAE,iBAAiB,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAuB,EAC3E,UAAU,EAAE,iBAAiB,GAAG,EAAE,GACnC,GAAG,OAAO,CAAC;IAEZ,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAClE,MAAM,OAAO,GAAU,EAAE,CAAC;IAC1B,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;IAE1E,MAAM,WAAW,GAAgB;QAC/B,GAAG;YACD,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE;YAC5B,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"predictAllSpectra.js","sourceRoot":"","sources":["../../src/prediction/predictAllSpectra.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictCOSY.js","sourceRoot":"","sources":["../../src/prediction/predictCOSY.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"predictCOSY.js","sourceRoot":"","sources":["../../src/prediction/predictCOSY.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAa,MAAM,mBAAmB,CAAC;AA4CzD;;;GAGG;AAEH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,QAAkB,EAClB,UAA8B,EAAE;IAEhC,IAAI,EACF,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,CAAC,EACb,WAAW,EACX,SAAS,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,EAChC,cAAc,EACd,YAAY,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAClC,eAAe,GAAG,IAAI,GACvB,GAAG,OAAO,CAAC;IAEZ,OAAO,SAAS,CAAC,QAAQ,EAAE;QACzB,IAAI,EAAE,GAAG;QACT,EAAE,EAAE,GAAG;QACP,SAAS;QACT,SAAS;QACT,SAAS;QACT,YAAY;QACZ,WAAW;QACX,eAAe;QACf,cAAc;KACf,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictHMBC.js","sourceRoot":"","sources":["../../src/prediction/predictHMBC.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"predictHMBC.js","sourceRoot":"","sources":["../../src/prediction/predictHMBC.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AA+C9C,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,QAAkB,EAClB,UAA8B,EAAE;IAEhC,IAAI,EACF,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,EAClD,cAAc,EACd,WAAW,EACX,YAAY,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,GACnC,GAAG,OAAO,CAAC;IAEZ,OAAO,SAAS,CAAC,QAAQ,EAAE;QACzB,IAAI,EAAE,GAAG;QACT,EAAE,EAAE,GAAG;QACP,SAAS;QACT,SAAS;QACT,SAAS;QACT,WAAW;QACX,cAAc;QACd,YAAY;KACb,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictHSQC.js","sourceRoot":"","sources":["../../src/prediction/predictHSQC.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"predictHSQC.js","sourceRoot":"","sources":["../../src/prediction/predictHSQC.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAa,MAAM,mBAAmB,CAAC;AAwCzD;;;GAGG;AAEH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,QAAkB,EAClB,UAA8B,EAAE;IAEhC,IAAI,EACF,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,CAAC,EACb,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,GACf,GAAG,OAAO,CAAC;IAEZ,OAAO,SAAS,CAAC,QAAQ,EAAE;QACzB,IAAI,EAAE,GAAG;QACT,EAAE,EAAE,GAAG;QACP,SAAS;QACT,SAAS;QACT,SAAS;QACT,WAAW;QACX,cAAc;QACd,YAAY;KACb,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -2,9 +2,9 @@ import { v4 as generateID } from '@lukeed/uuid';
|
|
|
2
2
|
import { agnes } from 'ml-hclust';
|
|
3
3
|
import { Matrix } from 'ml-matrix';
|
|
4
4
|
import { getGroupedDiastereotopicAtomIDs, getPathsInfo, } from 'openchemlib-utils';
|
|
5
|
+
import { setIDs } from '../../peaks/util/setIDs';
|
|
5
6
|
import { getNuclei } from './getNuclei';
|
|
6
7
|
import { getPredictions } from './getPredictions';
|
|
7
|
-
import { setIDs } from '../../peaks/util/setIDs';
|
|
8
8
|
function checkFromTo(options) {
|
|
9
9
|
if (!options.from || !options.to) {
|
|
10
10
|
throw new Error('options from and to are mandatory');
|
|
@@ -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;AAEnC,OAAO,EACL,+BAA+B,EAC/B,YAAY,GACb,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"predict2D.js","sourceRoot":"","sources":["../../../src/prediction/utils/predict2D.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Jcoupling.js","sourceRoot":"","sources":["../../src/signals/Jcoupling.ts"],"names":[],"mappings":""}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { couplingPatterns } from '../constants/couplingPatterns';
|
|
2
2
|
export function addDummySignals(signals) {
|
|
3
3
|
let newSignals = JSON.parse(JSON.stringify(signals));
|
|
4
|
+
let nextAtomToAssign = signals.reduce((nextAtomToAssign, signal) => {
|
|
5
|
+
const { atoms = [] } = signal;
|
|
6
|
+
return Math.max(...atoms) > nextAtomToAssign
|
|
7
|
+
? Math.max(...atoms)
|
|
8
|
+
: nextAtomToAssign;
|
|
9
|
+
}, 0) + 1;
|
|
4
10
|
signals.forEach((signal, s) => {
|
|
5
|
-
const { js: jCouplings = [], atoms: signalAssignment = [
|
|
6
|
-
let { newCouplings, tempSignals } = checkCouplings(jCouplings, newSignals, signalAssignment);
|
|
11
|
+
const { js: jCouplings = [], atoms: signalAssignment = [nextAtomToAssign++], } = signal;
|
|
12
|
+
let { newCouplings, tempSignals } = checkCouplings(jCouplings, newSignals, signalAssignment, nextAtomToAssign + signals.length);
|
|
7
13
|
if (tempSignals.length > 0)
|
|
8
14
|
newSignals.push(...tempSignals);
|
|
9
15
|
newSignals[s].js = newCouplings;
|
|
@@ -11,8 +17,7 @@ export function addDummySignals(signals) {
|
|
|
11
17
|
});
|
|
12
18
|
return newSignals.sort((a, b) => a.delta - b.delta);
|
|
13
19
|
}
|
|
14
|
-
function checkCouplings(jCouplings, signals, signalAssignment) {
|
|
15
|
-
let newSignalAssignment = signals.length - 1;
|
|
20
|
+
function checkCouplings(jCouplings, signals, signalAssignment, nextAtomToAssign) {
|
|
16
21
|
let tempSignals = [];
|
|
17
22
|
const newCouplings = jCouplings.reduce((newCouplings, jCoupling) => {
|
|
18
23
|
const { atoms = [], multiplicity, coupling } = jCoupling;
|
|
@@ -21,12 +26,12 @@ function checkCouplings(jCouplings, signals, signalAssignment) {
|
|
|
21
26
|
let tempCouplings = [];
|
|
22
27
|
const nbLinks = couplingPatterns.indexOf(multiplicity);
|
|
23
28
|
for (let i = 0; i < nbLinks; i++) {
|
|
24
|
-
|
|
29
|
+
nextAtomToAssign++;
|
|
25
30
|
tempCouplings.push({
|
|
26
31
|
coupling,
|
|
27
|
-
atoms: [
|
|
32
|
+
atoms: [nextAtomToAssign],
|
|
28
33
|
});
|
|
29
|
-
tempSignals.push(formatSignal(coupling, [
|
|
34
|
+
tempSignals.push(formatSignal(coupling, [nextAtomToAssign], signalAssignment));
|
|
30
35
|
}
|
|
31
36
|
}
|
|
32
37
|
else {
|
|
@@ -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,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5B,MAAM,
|
|
1
|
+
{"version":3,"file":"addDummySignals.js","sourceRoot":"","sources":["../../src/signals/addDummySignals.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
export const defaultParameters = {
|
|
2
|
+
delta: {
|
|
3
|
+
init: (data) => data.signal.delta,
|
|
4
|
+
min: (data) => data.signal.delta - data.shape.fwhm * 2,
|
|
5
|
+
max: (data) => data.signal.delta + data.shape.fwhm * 2,
|
|
6
|
+
gradientDifference: () => 2e-3,
|
|
7
|
+
},
|
|
8
|
+
intensity: {
|
|
9
|
+
init: (data) => data.signal.intensity || 1,
|
|
10
|
+
min: () => 0,
|
|
11
|
+
max: () => 1.5,
|
|
12
|
+
gradientDifference: () => 1e-3,
|
|
13
|
+
},
|
|
14
|
+
fwhm: {
|
|
15
|
+
init: (data) => data.shape.fwhm,
|
|
16
|
+
min: (data) => data.shape.fwhm * 0.25,
|
|
17
|
+
max: (data) => data.shape.fwhm * 4,
|
|
18
|
+
gradientDifference: (data) => data.shape.fwhm * 2e-3,
|
|
19
|
+
},
|
|
20
|
+
mu: {
|
|
21
|
+
init: (data) => data.shape.mu || 0.5,
|
|
22
|
+
min: () => 0,
|
|
23
|
+
max: () => 1,
|
|
24
|
+
gradientDifference: () => 0.01,
|
|
25
|
+
},
|
|
26
|
+
coupling: {
|
|
27
|
+
init: (data) => data.jCoupling.coupling,
|
|
28
|
+
min: (data) => data.jCoupling.coupling * 0.8,
|
|
29
|
+
max: (data) => data.jCoupling.coupling * 1.2,
|
|
30
|
+
gradientDifference: () => 0.01,
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
//# sourceMappingURL=defaultParameters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultParameters.js","sourceRoot":"","sources":["../../../src/signals/optimization/defaultParameters.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,iBAAiB,GAG1B;IACF,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;QACrD,GAAG,EAAE,CAAC,IAAgD,EAAE,EAAE,CACxD,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;QACzC,GAAG,EAAE,CAAC,IAAgD,EAAE,EAAE,CACxD,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;QACzC,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI;KAC/B;IACD,SAAS,EAAE;QACT,IAAI,EAAE,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC;QAC9D,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACZ,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG;QACd,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI;KAC/B;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,IAAgC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;QAC3D,GAAG,EAAE,CAAC,IAAgC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI;QACjE,GAAG,EAAE,CAAC,IAAgC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;QAC9D,kBAAkB,EAAE,CAAC,IAAgC,EAAE,EAAE,CACvD,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI;KACzB;IACD,EAAE,EAAE;QACF,IAAI,EAAE,CAAC,IAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG;QACnE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACZ,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACZ,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI;KAC/B;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ;QACjE,GAAG,EAAE,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,GAAG,GAAG;QACtE,GAAG,EAAE,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,GAAG,GAAG;QACtE,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI;KAC/B;CACF,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import direct from 'ml-direct';
|
|
2
|
+
export function directOptimization(data, sumOfShapes, options) {
|
|
3
|
+
const { minValues, maxValues, directOptions = {} } = options;
|
|
4
|
+
const objectiveFunction = getObjectiveFunction(data, sumOfShapes);
|
|
5
|
+
const result = direct(objectiveFunction, minValues, maxValues, directOptions);
|
|
6
|
+
const { optima } = result;
|
|
7
|
+
return {
|
|
8
|
+
error: result.minFunctionValue,
|
|
9
|
+
iterations: result.iterations,
|
|
10
|
+
parameterValues: optima[0],
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
function getObjectiveFunction(data, sumOfShapes) {
|
|
14
|
+
const { x, y } = data;
|
|
15
|
+
const nbPoints = x.length;
|
|
16
|
+
return (parameters) => {
|
|
17
|
+
const fct = sumOfShapes(parameters);
|
|
18
|
+
let error = 0;
|
|
19
|
+
for (let i = 0; i < nbPoints; i++) {
|
|
20
|
+
error += Math.pow(y[i] - fct(x[i]), 2);
|
|
21
|
+
}
|
|
22
|
+
return error;
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=directOptimization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"directOptimization.js","sourceRoot":"","sources":["../../../src/signals/optimization/directOptimization.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,WAAW,CAAC;AAkB/B,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,WAAwB,EACxB,OAAkC;IAElC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAC7D,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAE9E,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAE1B,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,gBAAgB;QAC9B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY,EAAE,WAAwB;IAClE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IACtB,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,OAAO,CAAC,UAAoB,EAAE,EAAE;QAC9B,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YACjC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACxC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { getShape1D } from 'ml-peak-shape-generator';
|
|
2
|
+
import { xyFindClosestPoint } from 'ml-spectra-processing';
|
|
3
|
+
import { defaultParameters } from './defaultParameters';
|
|
4
|
+
import { signalsToPointXY } from './signalsToPointXY';
|
|
5
|
+
const properties = ['init', 'min', 'max', 'gradientDifference'];
|
|
6
|
+
export function getInternalSignals(data, signals, minMaxY, options) {
|
|
7
|
+
var _a, _b;
|
|
8
|
+
let index = 0;
|
|
9
|
+
let internalSignals = [];
|
|
10
|
+
const { shape: shapeAsOption = { kind: 'gaussian' }, baseline: shiftValue = minMaxY.min, lineWidth = 1, frequency, } = options;
|
|
11
|
+
const normalizedSignals = normalizeSignals({
|
|
12
|
+
signals,
|
|
13
|
+
data,
|
|
14
|
+
shiftValue,
|
|
15
|
+
frequency,
|
|
16
|
+
range: minMaxY.range,
|
|
17
|
+
});
|
|
18
|
+
for (const signal of normalizedSignals) {
|
|
19
|
+
const { shape = { ...shapeAsOption } } = signal;
|
|
20
|
+
if (!shape.fwhm) {
|
|
21
|
+
shape.fwhm = lineWidth;
|
|
22
|
+
}
|
|
23
|
+
shape.fwhm /= frequency;
|
|
24
|
+
const shapeFct = getShape1D(shape);
|
|
25
|
+
const parameters = [
|
|
26
|
+
'delta',
|
|
27
|
+
'intensity',
|
|
28
|
+
...shapeFct.getParameters(),
|
|
29
|
+
];
|
|
30
|
+
const propertiesValues = {
|
|
31
|
+
min: [],
|
|
32
|
+
max: [],
|
|
33
|
+
init: [],
|
|
34
|
+
gradientDifference: [],
|
|
35
|
+
};
|
|
36
|
+
for (const parameter of parameters) {
|
|
37
|
+
for (const property of properties) {
|
|
38
|
+
propertiesValues[property].push(getPropertyValue({
|
|
39
|
+
signal,
|
|
40
|
+
frequency,
|
|
41
|
+
parameter,
|
|
42
|
+
property,
|
|
43
|
+
minMaxY,
|
|
44
|
+
shapeFct,
|
|
45
|
+
}));
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
for (const jCoupling of signal.js || []) {
|
|
49
|
+
for (const property of properties) {
|
|
50
|
+
const parameter = 'coupling';
|
|
51
|
+
let generalParameterValue = (_b = (_a = options === null || options === void 0 ? void 0 : options.parameters) === null || _a === void 0 ? void 0 : _a[parameter]) === null || _b === void 0 ? void 0 : _b[property];
|
|
52
|
+
if (generalParameterValue) {
|
|
53
|
+
if (typeof generalParameterValue === 'number') {
|
|
54
|
+
propertiesValues[property].push(getNormalizedValue(generalParameterValue, parameter, property, minMaxY, frequency, options.baseline));
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
let value = generalParameterValue({ jCoupling });
|
|
58
|
+
propertiesValues[property].push(getNormalizedValue(value, parameter, property, minMaxY, frequency, options.baseline));
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (!defaultParameters[parameter]) {
|
|
62
|
+
throw new Error(`No default parameter for ${parameter}`);
|
|
63
|
+
}
|
|
64
|
+
const defaultParameterValues = defaultParameters[parameter][property];
|
|
65
|
+
propertiesValues[property].push(defaultParameterValues({ jCoupling }));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
const fromIndex = index;
|
|
69
|
+
const toIndex = fromIndex + parameters.length - 1;
|
|
70
|
+
const fromIndexCoupling = toIndex + 1;
|
|
71
|
+
const toIndexCoupling = fromIndexCoupling + signal.js.length - 1;
|
|
72
|
+
index += toIndexCoupling - fromIndex + 1;
|
|
73
|
+
internalSignals.push({
|
|
74
|
+
shape: shape,
|
|
75
|
+
shapeFct,
|
|
76
|
+
signal,
|
|
77
|
+
parameters,
|
|
78
|
+
propertiesValues,
|
|
79
|
+
fromIndex,
|
|
80
|
+
toIndex,
|
|
81
|
+
fromIndexCoupling,
|
|
82
|
+
toIndexCoupling,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
return internalSignals;
|
|
86
|
+
}
|
|
87
|
+
function normalizeSignals(options) {
|
|
88
|
+
const { signals, data, frequency, shiftValue, range } = options;
|
|
89
|
+
const getMaxIntensity = (signal) => {
|
|
90
|
+
const peaks = signalsToPointXY([signal], { frequency, maxClusterSize: 1 });
|
|
91
|
+
const biggestPeak = peaks.reduce((biggest, peak) => (peak.y > biggest.y ? peak : biggest), peaks[0]);
|
|
92
|
+
const { y: maxIntensity } = xyFindClosestPoint(data, biggestPeak.x);
|
|
93
|
+
return maxIntensity;
|
|
94
|
+
};
|
|
95
|
+
return signals.map((signal) => {
|
|
96
|
+
const { intensity = getMaxIntensity(signal) } = signal;
|
|
97
|
+
return {
|
|
98
|
+
...signal,
|
|
99
|
+
js: signal.js || [],
|
|
100
|
+
intensity: (intensity - shiftValue) / range,
|
|
101
|
+
};
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
function getPropertyValue(options) {
|
|
105
|
+
var _a, _b, _c, _d;
|
|
106
|
+
const { signal, frequency, parameter, property, minMaxY, shapeFct } = options;
|
|
107
|
+
// check if the property is specified in the signal
|
|
108
|
+
let propertyValue = (_b = (_a = signal === null || signal === void 0 ? void 0 : signal.parameters) === null || _a === void 0 ? void 0 : _a[parameter]) === null || _b === void 0 ? void 0 : _b[property];
|
|
109
|
+
if (propertyValue) {
|
|
110
|
+
return getNormalizedValue(propertyValue, parameter, property, minMaxY, frequency, options.baseline);
|
|
111
|
+
}
|
|
112
|
+
// check if there are some global option, it could be a number or a callback
|
|
113
|
+
let generalParameterValue = (_d = (_c = options === null || options === void 0 ? void 0 : options.parameters) === null || _c === void 0 ? void 0 : _c[parameter]) === null || _d === void 0 ? void 0 : _d[property];
|
|
114
|
+
if (generalParameterValue) {
|
|
115
|
+
if (typeof generalParameterValue === 'number') {
|
|
116
|
+
return getNormalizedValue(generalParameterValue, parameter, property, minMaxY, frequency, options.baseline);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
let value = generalParameterValue(signal);
|
|
120
|
+
return getNormalizedValue(value, parameter, property, minMaxY, frequency, options.baseline);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
// we just need to take the default parameters
|
|
124
|
+
if (!defaultParameters[parameter]) {
|
|
125
|
+
throw new Error(`No default parameter for ${parameter}`);
|
|
126
|
+
}
|
|
127
|
+
const defaultParameterValues = defaultParameters[parameter][property];
|
|
128
|
+
return defaultParameterValues({ signal, shape: shapeFct });
|
|
129
|
+
}
|
|
130
|
+
function getNormalizedValue(value, parameter, property, minMaxY, frequency, baseline) {
|
|
131
|
+
if (parameter === 'intensity') {
|
|
132
|
+
if (property === 'gradientDifference') {
|
|
133
|
+
return value;
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
return baseline !== undefined
|
|
137
|
+
? (value - baseline) / minMaxY.range
|
|
138
|
+
: (value - minMaxY.min) / minMaxY.range;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
else if (parameter === 'fwhm') {
|
|
142
|
+
return value / frequency;
|
|
143
|
+
}
|
|
144
|
+
return value;
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=getInternalSignals.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getInternalSignals.js","sourceRoot":"","sources":["../../../src/signals/optimization/getInternalSignals.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA4B,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAM3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;AA4ChE,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,OAAiB,EACjB,OAA+B,EAC/B,OAAkC;;IAElC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,MAAM,EACJ,KAAK,EAAE,aAAa,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,EAC3C,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,EAClC,SAAS,GAAG,CAAC,EACb,SAAS,GACV,GAAG,OAAO,CAAC;IAEZ,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;QACzC,OAAO;QACP,IAAI;QACJ,UAAU;QACV,SAAS;QACT,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;QACtC,MAAM,EAAE,KAAK,GAAG,EAAE,GAAG,aAAa,EAAE,EAAE,GAAG,MAAM,CAAC;QAEhD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACf,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC;SACxB;QAED,KAAK,CAAC,IAAI,IAAI,SAAS,CAAC;QACxB,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAEnC,MAAM,UAAU,GAAgB;YAC9B,OAAO;YACP,WAAW;YACX,GAAG,QAAQ,CAAC,aAAa,EAAE;SAC5B,CAAC;QAEF,MAAM,gBAAgB,GAA6B;YACjD,GAAG,EAAE,EAAE;YACP,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,EAAE;YACR,kBAAkB,EAAE,EAAE;SACvB,CAAC;QAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;gBACjC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC7B,gBAAgB,CAAC;oBACf,MAAM;oBACN,SAAS;oBACT,SAAS;oBACT,QAAQ;oBACR,OAAO;oBACP,QAAQ;iBACT,CAAC,CACH,CAAC;aACH;SACF;QAED,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE;YACvC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;gBACjC,MAAM,SAAS,GAAG,UAAuB,CAAC;gBAC1C,IAAI,qBAAqB,GACvB,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,0CAAG,SAAS,CAAC,0CAAG,QAAQ,CAAC,CAAC;gBAC/C,IAAI,qBAAqB,EAAE;oBACzB,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;wBAC7C,gBAAgB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC7B,kBAAkB,CAChB,qBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,CAAC,QAAQ,CACjB,CACF,CAAC;qBACH;yBAAM;wBACL,IAAI,KAAK,GAAG,qBAAqB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;wBACjD,gBAAgB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC7B,kBAAkB,CAChB,KAAK,EACL,SAAS,EACT,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,CAAC,QAAQ,CACjB,CACF,CAAC;qBACH;iBACF;gBACD,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE;oBACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,EAAE,CAAC,CAAC;iBAC1D;gBACD,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACtE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;aACxE;SACF;QAED,MAAM,SAAS,GAAG,KAAK,CAAC;QACxB,MAAM,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;QAElD,MAAM,iBAAiB,GAAG,OAAO,GAAG,CAAC,CAAC;QACtC,MAAM,eAAe,GAAG,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;QAEjE,KAAK,IAAI,eAAe,GAAG,SAAS,GAAG,CAAC,CAAC;QACzC,eAAe,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,KAAwB;YAC/B,QAAQ;YACR,MAAM;YACN,UAAU;YACV,gBAAgB;YAChB,SAAS;YACT,OAAO;YACP,iBAAiB;YACjB,eAAe;SAChB,CAAC,CAAC;KACJ;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,gBAAgB,CAAmB,OAM3C;IACC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEhE,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAC9B,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EACxD,KAAK,CAAC,CAAC,CAAC,CACT,CAAC;QACF,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC5B,MAAM,EAAE,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC;QACvD,OAAO;YACL,GAAG,MAAM;YACT,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE;YACnB,SAAS,EAAE,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,KAAK;SAC5C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,OASzB;;IACC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE9E,mDAAmD;IACnD,IAAI,aAAa,GAAG,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAG,SAAS,CAAC,0CAAG,QAAQ,CAAC,CAAC;IAChE,IAAI,aAAa,EAAE;QACjB,OAAO,kBAAkB,CACvB,aAAa,EACb,SAAS,EACT,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,CAAC,QAAQ,CACjB,CAAC;KACH;IAED,4EAA4E;IAE5E,IAAI,qBAAqB,GAAG,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,0CAAG,SAAS,CAAC,0CAAG,QAAQ,CAAC,CAAC;IACzE,IAAI,qBAAqB,EAAE;QACzB,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YAC7C,OAAO,kBAAkB,CACvB,qBAAqB,EACrB,SAAS,EACT,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,CAAC,QAAQ,CACjB,CAAC;SACH;aAAM;YACL,IAAI,KAAK,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;YAC1C,OAAO,kBAAkB,CACvB,KAAK,EACL,SAAS,EACT,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,CAAC,QAAQ,CACjB,CAAC;SACH;KACF;IAED,8CAA8C;IAC9C,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,EAAE,CAAC,CAAC;KAC1D;IACD,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;IACtE,OAAO,sBAAsB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAa,EACb,SAAsC,EACtC,QAAgB,EAChB,OAA+B,EAC/B,SAAiB,EACjB,QAAiB;IAEjB,IAAI,SAAS,KAAK,WAAW,EAAE;QAC7B,IAAI,QAAQ,KAAK,oBAAoB,EAAE;YACrC,OAAO,KAAK,CAAC;SACd;aAAM;YACL,OAAO,QAAQ,KAAK,SAAS;gBAC3B,CAAC,CAAC,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,OAAO,CAAC,KAAK;gBACpC,CAAC,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;SAC3C;KACF;SAAM,IAAI,SAAS,KAAK,MAAM,EAAE;QAC/B,OAAO,KAAK,GAAG,SAAS,CAAC;KAC1B;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { signalsToPointXY } from './signalsToPointXY';
|
|
2
|
+
const defaultSimulationOptions = {
|
|
3
|
+
maxClusterSize: 1,
|
|
4
|
+
};
|
|
5
|
+
export function getSumOfShapes(internalSignals, options) {
|
|
6
|
+
const simulationOptions = { ...defaultSimulationOptions, ...options };
|
|
7
|
+
return function sumOfShapes(parameters) {
|
|
8
|
+
const peaks = [];
|
|
9
|
+
for (const internalSignal of internalSignals) {
|
|
10
|
+
const delta = parameters[internalSignal.fromIndex];
|
|
11
|
+
const intensity = parameters[internalSignal.fromIndex + 1];
|
|
12
|
+
for (let i = 2; i < internalSignal.parameters.length; i++) {
|
|
13
|
+
//@ts-expect-error Not simply to solve the issue
|
|
14
|
+
internalSignal.shapeFct[internalSignal.parameters[i]] =
|
|
15
|
+
parameters[internalSignal.fromIndex + i];
|
|
16
|
+
}
|
|
17
|
+
const couplings = internalSignal.signal.js;
|
|
18
|
+
for (let i = 0; i < couplings.length; i++) {
|
|
19
|
+
couplings[i].coupling =
|
|
20
|
+
parameters[internalSignal.fromIndexCoupling + i];
|
|
21
|
+
}
|
|
22
|
+
const currentPeaks = signalsToPointXY([
|
|
23
|
+
{
|
|
24
|
+
delta,
|
|
25
|
+
js: couplings,
|
|
26
|
+
},
|
|
27
|
+
], simulationOptions);
|
|
28
|
+
peaks.push(...currentPeaks.map((peak) => {
|
|
29
|
+
return { intensity, shape: internalSignal.shapeFct, ...peak };
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
return (currentX) => {
|
|
33
|
+
let totalY = 0;
|
|
34
|
+
for (let peak of peaks) {
|
|
35
|
+
const { x, y, intensity, shape } = peak;
|
|
36
|
+
totalY += y * intensity * shape.fct(currentX - x);
|
|
37
|
+
}
|
|
38
|
+
return totalY;
|
|
39
|
+
};
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=getSumOfShapes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getSumOfShapes.js","sourceRoot":"","sources":["../../../src/signals/optimization/getSumOfShapes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA2B,MAAM,oBAAoB,CAAC;AAI/E,MAAM,wBAAwB,GAAqC;IACjE,cAAc,EAAE,CAAC;CAClB,CAAC;AACF,MAAM,UAAU,cAAc,CAC5B,eAAiC,EACjC,OAAgC;IAEhC,MAAM,iBAAiB,GAAG,EAAE,GAAG,wBAAwB,EAAE,GAAG,OAAO,EAAE,CAAC;IACtE,OAAO,SAAS,WAAW,CAAC,UAAoB;QAC9C,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;YAC5C,MAAM,KAAK,GAAG,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACnD,MAAM,SAAS,GAAG,UAAU,CAAC,cAAc,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;YAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzD,gDAAgD;gBAChD,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;oBACnD,UAAU,CAAC,cAAc,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;aAC5C;YACD,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ;oBACnB,UAAU,CAAC,cAAc,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC;aACpD;YACD,MAAM,YAAY,GAAG,gBAAgB,CACnC;gBACE;oBACE,KAAK;oBACL,EAAE,EAAE,SAAS;iBACd;aACF,EACD,iBAAiB,CAClB,CAAC;YAEF,KAAK,CAAC,IAAI,CACR,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3B,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE,GAAG,IAAI,EAAE,CAAC;YAChE,CAAC,CAAC,CACH,CAAC;SACH;QACD,OAAO,CAAC,QAAgB,EAAE,EAAE;YAC1B,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;gBACtB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;gBACxC,MAAM,IAAI,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;aACnD;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { addDummySignals } from '../addDummySignals';
|
|
2
|
+
import { signalsToSpinSystem } from '../simulation/signalsToSpinSystem';
|
|
3
|
+
import { simulateXYPeaks } from '../simulation/simulateXYPeaks';
|
|
4
|
+
import { splitSpinSystem } from '../simulation/splitSpinSystem';
|
|
5
|
+
export function signalsToPointXY(signals, options) {
|
|
6
|
+
const { frequency, maxClusterSize = 1 } = options;
|
|
7
|
+
const completeSignalSet = addDummySignals(signals);
|
|
8
|
+
const spinSystem = signalsToSpinSystem(completeSignalSet);
|
|
9
|
+
spinSystem.clusters = splitSpinSystem(spinSystem, {
|
|
10
|
+
frequency,
|
|
11
|
+
maxClusterSize,
|
|
12
|
+
});
|
|
13
|
+
const pointsXY = simulateXYPeaks(spinSystem, options).filter((point) => point.x < 1000);
|
|
14
|
+
const maxIntensity = pointsXY.reduce((max, peak) => (peak.y > max ? peak.y : max), Number.MIN_SAFE_INTEGER);
|
|
15
|
+
for (const point of pointsXY) {
|
|
16
|
+
point.y /= maxIntensity;
|
|
17
|
+
}
|
|
18
|
+
return pointsXY;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=signalsToPointXY.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signalsToPointXY.js","sourceRoot":"","sources":["../../../src/signals/optimization/signalsToPointXY.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAOhE,MAAM,UAAU,gBAAgB,CAC9B,OAAsB,EACtB,OAAgC;IAEhC,MAAM,EAAE,SAAS,EAAE,cAAc,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,UAAU,CAAC,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE;QAChD,SAAS;QACT,cAAc;KACf,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,MAAM,CAC1D,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAC1B,CAAC;IAEF,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAC5C,MAAM,CAAC,gBAAgB,CACxB,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;QAC5B,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC;KACzB;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { v4 } from '@lukeed/uuid';
|
|
2
|
+
import { levenbergMarquardt } from 'ml-levenberg-marquardt';
|
|
3
|
+
import { getShape1D } from 'ml-peak-shape-generator';
|
|
4
|
+
import { xMinMaxValues } from 'ml-spectra-processing';
|
|
5
|
+
import { directOptimization } from './optimization/directOptimization';
|
|
6
|
+
import { getInternalSignals, } from './optimization/getInternalSignals';
|
|
7
|
+
import { getSumOfShapes } from './optimization/getSumOfShapes';
|
|
8
|
+
import { signalsToPointXY, } from './optimization/signalsToPointXY';
|
|
9
|
+
const defaultLMOptimizationOptions = {
|
|
10
|
+
damping: 1.5,
|
|
11
|
+
maxIterations: 100,
|
|
12
|
+
errorTolerance: 1e-8,
|
|
13
|
+
};
|
|
14
|
+
const defaultDirectOptimizationOptions = {
|
|
15
|
+
iterations: 25,
|
|
16
|
+
};
|
|
17
|
+
export function optimizeSignals(data, signals, options) {
|
|
18
|
+
const { optimization = {}, simulation: simulationOptions, ...restOptions } = options;
|
|
19
|
+
let temp = xMinMaxValues(data.y);
|
|
20
|
+
const minMaxY = { ...temp, range: temp.max - temp.min };
|
|
21
|
+
const internalSignals = getInternalSignals(data, signals, minMaxY, {
|
|
22
|
+
frequency: simulationOptions.frequency,
|
|
23
|
+
...restOptions,
|
|
24
|
+
});
|
|
25
|
+
const { baseline: shiftValue = minMaxY.min } = options;
|
|
26
|
+
let normalizedY = new Float64Array(data.y.length);
|
|
27
|
+
for (let i = 0; i < data.y.length; i++) {
|
|
28
|
+
normalizedY[i] = (data.y[i] - shiftValue) / minMaxY.range;
|
|
29
|
+
}
|
|
30
|
+
const nbParams = internalSignals[internalSignals.length - 1].toIndexCoupling + 1;
|
|
31
|
+
const minValues = new Float64Array(nbParams);
|
|
32
|
+
const maxValues = new Float64Array(nbParams);
|
|
33
|
+
const initialValues = new Float64Array(nbParams);
|
|
34
|
+
const gradientDifferences = new Float64Array(nbParams);
|
|
35
|
+
let index = 0;
|
|
36
|
+
for (const internalSignal of internalSignals) {
|
|
37
|
+
for (let i = 0; i < internalSignal.parameters.length; i++) {
|
|
38
|
+
minValues[index] = internalSignal.propertiesValues.min[i];
|
|
39
|
+
maxValues[index] = internalSignal.propertiesValues.max[i];
|
|
40
|
+
initialValues[index] = internalSignal.propertiesValues.init[i];
|
|
41
|
+
gradientDifferences[index++] =
|
|
42
|
+
internalSignal.propertiesValues.gradientDifference[i];
|
|
43
|
+
}
|
|
44
|
+
for (let i = internalSignal.parameters.length; i < internalSignal.parameters.length + internalSignal.signal.js.length; i++) {
|
|
45
|
+
minValues[index] = internalSignal.propertiesValues.min[i];
|
|
46
|
+
maxValues[index] = internalSignal.propertiesValues.max[i];
|
|
47
|
+
initialValues[index] = internalSignal.propertiesValues.init[i];
|
|
48
|
+
gradientDifferences[index++] =
|
|
49
|
+
internalSignal.propertiesValues.gradientDifference[i];
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
const sumOfShapes = getSumOfShapes(internalSignals, simulationOptions);
|
|
53
|
+
const { kind, options: optimizationOptions } = optimization;
|
|
54
|
+
const [algorithm, defaultOptimizationOptions] = kind === 'direct'
|
|
55
|
+
? [directOptimization, defaultDirectOptimizationOptions]
|
|
56
|
+
: [levenbergMarquardt, defaultLMOptimizationOptions];
|
|
57
|
+
let fitted = algorithm({ x: data.x, y: normalizedY }, sumOfShapes, {
|
|
58
|
+
minValues,
|
|
59
|
+
maxValues,
|
|
60
|
+
initialValues,
|
|
61
|
+
gradientDifference: gradientDifferences,
|
|
62
|
+
...defaultOptimizationOptions,
|
|
63
|
+
...optimizationOptions,
|
|
64
|
+
});
|
|
65
|
+
const fittedValues = fitted.parameterValues;
|
|
66
|
+
const newSignals = [];
|
|
67
|
+
for (const internalSignal of internalSignals) {
|
|
68
|
+
const { fromIndexCoupling } = internalSignal;
|
|
69
|
+
const js = internalSignal.signal.js.map((jCoupling, i) => {
|
|
70
|
+
jCoupling.coupling = fittedValues[fromIndexCoupling + i];
|
|
71
|
+
return jCoupling;
|
|
72
|
+
});
|
|
73
|
+
const delta = fittedValues[internalSignal.fromIndex];
|
|
74
|
+
const pointXYs = signalsToPointXY([{ delta, js }], simulationOptions);
|
|
75
|
+
const intensity = fittedValues[internalSignal.fromIndex + 1] * minMaxY.range + shiftValue;
|
|
76
|
+
const newPeaks = [];
|
|
77
|
+
for (const { x, y } of pointXYs) {
|
|
78
|
+
const peak = {
|
|
79
|
+
id: v4(),
|
|
80
|
+
x,
|
|
81
|
+
y: intensity * y,
|
|
82
|
+
width: 0,
|
|
83
|
+
shape: { ...internalSignal.shape },
|
|
84
|
+
};
|
|
85
|
+
for (let i = 2; i < internalSignal.parameters.length; i++) {
|
|
86
|
+
//@ts-expect-error should be fixed once
|
|
87
|
+
peak.shape[internalSignal.parameters[i]] =
|
|
88
|
+
fittedValues[internalSignal.fromIndex + i];
|
|
89
|
+
}
|
|
90
|
+
peak.shape.fwhm *= simulationOptions.frequency;
|
|
91
|
+
peak.width = getShape1D(peak.shape).fwhmToWidth(peak.shape.fwhm);
|
|
92
|
+
newPeaks.push(peak);
|
|
93
|
+
}
|
|
94
|
+
newSignals.push({
|
|
95
|
+
delta,
|
|
96
|
+
js,
|
|
97
|
+
shape: { ...newPeaks[0].shape },
|
|
98
|
+
intensity,
|
|
99
|
+
peaks: newPeaks,
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
return newSignals;
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=optimizeSignals.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"optimizeSignals.js","sourceRoot":"","sources":["../../src/signals/optimizeSignals.ts"],"names":[],"mappings":"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"}
|