nmr-processing 9.1.0 → 9.2.0-pre.1668170175

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.
Files changed (133) hide show
  1. package/lib/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
  2. package/lib/index.d.ts +4 -2
  3. package/lib/index.js +2 -0
  4. package/lib/index.js.map +1 -1
  5. package/lib/prediction/{prediction1D.d.ts → Prediction1D.d.ts} +0 -0
  6. package/lib/prediction/{prediction1D.js → Prediction1D.js} +1 -1
  7. package/lib/prediction/Prediction1D.js.map +1 -0
  8. package/lib/prediction/predictAll.d.ts +1 -1
  9. package/lib/prediction/predictAll.js.map +1 -1
  10. package/lib/prediction/predictAllSpectra.js +2 -2
  11. package/lib/prediction/predictAllSpectra.js.map +1 -1
  12. package/lib/prediction/predictCOSY.d.ts +1 -1
  13. package/lib/prediction/predictCOSY.js.map +1 -1
  14. package/lib/prediction/predictCarbon.d.ts +1 -1
  15. package/lib/prediction/predictHMBC.d.ts +1 -1
  16. package/lib/prediction/predictHMBC.js.map +1 -1
  17. package/lib/prediction/predictHSQC.d.ts +1 -1
  18. package/lib/prediction/predictHSQC.js.map +1 -1
  19. package/lib/prediction/predictProton.d.ts +1 -1
  20. package/lib/prediction/utils/fetchPrediction.d.ts +1 -1
  21. package/lib/prediction/utils/getPredictions.d.ts +1 -1
  22. package/lib/prediction/utils/predict2D.d.ts +1 -1
  23. package/lib/prediction/utils/predict2D.js +1 -1
  24. package/lib/prediction/utils/predict2D.js.map +1 -1
  25. package/lib/signals/{jcoupling.d.ts → Jcoupling.d.ts} +0 -0
  26. package/lib/signals/{jcoupling.js → Jcoupling.js} +1 -1
  27. package/lib/signals/Jcoupling.js.map +1 -0
  28. package/lib/signals/NMRSignal1D.d.ts +1 -1
  29. package/lib/signals/addDummySignals.js +12 -7
  30. package/lib/signals/addDummySignals.js.map +1 -1
  31. package/lib/signals/optimization/defaultParameters.d.ts +1 -0
  32. package/lib/signals/optimization/defaultParameters.js +36 -0
  33. package/lib/signals/optimization/defaultParameters.js.map +1 -0
  34. package/lib/signals/optimization/directOptimization.d.ts +20 -0
  35. package/lib/signals/optimization/directOptimization.js +32 -0
  36. package/lib/signals/optimization/directOptimization.js.map +1 -0
  37. package/lib/signals/optimization/getInternalSignals.d.ts +54 -0
  38. package/lib/signals/optimization/getInternalSignals.js +150 -0
  39. package/lib/signals/optimization/getInternalSignals.js.map +1 -0
  40. package/lib/signals/optimization/getSumOfShapes.d.ts +4 -0
  41. package/lib/signals/optimization/getSumOfShapes.js +46 -0
  42. package/lib/signals/optimization/getSumOfShapes.js.map +1 -0
  43. package/lib/signals/optimization/signalsToPointXY.d.ts +9 -0
  44. package/lib/signals/optimization/signalsToPointXY.js +24 -0
  45. package/lib/signals/optimization/signalsToPointXY.js.map +1 -0
  46. package/lib/signals/optimizeSignals.d.ts +40 -0
  47. package/lib/signals/optimizeSignals.js +108 -0
  48. package/lib/signals/optimizeSignals.js.map +1 -0
  49. package/lib/signals/signalsJoin.d.ts +1 -1
  50. package/lib/signals/signalsToFID.d.ts +13 -0
  51. package/lib/signals/signalsToFID.js +56 -0
  52. package/lib/signals/signalsToFID.js.map +1 -0
  53. package/lib/signals/simulation/simulateXYPeaks.js +1 -1
  54. package/lib/signals/simulation/simulateXYPeaks.js.map +1 -1
  55. package/lib/xy/xyAutoPeaksPicking.d.ts +2 -2
  56. package/lib/xy/xyAutoPeaksPicking.js +2 -2
  57. package/lib/xy/xyAutoPeaksPicking.js.map +1 -1
  58. package/lib/xy/xyPeaksOptimization.js +2 -1
  59. package/lib/xy/xyPeaksOptimization.js.map +1 -1
  60. package/lib-esm/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
  61. package/lib-esm/index.js +2 -0
  62. package/lib-esm/index.js.map +1 -1
  63. package/lib-esm/prediction/Prediction1D.js +2 -0
  64. package/lib-esm/prediction/Prediction1D.js.map +1 -0
  65. package/lib-esm/prediction/predictAll.js.map +1 -1
  66. package/lib-esm/prediction/predictAllSpectra.js +2 -2
  67. package/lib-esm/prediction/predictAllSpectra.js.map +1 -1
  68. package/lib-esm/prediction/predictCOSY.js.map +1 -1
  69. package/lib-esm/prediction/predictHMBC.js.map +1 -1
  70. package/lib-esm/prediction/predictHSQC.js.map +1 -1
  71. package/lib-esm/prediction/utils/predict2D.js +1 -1
  72. package/lib-esm/prediction/utils/predict2D.js.map +1 -1
  73. package/lib-esm/signals/Jcoupling.js +2 -0
  74. package/lib-esm/signals/Jcoupling.js.map +1 -0
  75. package/lib-esm/signals/addDummySignals.js +12 -7
  76. package/lib-esm/signals/addDummySignals.js.map +1 -1
  77. package/lib-esm/signals/optimization/defaultParameters.js +33 -0
  78. package/lib-esm/signals/optimization/defaultParameters.js.map +1 -0
  79. package/lib-esm/signals/optimization/directOptimization.js +25 -0
  80. package/lib-esm/signals/optimization/directOptimization.js.map +1 -0
  81. package/lib-esm/signals/optimization/getInternalSignals.js +146 -0
  82. package/lib-esm/signals/optimization/getInternalSignals.js.map +1 -0
  83. package/lib-esm/signals/optimization/getSumOfShapes.js +42 -0
  84. package/lib-esm/signals/optimization/getSumOfShapes.js.map +1 -0
  85. package/lib-esm/signals/optimization/signalsToPointXY.js +20 -0
  86. package/lib-esm/signals/optimization/signalsToPointXY.js.map +1 -0
  87. package/lib-esm/signals/optimizeSignals.js +104 -0
  88. package/lib-esm/signals/optimizeSignals.js.map +1 -0
  89. package/lib-esm/signals/signalsToFID.js +52 -0
  90. package/lib-esm/signals/signalsToFID.js.map +1 -0
  91. package/lib-esm/signals/simulation/simulateXYPeaks.js +1 -1
  92. package/lib-esm/signals/simulation/simulateXYPeaks.js.map +1 -1
  93. package/lib-esm/xy/xyAutoPeaksPicking.js +3 -3
  94. package/lib-esm/xy/xyAutoPeaksPicking.js.map +1 -1
  95. package/lib-esm/xy/xyPeaksOptimization.js +2 -1
  96. package/lib-esm/xy/xyPeaksOptimization.js.map +1 -1
  97. package/package.json +3 -2
  98. package/src/assignment/utils/getAssignment/buildAssignments.ts +1 -1
  99. package/src/index.ts +4 -2
  100. package/src/prediction/{prediction1D.ts → Prediction1D.ts} +0 -0
  101. package/src/prediction/predictAll.ts +1 -1
  102. package/src/prediction/predictAllSpectra.ts +2 -2
  103. package/src/prediction/predictCOSY.ts +1 -1
  104. package/src/prediction/predictCarbon.ts +1 -1
  105. package/src/prediction/predictHMBC.ts +1 -1
  106. package/src/prediction/predictHSQC.ts +1 -1
  107. package/src/prediction/predictProton.ts +1 -1
  108. package/src/prediction/utils/fetchPrediction.ts +1 -1
  109. package/src/prediction/utils/getPredictions.ts +1 -1
  110. package/src/prediction/utils/predict2D.ts +2 -2
  111. package/src/signal/signalJoinCouplings.ts +1 -1
  112. package/src/signals/{jcoupling.ts → Jcoupling.ts} +0 -0
  113. package/src/signals/NMRSignal1D.ts +1 -1
  114. package/src/signals/addDummySignals.ts +17 -7
  115. package/src/signals/optimization/defaultParameters.ts +45 -0
  116. package/src/signals/optimization/directOptimization.ts +49 -0
  117. package/src/signals/optimization/getInternalSignals.ts +287 -0
  118. package/src/signals/optimization/getSumOfShapes.ts +54 -0
  119. package/src/signals/optimization/signalsToPointXY.ts +37 -0
  120. package/src/signals/optimizeSignals.ts +173 -0
  121. package/src/signals/signalsJoin.ts +1 -1
  122. package/src/signals/signalsToFID.ts +84 -0
  123. package/src/signals/signalsToXY.ts +1 -1
  124. package/src/signals/simulation/signalsToSpinSystem.ts +1 -1
  125. package/src/signals/simulation/simulateXYPeaks.ts +1 -2
  126. package/src/xy/xyAutoPeaksPicking.ts +10 -6
  127. package/src/xy/xyPeaksOptimization.ts +3 -1
  128. package/lib/prediction/prediction1D.js.map +0 -1
  129. package/lib/signals/jcoupling.js.map +0 -1
  130. package/lib-esm/prediction/prediction1D.js +0 -2
  131. package/lib-esm/prediction/prediction1D.js.map +0 -1
  132. package/lib-esm/signals/jcoupling.js +0 -2
  133. package/lib-esm/signals/jcoupling.js.map +0 -1
@@ -0,0 +1,150 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getInternalSignals = void 0;
4
+ const ml_peak_shape_generator_1 = require("ml-peak-shape-generator");
5
+ const ml_spectra_processing_1 = require("ml-spectra-processing");
6
+ const defaultParameters_1 = require("./defaultParameters");
7
+ const signalsToPointXY_1 = require("./signalsToPointXY");
8
+ const properties = ['init', 'min', 'max', 'gradientDifference'];
9
+ function getInternalSignals(data, signals, minMaxY, options) {
10
+ var _a, _b;
11
+ let index = 0;
12
+ let internalSignals = [];
13
+ const { shape: shapeAsOption = { kind: 'gaussian' }, baseline: shiftValue = minMaxY.min, lineWidth = 1, frequency, } = options;
14
+ const normalizedSignals = normalizeSignals({
15
+ signals,
16
+ data,
17
+ shiftValue,
18
+ frequency,
19
+ range: minMaxY.range,
20
+ });
21
+ for (const signal of normalizedSignals) {
22
+ const { shape = { ...shapeAsOption } } = signal;
23
+ if (!shape.fwhm) {
24
+ shape.fwhm = lineWidth;
25
+ }
26
+ shape.fwhm /= frequency;
27
+ const shapeFct = (0, ml_peak_shape_generator_1.getShape1D)(shape);
28
+ const parameters = [
29
+ 'delta',
30
+ 'intensity',
31
+ ...shapeFct.getParameters(),
32
+ ];
33
+ const propertiesValues = {
34
+ min: [],
35
+ max: [],
36
+ init: [],
37
+ gradientDifference: [],
38
+ };
39
+ for (const parameter of parameters) {
40
+ for (const property of properties) {
41
+ propertiesValues[property].push(getPropertyValue({
42
+ signal,
43
+ frequency,
44
+ parameter,
45
+ property,
46
+ minMaxY,
47
+ shapeFct,
48
+ }));
49
+ }
50
+ }
51
+ for (const jCoupling of signal.js || []) {
52
+ for (const property of properties) {
53
+ const parameter = 'coupling';
54
+ 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];
55
+ if (generalParameterValue) {
56
+ if (typeof generalParameterValue === 'number') {
57
+ propertiesValues[property].push(getNormalizedValue(generalParameterValue, parameter, property, minMaxY, frequency, options.baseline));
58
+ }
59
+ else {
60
+ let value = generalParameterValue({ jCoupling });
61
+ propertiesValues[property].push(getNormalizedValue(value, parameter, property, minMaxY, frequency, options.baseline));
62
+ }
63
+ }
64
+ if (!defaultParameters_1.defaultParameters[parameter]) {
65
+ throw new Error(`No default parameter for ${parameter}`);
66
+ }
67
+ const defaultParameterValues = defaultParameters_1.defaultParameters[parameter][property];
68
+ propertiesValues[property].push(defaultParameterValues({ jCoupling }));
69
+ }
70
+ }
71
+ const fromIndex = index;
72
+ const toIndex = fromIndex + parameters.length - 1;
73
+ const fromIndexCoupling = toIndex + 1;
74
+ const toIndexCoupling = fromIndexCoupling + signal.js.length - 1;
75
+ index += toIndexCoupling - fromIndex + 1;
76
+ internalSignals.push({
77
+ shape: shape,
78
+ shapeFct,
79
+ signal,
80
+ parameters,
81
+ propertiesValues,
82
+ fromIndex,
83
+ toIndex,
84
+ fromIndexCoupling,
85
+ toIndexCoupling,
86
+ });
87
+ }
88
+ return internalSignals;
89
+ }
90
+ exports.getInternalSignals = getInternalSignals;
91
+ function normalizeSignals(options) {
92
+ const { signals, data, frequency, shiftValue, range } = options;
93
+ const getMaxIntensity = (signal) => {
94
+ const peaks = (0, signalsToPointXY_1.signalsToPointXY)([signal], { frequency, maxClusterSize: 1 });
95
+ const biggestPeak = peaks.reduce((biggest, peak) => (peak.y > biggest.y ? peak : biggest), peaks[0]);
96
+ const { y: maxIntensity } = (0, ml_spectra_processing_1.xyFindClosestPoint)(data, biggestPeak.x);
97
+ return maxIntensity;
98
+ };
99
+ return signals.map((signal) => {
100
+ const { intensity = getMaxIntensity(signal) } = signal;
101
+ return {
102
+ ...signal,
103
+ js: signal.js || [],
104
+ intensity: (intensity - shiftValue) / range,
105
+ };
106
+ });
107
+ }
108
+ function getPropertyValue(options) {
109
+ var _a, _b, _c, _d;
110
+ const { signal, frequency, parameter, property, minMaxY, shapeFct } = options;
111
+ // check if the property is specified in the signal
112
+ 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];
113
+ if (propertyValue) {
114
+ return getNormalizedValue(propertyValue, parameter, property, minMaxY, frequency, options.baseline);
115
+ }
116
+ // check if there are some global option, it could be a number or a callback
117
+ 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];
118
+ if (generalParameterValue) {
119
+ if (typeof generalParameterValue === 'number') {
120
+ return getNormalizedValue(generalParameterValue, parameter, property, minMaxY, frequency, options.baseline);
121
+ }
122
+ else {
123
+ let value = generalParameterValue(signal);
124
+ return getNormalizedValue(value, parameter, property, minMaxY, frequency, options.baseline);
125
+ }
126
+ }
127
+ // we just need to take the default parameters
128
+ if (!defaultParameters_1.defaultParameters[parameter]) {
129
+ throw new Error(`No default parameter for ${parameter}`);
130
+ }
131
+ const defaultParameterValues = defaultParameters_1.defaultParameters[parameter][property];
132
+ return defaultParameterValues({ signal, shape: shapeFct });
133
+ }
134
+ function getNormalizedValue(value, parameter, property, minMaxY, frequency, baseline) {
135
+ if (parameter === 'intensity') {
136
+ if (property === 'gradientDifference') {
137
+ return value;
138
+ }
139
+ else {
140
+ return baseline !== undefined
141
+ ? (value - baseline) / minMaxY.range
142
+ : (value - minMaxY.min) / minMaxY.range;
143
+ }
144
+ }
145
+ else if (parameter === 'fwhm') {
146
+ return value / frequency;
147
+ }
148
+ return value;
149
+ }
150
+ //# sourceMappingURL=getInternalSignals.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getInternalSignals.js","sourceRoot":"","sources":["../../../src/signals/optimization/getInternalSignals.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ import { InternalSignal } from './getInternalSignals';
2
+ import { SignalsToPointXYOptions } from './signalsToPointXY';
3
+ export declare type SumOfShapes = (parameters: number[]) => (x: number) => number;
4
+ export declare function getSumOfShapes(internalSignals: InternalSignal[], options: SignalsToPointXYOptions): (parameters: number[]) => (currentX: number) => number;
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getSumOfShapes = void 0;
4
+ const signalsToPointXY_1 = require("./signalsToPointXY");
5
+ const defaultSimulationOptions = {
6
+ maxClusterSize: 1,
7
+ };
8
+ function getSumOfShapes(internalSignals, options) {
9
+ const simulationOptions = { ...defaultSimulationOptions, ...options };
10
+ return function sumOfShapes(parameters) {
11
+ const peaks = [];
12
+ for (const internalSignal of internalSignals) {
13
+ const delta = parameters[internalSignal.fromIndex];
14
+ const intensity = parameters[internalSignal.fromIndex + 1];
15
+ for (let i = 2; i < internalSignal.parameters.length; i++) {
16
+ //@ts-expect-error Not simply to solve the issue
17
+ internalSignal.shapeFct[internalSignal.parameters[i]] =
18
+ parameters[internalSignal.fromIndex + i];
19
+ }
20
+ const couplings = internalSignal.signal.js;
21
+ for (let i = 0; i < couplings.length; i++) {
22
+ couplings[i].coupling =
23
+ parameters[internalSignal.fromIndexCoupling + i];
24
+ }
25
+ const currentPeaks = (0, signalsToPointXY_1.signalsToPointXY)([
26
+ {
27
+ delta,
28
+ js: couplings,
29
+ },
30
+ ], simulationOptions);
31
+ peaks.push(...currentPeaks.map((peak) => {
32
+ return { intensity, shape: internalSignal.shapeFct, ...peak };
33
+ }));
34
+ }
35
+ return (currentX) => {
36
+ let totalY = 0;
37
+ for (let peak of peaks) {
38
+ const { x, y, intensity, shape } = peak;
39
+ totalY += y * intensity * shape.fct(currentX - x);
40
+ }
41
+ return totalY;
42
+ };
43
+ };
44
+ }
45
+ exports.getSumOfShapes = getSumOfShapes;
46
+ //# sourceMappingURL=getSumOfShapes.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getSumOfShapes.js","sourceRoot":"","sources":["../../../src/signals/optimization/getSumOfShapes.ts"],"names":[],"mappings":";;;AACA,yDAA+E;AAI/E,MAAM,wBAAwB,GAAqC;IACjE,cAAc,EAAE,CAAC;CAClB,CAAC;AACF,SAAgB,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,IAAA,mCAAgB,EACnC;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;AA7CD,wCA6CC"}
@@ -0,0 +1,9 @@
1
+ import { NMRSignal1D } from '../NMRSignal1D';
2
+ export interface SignalsToPointXYOptions {
3
+ frequency: number;
4
+ maxClusterSize?: number;
5
+ }
6
+ export declare function signalsToPointXY(signals: NMRSignal1D[], options: SignalsToPointXYOptions): {
7
+ x: number;
8
+ y: number;
9
+ }[];
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.signalsToPointXY = void 0;
4
+ const addDummySignals_1 = require("../addDummySignals");
5
+ const signalsToSpinSystem_1 = require("../simulation/signalsToSpinSystem");
6
+ const simulateXYPeaks_1 = require("../simulation/simulateXYPeaks");
7
+ const splitSpinSystem_1 = require("../simulation/splitSpinSystem");
8
+ function signalsToPointXY(signals, options) {
9
+ const { frequency, maxClusterSize = 1 } = options;
10
+ const completeSignalSet = (0, addDummySignals_1.addDummySignals)(signals);
11
+ const spinSystem = (0, signalsToSpinSystem_1.signalsToSpinSystem)(completeSignalSet);
12
+ spinSystem.clusters = (0, splitSpinSystem_1.splitSpinSystem)(spinSystem, {
13
+ frequency,
14
+ maxClusterSize,
15
+ });
16
+ const pointsXY = (0, simulateXYPeaks_1.simulateXYPeaks)(spinSystem, options).filter((point) => point.x < 1000);
17
+ const maxIntensity = pointsXY.reduce((max, peak) => (peak.y > max ? peak.y : max), Number.MIN_SAFE_INTEGER);
18
+ for (const point of pointsXY) {
19
+ point.y /= maxIntensity;
20
+ }
21
+ return pointsXY;
22
+ }
23
+ exports.signalsToPointXY = signalsToPointXY;
24
+ //# sourceMappingURL=signalsToPointXY.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"signalsToPointXY.js","sourceRoot":"","sources":["../../../src/signals/optimization/signalsToPointXY.ts"],"names":[],"mappings":";;;AACA,wDAAqD;AACrD,2EAAwE;AACxE,mEAAgE;AAChE,mEAAgE;AAOhE,SAAgB,gBAAgB,CAC9B,OAAsB,EACtB,OAAgC;IAEhC,MAAM,EAAE,SAAS,EAAE,cAAc,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,iBAAiB,GAAG,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAG,IAAA,yCAAmB,EAAC,iBAAiB,CAAC,CAAC;IAC1D,UAAU,CAAC,QAAQ,GAAG,IAAA,iCAAe,EAAC,UAAU,EAAE;QAChD,SAAS;QACT,cAAc;KACf,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,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;AAzBD,4CAyBC"}
@@ -0,0 +1,40 @@
1
+ import { DataXY } from 'cheminfo-types';
2
+ import { Shape1D } from 'ml-peak-shape-generator';
3
+ import { NMRPeak1D } from '../peaks/NMRPeak1D';
4
+ import { NMRSignal1D } from './NMRSignal1D';
5
+ import { ParametersFromOptions, Shape1DWithFWHM } from './optimization/getInternalSignals';
6
+ import { SignalsToPointXYOptions } from './optimization/signalsToPointXY';
7
+ declare type ParametersFromSignal = Record<string, Record<string, number>>;
8
+ export interface Signal extends NMRSignal1D {
9
+ intensity?: number;
10
+ shape?: Shape1D;
11
+ parameters?: ParametersFromSignal;
12
+ }
13
+ export interface NMRPeak1DFull extends NMRPeak1D {
14
+ id: string;
15
+ shape: Shape1DWithFWHM;
16
+ width: number;
17
+ }
18
+ export interface OptimizeSignalsOptions {
19
+ /**
20
+ * Initial line width in Hz
21
+ * @default 1
22
+ */
23
+ lineWidth?: number;
24
+ baseline?: number;
25
+ shape?: Shape1D;
26
+ parameters?: ParametersFromOptions;
27
+ optimization?: any;
28
+ simulation: SignalsToPointXYOptions;
29
+ }
30
+ export declare function optimizeSignals(data: DataXY, signals: Signal[], options: OptimizeSignalsOptions): {
31
+ delta: number;
32
+ js: import("./Jcoupling").Jcoupling[];
33
+ shape: {
34
+ kind: "gaussian" | "lorentzian" | "pseudoVoigt";
35
+ fwhm: number;
36
+ };
37
+ intensity: number;
38
+ peaks: NMRPeak1DFull[];
39
+ }[];
40
+ export {};
@@ -0,0 +1,108 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.optimizeSignals = void 0;
4
+ const uuid_1 = require("@lukeed/uuid");
5
+ const ml_levenberg_marquardt_1 = require("ml-levenberg-marquardt");
6
+ const ml_peak_shape_generator_1 = require("ml-peak-shape-generator");
7
+ const ml_spectra_processing_1 = require("ml-spectra-processing");
8
+ const directOptimization_1 = require("./optimization/directOptimization");
9
+ const getInternalSignals_1 = require("./optimization/getInternalSignals");
10
+ const getSumOfShapes_1 = require("./optimization/getSumOfShapes");
11
+ const signalsToPointXY_1 = require("./optimization/signalsToPointXY");
12
+ const defaultLMOptimizationOptions = {
13
+ damping: 1.5,
14
+ maxIterations: 100,
15
+ errorTolerance: 1e-8,
16
+ };
17
+ const defaultDirectOptimizationOptions = {
18
+ iterations: 25,
19
+ };
20
+ function optimizeSignals(data, signals, options) {
21
+ const { optimization = {}, simulation: simulationOptions, ...restOptions } = options;
22
+ let temp = (0, ml_spectra_processing_1.xMinMaxValues)(data.y);
23
+ const minMaxY = { ...temp, range: temp.max - temp.min };
24
+ const internalSignals = (0, getInternalSignals_1.getInternalSignals)(data, signals, minMaxY, {
25
+ frequency: simulationOptions.frequency,
26
+ ...restOptions,
27
+ });
28
+ const { baseline: shiftValue = minMaxY.min } = options;
29
+ let normalizedY = new Float64Array(data.y.length);
30
+ for (let i = 0; i < data.y.length; i++) {
31
+ normalizedY[i] = (data.y[i] - shiftValue) / minMaxY.range;
32
+ }
33
+ const nbParams = internalSignals[internalSignals.length - 1].toIndexCoupling + 1;
34
+ const minValues = new Float64Array(nbParams);
35
+ const maxValues = new Float64Array(nbParams);
36
+ const initialValues = new Float64Array(nbParams);
37
+ const gradientDifferences = new Float64Array(nbParams);
38
+ let index = 0;
39
+ for (const internalSignal of internalSignals) {
40
+ for (let i = 0; i < internalSignal.parameters.length; i++) {
41
+ minValues[index] = internalSignal.propertiesValues.min[i];
42
+ maxValues[index] = internalSignal.propertiesValues.max[i];
43
+ initialValues[index] = internalSignal.propertiesValues.init[i];
44
+ gradientDifferences[index++] =
45
+ internalSignal.propertiesValues.gradientDifference[i];
46
+ }
47
+ for (let i = internalSignal.parameters.length; i < internalSignal.parameters.length + internalSignal.signal.js.length; i++) {
48
+ minValues[index] = internalSignal.propertiesValues.min[i];
49
+ maxValues[index] = internalSignal.propertiesValues.max[i];
50
+ initialValues[index] = internalSignal.propertiesValues.init[i];
51
+ gradientDifferences[index++] =
52
+ internalSignal.propertiesValues.gradientDifference[i];
53
+ }
54
+ }
55
+ const sumOfShapes = (0, getSumOfShapes_1.getSumOfShapes)(internalSignals, simulationOptions);
56
+ const { kind, options: optimizationOptions } = optimization;
57
+ const [algorithm, defaultOptimizationOptions] = kind === 'direct'
58
+ ? [directOptimization_1.directOptimization, defaultDirectOptimizationOptions]
59
+ : [ml_levenberg_marquardt_1.levenbergMarquardt, defaultLMOptimizationOptions];
60
+ let fitted = algorithm({ x: data.x, y: normalizedY }, sumOfShapes, {
61
+ minValues,
62
+ maxValues,
63
+ initialValues,
64
+ gradientDifference: gradientDifferences,
65
+ ...defaultOptimizationOptions,
66
+ ...optimizationOptions,
67
+ });
68
+ const fittedValues = fitted.parameterValues;
69
+ const newSignals = [];
70
+ for (const internalSignal of internalSignals) {
71
+ const { fromIndexCoupling } = internalSignal;
72
+ const js = internalSignal.signal.js.map((jCoupling, i) => {
73
+ jCoupling.coupling = fittedValues[fromIndexCoupling + i];
74
+ return jCoupling;
75
+ });
76
+ const delta = fittedValues[internalSignal.fromIndex];
77
+ const pointXYs = (0, signalsToPointXY_1.signalsToPointXY)([{ delta, js }], simulationOptions);
78
+ const intensity = fittedValues[internalSignal.fromIndex + 1] * minMaxY.range + shiftValue;
79
+ const newPeaks = [];
80
+ for (const { x, y } of pointXYs) {
81
+ const peak = {
82
+ id: (0, uuid_1.v4)(),
83
+ x,
84
+ y: intensity * y,
85
+ width: 0,
86
+ shape: { ...internalSignal.shape },
87
+ };
88
+ for (let i = 2; i < internalSignal.parameters.length; i++) {
89
+ //@ts-expect-error should be fixed once
90
+ peak.shape[internalSignal.parameters[i]] =
91
+ fittedValues[internalSignal.fromIndex + i];
92
+ }
93
+ peak.shape.fwhm *= simulationOptions.frequency;
94
+ peak.width = (0, ml_peak_shape_generator_1.getShape1D)(peak.shape).fwhmToWidth(peak.shape.fwhm);
95
+ newPeaks.push(peak);
96
+ }
97
+ newSignals.push({
98
+ delta,
99
+ js,
100
+ shape: { ...newPeaks[0].shape },
101
+ intensity,
102
+ peaks: newPeaks,
103
+ });
104
+ }
105
+ return newSignals;
106
+ }
107
+ exports.optimizeSignals = optimizeSignals;
108
+ //# 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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"}
@@ -1,7 +1,7 @@
1
1
  import type { SignalJoinCouplingsOptions } from '../signal/signalJoinCouplings';
2
2
  import type { MakeMandatory } from '../utilities/MakeMandatory';
3
+ import type { Jcoupling } from './Jcoupling';
3
4
  import type { NMRSignal1D } from './NMRSignal1D';
4
- import type { Jcoupling } from './jcoupling';
5
5
  export interface SignalsJoinOptions {
6
6
  /**
7
7
  * options for signalJoinCouplings
@@ -0,0 +1,13 @@
1
+ import { NMRSignal1D } from './NMRSignal1D';
2
+ export interface SignalsToFIDOptions {
3
+ lb?: number;
4
+ from?: number;
5
+ to?: number;
6
+ nbPoints?: number;
7
+ frequency?: number;
8
+ maxClusterSize?: number;
9
+ }
10
+ export declare function signalsToFID(signals: NMRSignal1D[], options: SignalsToFIDOptions): {
11
+ re: import("cheminfo-types").DoubleArray;
12
+ im: import("cheminfo-types").DoubleArray;
13
+ };
@@ -0,0 +1,56 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.signalsToFID = void 0;
4
+ const ml_spectra_processing_1 = require("ml-spectra-processing");
5
+ const apodization_1 = require("../apodization/apodization");
6
+ const signalsToSpinSystem_1 = require("./simulation/signalsToSpinSystem");
7
+ const simulateXYPeaks_1 = require("./simulation/simulateXYPeaks");
8
+ const splitSpinSystem_1 = require("./simulation/splitSpinSystem");
9
+ const twoPi = Math.PI * 2;
10
+ function signalsToFID(signals, options) {
11
+ const { lb = 1, from = 0, to = 10, nbPoints = 1024, frequency = 400, maxClusterSize = 8, } = options;
12
+ let spinSystem = (0, signalsToSpinSystem_1.signalsToSpinSystem)(signals);
13
+ spinSystem.clusters = (0, splitSpinSystem_1.splitSpinSystem)(spinSystem, {
14
+ frequency,
15
+ maxClusterSize,
16
+ });
17
+ const peaks = (0, simulateXYPeaks_1.simulateXYPeaks)(spinSystem, { frequency });
18
+ const re = new Float64Array(nbPoints);
19
+ const im = new Float64Array(nbPoints);
20
+ const sw = Math.abs(to - from);
21
+ const adquisitionTime = nbPoints / (2 * sw * frequency);
22
+ const time = (0, ml_spectra_processing_1.xSequentialFill)({
23
+ size: nbPoints,
24
+ from: 0,
25
+ to: adquisitionTime,
26
+ });
27
+ for (const peak of peaks) {
28
+ const { x, y } = peak;
29
+ const cs = x * frequency * twoPi;
30
+ for (let i = 0; i < nbPoints; i++) {
31
+ re[i] += y * Math.cos(cs * time[i]);
32
+ im[i] += y * Math.sin(cs * time[i]);
33
+ }
34
+ }
35
+ const { windowData, ...result } = (0, apodization_1.apodization)({ re, im }, {
36
+ pointsToShift: 0,
37
+ compose: {
38
+ length: nbPoints,
39
+ shapes: [
40
+ {
41
+ start: 0,
42
+ shape: {
43
+ kind: 'exponential',
44
+ options: {
45
+ dw: adquisitionTime / (nbPoints - 1),
46
+ lb,
47
+ },
48
+ },
49
+ },
50
+ ],
51
+ },
52
+ });
53
+ return result;
54
+ }
55
+ exports.signalsToFID = signalsToFID;
56
+ //# sourceMappingURL=signalsToFID.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"signalsToFID.js","sourceRoot":"","sources":["../../src/signals/signalsToFID.ts"],"names":[],"mappings":";;;AAAA,iEAAwD;AAExD,4DAAyD;AAGzD,0EAAuE;AACvE,kEAA+D;AAC/D,kEAA+D;AAW/D,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AAE1B,SAAgB,YAAY,CAC1B,OAAsB,EACtB,OAA4B;IAE5B,MAAM,EACJ,EAAE,GAAG,CAAC,EACN,IAAI,GAAG,CAAC,EACR,EAAE,GAAG,EAAE,EACP,QAAQ,GAAG,IAAI,EACf,SAAS,GAAG,GAAG,EACf,cAAc,GAAG,CAAC,GACnB,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,GAAG,IAAA,yCAAmB,EAAC,OAAO,CAAC,CAAC;IAE9C,UAAU,CAAC,QAAQ,GAAG,IAAA,iCAAe,EAAC,UAAU,EAAE;QAChD,SAAS;QACT,cAAc;KACf,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,IAAA,iCAAe,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,MAAM,EAAE,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,EAAE,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEtC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IAC/B,MAAM,eAAe,GAAG,QAAQ,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,IAAA,uCAAe,EAAC;QAC3B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,CAAC;QACP,EAAE,EAAE,eAAe;KACpB,CAAC,CAAC;IAEH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;QACtB,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC;QACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YACjC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACrC;KACF;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,GAAG,IAAA,yBAAW,EAC3C,EAAE,EAAE,EAAE,EAAE,EAAE,EACV;QACE,aAAa,EAAE,CAAC;QAChB,OAAO,EAAE;YACP,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE;gBACN;oBACE,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE;wBACL,IAAI,EAAE,aAAa;wBACnB,OAAO,EAAE;4BACP,EAAE,EAAE,eAAe,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC;4BACpC,EAAE;yBACH;qBACF;iBACF;aACF;SACF;KACF,CACF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AA/DD,oCA+DC"}
@@ -168,7 +168,7 @@ spinSystem, options = {}) {
168
168
  });
169
169
  }
170
170
  }
171
- return xyPeaks;
171
+ return xyPeaks.filter((peak) => peak.x < 1000);
172
172
  }
173
173
  exports.simulateXYPeaks = simulateXYPeaks;
174
174
  function triuTimesAbs(A, val) {
@@ -1 +1 @@
1
- {"version":3,"file":"simulateXYPeaks.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulateXYPeaks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"simulateXYPeaks.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulateXYPeaks.ts"],"names":[],"mappings":"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"}
@@ -42,5 +42,5 @@ export interface OptionsXYAutoPeaksPicking extends Partial<GetPeakListOptions> {
42
42
  */
43
43
  frequency: number;
44
44
  }
45
- export declare type NMRPeak1DWithID = MakeMandatory<NMRPeak1D, 'id'>;
46
- export declare function xyAutoPeaksPicking(data: DataXY, options: OptionsXYAutoPeaksPicking): NMRPeak1DWithID[];
45
+ export declare type NMRPeak1DWithShapeID = MakeMandatory<NMRPeak1D, 'id' | 'shape'>;
46
+ export declare function xyAutoPeaksPicking(data: DataXY, options: OptionsXYAutoPeaksPicking): NMRPeak1DWithShapeID[];
@@ -56,8 +56,7 @@ function getNegativePeaks(data, cutOff, getPeakOptions) {
56
56
  }
57
57
  function getPeakList(data, options) {
58
58
  const { shape, frequency, broadWidth, optimize, maxCriteria, factorLimits, sgOptions, minMaxRatio, broadRatio, noiseLevel, smoothY, optimization, realTopDetection, } = options;
59
- let peakList = (0, ml_gsd_1.gsd)(data, {
60
- shape,
59
+ const peaks = (0, ml_gsd_1.gsd)(data, {
61
60
  sgOptions,
62
61
  maxCriteria,
63
62
  minMaxRatio,
@@ -65,6 +64,7 @@ function getPeakList(data, options) {
65
64
  smoothY,
66
65
  realTopDetection,
67
66
  });
67
+ const peakList = (0, ml_gsd_1.setShape)(peaks, { output: peaks, shape });
68
68
  const newPeaks = broadWidth
69
69
  ? (0, ml_gsd_1.joinBroadPeaks)(peakList, {
70
70
  broadRatio,
@@ -1 +1 @@
1
- {"version":3,"file":"xyAutoPeaksPicking.js","sourceRoot":"","sources":["../../src/xy/xyAutoPeaksPicking.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"xyAutoPeaksPicking.js","sourceRoot":"","sources":["../../src/xy/xyAutoPeaksPicking.ts"],"names":[],"mappings":"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"}
@@ -8,10 +8,11 @@ function xyPeaksOptimization(data, peaks, options) {
8
8
  const { frequency } = options;
9
9
  const newPeaks = (0, convertWidthToPPM_1.convertWidthToPPM)(peaks, { frequency });
10
10
  const optimizedPeaks = (0, ml_gsd_1.optimizePeaks)(data, newPeaks, options);
11
- return (0, convertWidthToHz_1.convertWidthToHz)(optimizedPeaks, {
11
+ const result = (0, convertWidthToHz_1.convertWidthToHz)(optimizedPeaks, {
12
12
  frequency,
13
13
  output: optimizedPeaks,
14
14
  });
15
+ return result;
15
16
  }
16
17
  exports.xyPeaksOptimization = xyPeaksOptimization;
17
18
  //# sourceMappingURL=xyPeaksOptimization.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"xyPeaksOptimization.js","sourceRoot":"","sources":["../../src/xy/xyPeaksOptimization.ts"],"names":[],"mappings":";;;AACA,mCAA6D;AAE7D,qEAAkE;AAClE,uEAAoE;AAQpE,SAAgB,mBAAmB,CACjC,IAAY,EACZ,KAAU,EACV,OAAmC;IAEnC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,IAAA,sBAAa,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9D,OAAO,IAAA,mCAAgB,EAAC,cAAc,EAAE;QACtC,SAAS;QACT,MAAM,EAAE,cAAc;KACvB,CAAC,CAAC;AACL,CAAC;AAZD,kDAYC"}
1
+ {"version":3,"file":"xyPeaksOptimization.js","sourceRoot":"","sources":["../../src/xy/xyPeaksOptimization.ts"],"names":[],"mappings":";;;AACA,mCAA6D;AAE7D,qEAAkE;AAClE,uEAAoE;AASpE,SAAgB,mBAAmB,CACjC,IAAY,EACZ,KAAU,EACV,OAAmC;IAEnC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,IAAA,sBAAa,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,IAAA,mCAAgB,EAAC,cAAc,EAAE;QAC9C,SAAS;QACT,MAAM,EAAE,cAAc;KACvB,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,kDAaC"}