nmr-processing 3.3.0 → 3.3.4
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/CHANGELOG.md +28 -0
- package/lib/databases/DatabaseNMREntry.d.ts +1 -1
- package/lib/index.d.ts +9 -0
- package/lib/peaks/peaksToRanges.d.ts +1 -1
- package/lib/peaks/peaksToRanges.js.map +1 -1
- package/lib/peaks/util/determineRealTop.d.ts +1 -1
- package/lib/peaks/util/jAnalyzer.d.ts +2 -2
- package/lib/prediction/predictCOSY.d.ts +3 -3
- package/lib/prediction/predictCarbon.d.ts +1 -1
- package/lib/prediction/predictCarbon.js +5 -5
- package/lib/prediction/predictCarbon.js.map +1 -1
- package/lib/prediction/predictHMBC.d.ts +3 -3
- package/lib/prediction/predictHSQC.d.ts +3 -3
- package/lib/prediction/predictProton.js +2 -2
- package/lib/prediction/predictProton.js.map +1 -1
- package/lib/prediction/utils/getFilteredIDiaIDs.d.ts +1 -1
- package/lib/prediction/utils/predict2D.js +6 -6
- package/lib/prediction/utils/predict2D.js.map +1 -1
- package/lib/prediction/utils/queryByHOSE.d.ts +1 -1
- package/lib/prediction/utils/queryByHOSE.js +1 -1
- package/lib/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib/ranges/rangesToXY.d.ts +2 -2
- package/lib/signal/signalJoinCouplings.d.ts +1 -1
- package/lib/signal/signalJoinCouplings.js +5 -5
- package/lib/signal/signalJoinCouplings.js.map +1 -1
- package/lib/signals/hackSignalsToXY.js +7 -7
- package/lib/signals/hackSignalsToXY.js.map +1 -1
- package/lib/signals/signals2DToZ.js.map +1 -1
- package/lib/signals/signalsJoin.js +1 -1
- package/lib/signals/signalsJoin.js.map +1 -1
- package/lib/signals/signalsToXY.d.ts +2 -2
- package/lib/signals/signalsToXY.js +4 -4
- package/lib/signals/signalsToXY.js.map +1 -1
- package/lib/signals/simulation/signalsToSpinSystem.js +8 -8
- package/lib/signals/simulation/signalsToSpinSystem.js.map +1 -1
- package/lib/signals/simulation/simulate1D.d.ts +3 -3
- package/lib/types/MPFPeak.d.ts +9 -0
- package/lib/types/MPFPeak.js +3 -0
- package/lib/types/MPFPeak.js.map +1 -0
- package/lib/types/MakeMandatory.d.ts +3 -0
- package/lib/types/MakeMandatory.js +3 -0
- package/lib/types/MakeMandatory.js.map +1 -0
- package/lib/types/NMRPeak1D.d.ts +11 -0
- package/lib/types/NMRPeak1D.js +3 -0
- package/lib/types/NMRPeak1D.js.map +1 -0
- package/lib/types/NMRRange.d.ts +11 -0
- package/lib/types/NMRRange.js +3 -0
- package/lib/types/NMRRange.js.map +1 -0
- package/lib/types/NMRSignal1D.d.ts +21 -0
- package/lib/types/NMRSignal1D.js +3 -0
- package/lib/types/NMRSignal1D.js.map +1 -0
- package/lib/types/NMRSignal2D.d.ts +19 -0
- package/lib/types/NMRSignal2D.js +3 -0
- package/lib/types/NMRSignal2D.js.map +1 -0
- package/lib/types/NMRZone.d.ts +11 -0
- package/lib/types/NMRZone.js +3 -0
- package/lib/types/NMRZone.js.map +1 -0
- package/lib/types/XYNumberArray.d.ts +4 -0
- package/lib/types/XYNumberArray.js +3 -0
- package/lib/types/XYNumberArray.js.map +1 -0
- package/lib/types/dataStructure.d.ts +4 -0
- package/lib/types/dataStructure.js +3 -0
- package/lib/types/dataStructure.js.map +1 -0
- package/lib/types/jcoupling.d.ts +8 -0
- package/lib/types/jcoupling.js +3 -0
- package/lib/types/jcoupling.js.map +1 -0
- package/lib/types/nmrAssigment.d.ts +28 -0
- package/lib/types/nmrAssigment.js +3 -0
- package/lib/types/nmrAssigment.js.map +1 -0
- package/lib/types/prediction1D.d.ts +12 -0
- package/lib/types/prediction1D.js +3 -0
- package/lib/types/prediction1D.js.map +1 -0
- package/{src → lib}/types/prediction2D.d.ts +0 -0
- package/lib/types/prediction2D.js +2 -0
- package/lib/types/prediction2D.js.map +1 -0
- package/lib/types/spinSystem.d.ts +8 -0
- package/lib/types/spinSystem.js +3 -0
- package/lib/types/spinSystem.js.map +1 -0
- package/lib/xy/xyAutoRangesPicking.d.ts +1 -1
- package/lib-esm/peaks/peaksToRanges.js.map +1 -1
- package/lib-esm/prediction/predictCarbon.js +5 -5
- package/lib-esm/prediction/predictCarbon.js.map +1 -1
- package/lib-esm/prediction/predictProton.js +2 -2
- package/lib-esm/prediction/predictProton.js.map +1 -1
- package/lib-esm/prediction/utils/predict2D.js +6 -6
- package/lib-esm/prediction/utils/predict2D.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/signal/signalJoinCouplings.js +5 -5
- package/lib-esm/signal/signalJoinCouplings.js.map +1 -1
- package/lib-esm/signals/hackSignalsToXY.js +7 -7
- package/lib-esm/signals/hackSignalsToXY.js.map +1 -1
- package/lib-esm/signals/signals2DToZ.js.map +1 -1
- package/lib-esm/signals/signalsJoin.js +1 -1
- package/lib-esm/signals/signalsJoin.js.map +1 -1
- package/lib-esm/signals/signalsToXY.js +4 -4
- package/lib-esm/signals/signalsToXY.js.map +1 -1
- package/lib-esm/signals/simulation/signalsToSpinSystem.js +8 -8
- package/lib-esm/signals/simulation/signalsToSpinSystem.js.map +1 -1
- package/lib-esm/types/MPFPeak.js +2 -0
- package/lib-esm/types/MPFPeak.js.map +1 -0
- package/lib-esm/types/MakeMandatory.js +2 -0
- package/lib-esm/types/MakeMandatory.js.map +1 -0
- package/lib-esm/types/NMRPeak1D.js +2 -0
- package/lib-esm/types/NMRPeak1D.js.map +1 -0
- package/lib-esm/types/NMRRange.js +2 -0
- package/lib-esm/types/NMRRange.js.map +1 -0
- package/lib-esm/types/NMRSignal1D.js +2 -0
- package/lib-esm/types/NMRSignal1D.js.map +1 -0
- package/lib-esm/types/NMRSignal2D.js +2 -0
- package/lib-esm/types/NMRSignal2D.js.map +1 -0
- package/lib-esm/types/NMRZone.js +2 -0
- package/lib-esm/types/NMRZone.js.map +1 -0
- package/lib-esm/types/XYNumberArray.js +2 -0
- package/lib-esm/types/XYNumberArray.js.map +1 -0
- package/lib-esm/types/dataStructure.js +2 -0
- package/lib-esm/types/dataStructure.js.map +1 -0
- package/lib-esm/types/jcoupling.js +2 -0
- package/lib-esm/types/jcoupling.js.map +1 -0
- package/lib-esm/types/nmrAssigment.js +2 -0
- package/lib-esm/types/nmrAssigment.js.map +1 -0
- package/lib-esm/types/prediction1D.js +2 -0
- package/lib-esm/types/prediction1D.js.map +1 -0
- package/lib-esm/types/prediction2D.js +2 -0
- package/lib-esm/types/prediction2D.js.map +1 -0
- package/lib-esm/types/spinSystem.js +2 -0
- package/lib-esm/types/spinSystem.js.map +1 -0
- package/package.json +5 -6
- package/src/databases/DatabaseNMREntry.ts +1 -1
- package/src/index.ts +13 -0
- package/src/peaks/peaksToRanges.ts +3 -4
- package/src/peaks/util/determineRealTop.ts +1 -1
- package/src/peaks/util/jAnalyzer.ts +2 -2
- package/src/prediction/predictCOSY.ts +1 -1
- package/src/prediction/predictCarbon.ts +8 -8
- package/src/prediction/predictHMBC.ts +1 -1
- package/src/prediction/predictHSQC.ts +1 -1
- package/src/prediction/predictProton.ts +2 -2
- package/src/prediction/utils/predict2D.ts +12 -10
- package/src/prediction/utils/queryByHOSE.ts +2 -2
- package/src/ranges/rangesToACS.ts +1 -1
- package/src/ranges/rangesToXY.ts +2 -2
- package/src/signal/signalJoinCouplings.ts +6 -6
- package/src/signals/hackSignalsToXY.ts +8 -8
- package/src/signals/signals2DToZ.ts +0 -1
- package/src/signals/signalsJoin.ts +1 -1
- package/src/signals/signalsToRanges.ts +1 -1
- package/src/signals/signalsToXY.ts +7 -7
- package/src/signals/simulation/signalsToSpinSystem.ts +10 -10
- package/src/signals/simulation/simulate1D.ts +3 -3
- package/src/types/{MPFPeak.d.ts → MPFPeak.ts} +0 -0
- package/src/types/{MakeMandatory.d.ts → MakeMandatory.ts} +0 -0
- package/src/types/{NMRPeak1D.d.ts → NMRPeak1D.ts} +0 -0
- package/src/types/{NMRRange.d.ts → NMRRange.ts} +0 -0
- package/src/types/{NMRSignal1D.d.ts → NMRSignal1D.ts} +4 -4
- package/src/types/{NMRSignal2D.d.ts → NMRSignal2D.ts} +2 -1
- package/src/types/{NMRZone.d.ts → NMRZone.ts} +1 -1
- package/src/types/{XYNumberArray.d.ts → XYNumberArray.ts} +0 -0
- package/src/types/{dataStructure.d.ts → dataStructure.ts} +0 -0
- package/src/types/{jcoupling.d.ts → jcoupling.ts} +1 -1
- package/src/types/{nmrAssigment.d.ts → nmrAssigment.ts} +1 -1
- package/src/types/openchemlib-utils/{index.d.ts → index..d.ts} +0 -0
- package/src/types/{prediction1D.d.ts → prediction1D.ts} +0 -0
- package/src/types/prediction2D.ts +0 -0
- package/src/types/{spinSystem.d.ts → spinSystem.ts} +0 -0
- package/src/xyz/xyzAutoPeaksPicking.ts +1 -1
- package/src/xyz/xyzJResAnalyzer.ts +2 -2
- package/src/types/jest.d.ts +0 -15
|
@@ -10,11 +10,11 @@ function checkForMandatory(signals) {
|
|
|
10
10
|
for (const signal of signals) {
|
|
11
11
|
if (!signal.js)
|
|
12
12
|
throw new Error('there is not js');
|
|
13
|
-
if (!signal.
|
|
14
|
-
throw new Error('there is not
|
|
13
|
+
if (!signal.atoms)
|
|
14
|
+
throw new Error('there is not atoms');
|
|
15
15
|
for (const jcoupling of signal.js) {
|
|
16
|
-
if (!jcoupling.
|
|
17
|
-
throw new Error('there is not
|
|
16
|
+
if (!jcoupling.atoms)
|
|
17
|
+
throw new Error('there is not atoms');
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -29,16 +29,16 @@ function signalsToSpinSystem(signals) {
|
|
|
29
29
|
for (let i = 0; i < nSpins; i++) {
|
|
30
30
|
multiplicity[i] = 2;
|
|
31
31
|
chemicalShifts[i] = signals[i].delta;
|
|
32
|
-
const index = signals[i].
|
|
32
|
+
const index = signals[i].atoms[0];
|
|
33
33
|
ids[index] = i;
|
|
34
34
|
}
|
|
35
35
|
//create the coupling matrix
|
|
36
36
|
for (let i = 0; i < nSpins; i++) {
|
|
37
|
-
let {
|
|
37
|
+
let { atoms: signalAssignment, js: jCoupling } = signals[i];
|
|
38
38
|
const fromIndex = signalAssignment[0];
|
|
39
39
|
for (const jcoupling of jCoupling) {
|
|
40
|
-
let { coupling,
|
|
41
|
-
const toIndex =
|
|
40
|
+
let { coupling, atoms } = jcoupling;
|
|
41
|
+
const toIndex = atoms[0];
|
|
42
42
|
couplingConstants.set(ids[fromIndex], ids[toIndex], coupling);
|
|
43
43
|
couplingConstants.set(ids[toIndex], ids[fromIndex], coupling);
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signalsToSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/signalsToSpinSystem.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAmC;AACnC,gFAAoD;AAiBpD,SAAS,iBAAiB,CACxB,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"signalsToSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/signalsToSpinSystem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import { SpinSystem } from '../../types/spinSystem';
|
|
1
|
+
import type { Shape1DOptions } from 'spectrum-generator';
|
|
2
|
+
import type { SpinSystem } from '../../types/spinSystem';
|
|
3
3
|
interface Simulate1DOptions {
|
|
4
4
|
/**
|
|
5
5
|
* The linewidth of the output spectrum, expresed in Hz.
|
|
@@ -35,7 +35,7 @@ interface Simulate1DOptions {
|
|
|
35
35
|
* Shape options
|
|
36
36
|
* @default {kind:'gaussian'}
|
|
37
37
|
*/
|
|
38
|
-
shape?:
|
|
38
|
+
shape?: Shape1DOptions;
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
41
41
|
* This function simulates a one dimensional nmr spectrum. This function returns an array containing the relative intensities of the spectrum in the specified simulation window (from-to).
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MPFPeak.js","sourceRoot":"","sources":["../../src/types/MPFPeak.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MakeMandatory.js","sourceRoot":"","sources":["../../src/types/MakeMandatory.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NMRPeak1D.js","sourceRoot":"","sources":["../../src/types/NMRPeak1D.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NMRRange.js","sourceRoot":"","sources":["../../src/types/NMRRange.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { NMRPeak1D } from './NMRPeak1D';
|
|
2
|
+
import type { Jcoupling } from './jcoupling';
|
|
3
|
+
export interface NMRSignal1D {
|
|
4
|
+
delta: number;
|
|
5
|
+
js?: Jcoupling[];
|
|
6
|
+
atoms?: number[];
|
|
7
|
+
assignment?: string;
|
|
8
|
+
kind?: string;
|
|
9
|
+
multiplicity?: string;
|
|
10
|
+
diaIDs?: string[];
|
|
11
|
+
nbAtoms?: number;
|
|
12
|
+
integration?: number;
|
|
13
|
+
peaks?: NMRPeak1D[];
|
|
14
|
+
statistic?: {
|
|
15
|
+
mean: number;
|
|
16
|
+
sd: number;
|
|
17
|
+
min: number;
|
|
18
|
+
max: number;
|
|
19
|
+
nb: number;
|
|
20
|
+
};
|
|
21
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NMRSignal1D.js","sourceRoot":"","sources":["../../src/types/NMRSignal1D.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { MPFPeak } from './MPFPeak';
|
|
2
|
+
export interface Signal2DAxisData {
|
|
3
|
+
nucleus?: string;
|
|
4
|
+
delta: number;
|
|
5
|
+
resolution?: number;
|
|
6
|
+
atoms?: number[];
|
|
7
|
+
diaIDs?: string[];
|
|
8
|
+
fromTo?: {
|
|
9
|
+
from: number;
|
|
10
|
+
to: number;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
export interface NMRSignal2D {
|
|
14
|
+
x: Signal2DAxisData;
|
|
15
|
+
y: Signal2DAxisData;
|
|
16
|
+
peaks?: MPFPeak[];
|
|
17
|
+
kind?: string;
|
|
18
|
+
_highlight?: (number | string)[];
|
|
19
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NMRSignal2D.js","sourceRoot":"","sources":["../../src/types/NMRSignal2D.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NMRZone.js","sourceRoot":"","sources":["../../src/types/NMRZone.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"XYNumberArray.js","sourceRoot":"","sources":["../../src/types/XYNumberArray.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dataStructure.js","sourceRoot":"","sources":["../../src/types/dataStructure.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jcoupling.js","sourceRoot":"","sources":["../../src/types/jcoupling.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Molecule } from 'openchemlib';
|
|
2
|
+
import type { NMRRange } from './NMRRange';
|
|
3
|
+
import type { NMRZone } from './NMRZone';
|
|
4
|
+
export interface NMRAssignmentType {
|
|
5
|
+
/**
|
|
6
|
+
* It has the number of each atoms in the chemical structure. e.g. { C: 6, H: 6 }
|
|
7
|
+
*/
|
|
8
|
+
atoms: {
|
|
9
|
+
[key: string]: number;
|
|
10
|
+
};
|
|
11
|
+
/**
|
|
12
|
+
* Contains the ranges for each nucleus or kind of experiment e.g. { H: [], C: [], apt: [], dept135: []}
|
|
13
|
+
* the ranges represented with atom label only contain the range from a single pulse experiment or equivalent.
|
|
14
|
+
*/
|
|
15
|
+
ranges: {
|
|
16
|
+
[key: string]: NMRRange[];
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Contains the zones for each kind of experiment e.g. { H: [], C: [], apt: [], dept135: []};
|
|
20
|
+
*/
|
|
21
|
+
zones: {
|
|
22
|
+
[key: string]: NMRZone[];
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* Instance of Molecule
|
|
26
|
+
*/
|
|
27
|
+
molecule: Molecule;
|
|
28
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nmrAssigment.js","sourceRoot":"","sources":["../../src/types/nmrAssigment.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { Molecule } from 'openchemlib';
|
|
2
|
+
import type { NMRRange } from "./NMRRange";
|
|
3
|
+
import type { NMRSignal1D } from "./NMRSignal1D";
|
|
4
|
+
export interface Prediction1D {
|
|
5
|
+
molfile: string;
|
|
6
|
+
diaIDs: string[];
|
|
7
|
+
nucleus: string;
|
|
8
|
+
joinedSignals: NMRSignal1D[];
|
|
9
|
+
signals: NMRSignal1D[];
|
|
10
|
+
ranges: NMRRange[];
|
|
11
|
+
molecule: Molecule;
|
|
12
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prediction1D.js","sourceRoot":"","sources":["../../src/types/prediction1D.ts"],"names":[],"mappings":""}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prediction2D.js","sourceRoot":"","sources":["../../src/types/prediction2D.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spinSystem.js","sourceRoot":"","sources":["../../src/types/spinSystem.ts"],"names":[],"mappings":""}
|
|
@@ -10,5 +10,5 @@ interface OptionsXYAutoRangesPicking {
|
|
|
10
10
|
/**
|
|
11
11
|
* Detect peaks, optimize parameters and compile multiplicity if required.
|
|
12
12
|
*/
|
|
13
|
-
export declare function xyAutoRangesPicking(data: XYNumberArray, options?: OptionsXYAutoRangesPicking): import("
|
|
13
|
+
export declare function xyAutoRangesPicking(data: XYNumberArray, options?: OptionsXYAutoRangesPicking): import("..").NMRRange[];
|
|
14
14
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ async function loadDB(url = 'https://www.lactame.com/lib/nmr-processing-data/202
|
|
|
15
15
|
return database;
|
|
16
16
|
}
|
|
17
17
|
function checkFromPrediction(signal) {
|
|
18
|
-
if (!signal.
|
|
19
|
-
throw new Error('There is not
|
|
18
|
+
if (!signal.atoms)
|
|
19
|
+
throw new Error('There is not atoms');
|
|
20
20
|
if (!signal.diaIDs)
|
|
21
21
|
throw new Error('There is not diaIDs');
|
|
22
22
|
if (!signal.nbAtoms)
|
|
@@ -61,10 +61,10 @@ export async function predictCarbon(molecule, options = {}) {
|
|
|
61
61
|
function formatSignals(predictions) {
|
|
62
62
|
let signals = [];
|
|
63
63
|
for (const prediction of predictions) {
|
|
64
|
-
const {
|
|
64
|
+
const { atoms, nbAtoms, delta, diaIDs, statistic } = prediction;
|
|
65
65
|
const signal = {
|
|
66
66
|
delta: delta || NaN,
|
|
67
|
-
|
|
67
|
+
atoms,
|
|
68
68
|
diaIDs: diaIDs,
|
|
69
69
|
multiplicity: 's',
|
|
70
70
|
nbAtoms,
|
|
@@ -85,7 +85,7 @@ function joinSignalByDiaID(signals) {
|
|
|
85
85
|
}
|
|
86
86
|
else {
|
|
87
87
|
joinedSignals[diaID].nbAtoms += signal.nbAtoms;
|
|
88
|
-
joinedSignals[diaID].
|
|
88
|
+
joinedSignals[diaID].atoms.push(...signal.atoms);
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
return Object.values(joinedSignals);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictCarbon.js","sourceRoot":"","sources":["../../src/prediction/predictCarbon.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAGhC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAc,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,KAAK,GAAyC,EAAE,CAAC;AAEvD,KAAK,UAAU,MAAM,CACnB,GAAG,GAAG,oEAAoE;IAE1E,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;KACnB;IACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAsB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC1D,KAAK,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;IACtB,OAAO,QAAQ,CAAC;AAClB,CAAC;AA8BD,SAAS,mBAAmB,CAC1B,MAAmB;IAEnB,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"predictCarbon.js","sourceRoot":"","sources":["../../src/prediction/predictCarbon.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ function protonParser(result, molecule, diaIDs) {
|
|
|
53
53
|
let couplings = fields.slice(4);
|
|
54
54
|
let atom = Number(fields[0]) - 1;
|
|
55
55
|
let signal = {
|
|
56
|
-
|
|
56
|
+
atoms: [atom],
|
|
57
57
|
diaIDs: [diaIDs[atom]],
|
|
58
58
|
nbAtoms: 1,
|
|
59
59
|
delta: Number(fields[2]),
|
|
@@ -66,7 +66,7 @@ function protonParser(result, molecule, diaIDs) {
|
|
|
66
66
|
let linked = Number(couplings[i]) - 1;
|
|
67
67
|
signal.js.push({
|
|
68
68
|
coupling: Number(couplings[i + 2]),
|
|
69
|
-
|
|
69
|
+
atoms: [linked],
|
|
70
70
|
diaIDs: [diaIDs[linked]],
|
|
71
71
|
multiplicity: 'd',
|
|
72
72
|
distance: distanceMatrix[atom][linked],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictProton.js","sourceRoot":"","sources":["../../src/prediction/predictProton.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,iCAAiC,EACjC,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAkB7D,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAkB,EAClB,UAAgC,EAAE;IAElC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1B,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;IACrC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAChC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAErC,IAAI,MAAM,CAAC;IACX,IAAI,KAAK,EAAE;QACT,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;KACzB;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAChC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,yCAAyC,EAAE;YACtE,MAAM,EAAE,MAAM;YACd,kBAAkB;YAClB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SACxB;KACF;IAED,MAAM,MAAM,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO;QACL,OAAO;QACP,MAAM;QACN,OAAO,EAAE,IAAI;QACb,aAAa;QACb,OAAO;QACP,MAAM,EAAE,eAAe,CAAC,aAAa,CAAC;QACtC,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,MAAc,EACd,QAAkB,EAClB,MAAgB;IAEhB,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC1B,MAAM,KAAK,CAAC,wBAAwB,MAAM,EAAE,CAAC,CAAC;KAC/C;IACD,IAAI,cAAc,GAAG,qBAAqB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;QACtB,IAAI,MAAM,GAAa,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,MAAM,GAAgB;YACxB,
|
|
1
|
+
{"version":3,"file":"predictProton.js","sourceRoot":"","sources":["../../src/prediction/predictProton.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ export async function predict2D(molecule, options = {}) {
|
|
|
74
74
|
peak[axis] = signalsByDiaID[axis][diaID].delta;
|
|
75
75
|
signal[axis].delta = signalsByDiaID[axis][diaID].delta;
|
|
76
76
|
signal[axis].diaIDs = [diaID];
|
|
77
|
-
signal[axis].atoms = signalsByDiaID[axis][diaID].
|
|
77
|
+
signal[axis].atoms = signalsByDiaID[axis][diaID].atoms;
|
|
78
78
|
}
|
|
79
79
|
signal.peaks = [peak];
|
|
80
80
|
group[key] = signal;
|
|
@@ -98,11 +98,11 @@ export async function predict2D(molecule, options = {}) {
|
|
|
98
98
|
function splitSignals(joinedSignals) {
|
|
99
99
|
let signals = [];
|
|
100
100
|
for (const signal of joinedSignals) {
|
|
101
|
-
for (const xAtom of signal.x.
|
|
102
|
-
for (const yAtom of signal.y.
|
|
101
|
+
for (const xAtom of signal.x.atoms || []) {
|
|
102
|
+
for (const yAtom of signal.y.atoms || []) {
|
|
103
103
|
let newSignal = JSON.parse(JSON.stringify(signal));
|
|
104
|
-
newSignal.x.
|
|
105
|
-
newSignal.y.
|
|
104
|
+
newSignal.x.atoms = [xAtom];
|
|
105
|
+
newSignal.y.atoms = [yAtom];
|
|
106
106
|
signals.push(newSignal);
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -125,7 +125,7 @@ function addSelftCorrelation(group, options) {
|
|
|
125
125
|
peak[axis] = signalsByDiaID[axis][diaID].delta;
|
|
126
126
|
signal[axis].delta = signalsByDiaID[axis][diaID].delta;
|
|
127
127
|
signal[axis].diaIDs = [diaID];
|
|
128
|
-
signal[axis].atoms = signalsByDiaID[axis][diaID].
|
|
128
|
+
signal[axis].atoms = signalsByDiaID[axis][diaID].atoms;
|
|
129
129
|
}
|
|
130
130
|
signal.peaks = [peak];
|
|
131
131
|
group[`${atom.oclID}-${atom.oclID}`] = signal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predict2D.js","sourceRoot":"","sources":["../../../src/prediction/utils/predict2D.ts"],"names":[],"mappings":"AAAA,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;AAc3B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAwFlD,SAAS,WAAW,CAClB,OAAyB;IAEzB,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"predict2D.js","sourceRoot":"","sources":["../../../src/prediction/utils/predict2D.ts"],"names":[],"mappings":"AAAA,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;AAc3B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAwFlD,SAAS,WAAW,CAClB,OAAyB;IAEzB,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;AACH,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,QAAkB,EAClB,UAA4B,EAAE;IAE9B,WAAW,CAAC,OAAO,CAAC,CAAC;IAErB,IAAI,EACF,IAAI,EACJ,EAAE,EACF,SAAS,GAAG,CAAC,EACb,SAAS,EACT,cAAc,GAAG,EAAE,EACnB,WAAW,EACX,SAAS,EACT,YAAY,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAClC,eAAe,GAAG,KAAK,GACxB,GAAG,OAAO,CAAC;IAEZ,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAEhC,IAAI,MAAM,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;IAEvD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE;QACnC,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;QACX,SAAS;QACT,SAAS;KACV,CAAC,CAAC;IAEH,IAAI,kBAAkB,GAA6C,EAAE,CAAC;IACtE,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;QACxB,kBAAkB,CAAC,IAAI,CAAC;YACtB,GAAG,KAAK;YACR,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAa;SACxE,CAAC,CAAC;KACJ;IAED,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,SAAS,EACT,WAAW,CACZ,CAAC;IAEF,MAAM,WAAW,GACf,IAAI,KAAK,EAAE;QACT,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,MAAM,cAAc,CAClB,EAAE,EACF,QAAQ,EACR,cAAc,EACd,SAAS,EACT,WAAW,CACZ,CAAC;IAER,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;KACnD;IAED,MAAM,OAAO,GAAoC;QAC/C,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;KACf,CAAC;IAEF,MAAM,cAAc,GAAoB;QACtC,CAAC,EAAE,EAAE;QACL,CAAC,EAAE,EAAE;KACN,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;QACjC,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE;YAChD,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC7D,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;SACjD;KACF;IAED,IAAI,KAAK,GAAmC,EAAE,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,kBAAkB,EAAE;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC5B,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAEpC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,SAAS;QAE5C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;YAC/B,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC;gBAAE,SAAS;YAEtD,IAAI,WAAW,GAAgC;gBAC7C,CAAC,EAAE,IAAI;gBACP,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;aAClB,CAAC;YAEF,MAAM,GAAG,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAE5D,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;gBACvD,SAAS;aACV;YAED,IAAI,IAAI,GAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;YAC3B,IAAI,MAAM,GAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YACnC,KAAK,IAAI,IAAI,IAAI,WAAW,EAAE;gBAC5B,IAAI,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;gBAC/C,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;gBACvD,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;aACxD;YAED,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;YAEtB,KAAK,CAAC,GAAG,CAAC,GAAG,MAAqB,CAAC;SACpC;KACF;IAED,IAAI,eAAe;QAAE,mBAAmB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;IAE3E,iCAAiC;IACjC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,WAAW,CAAC,aAAa,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAErE,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,SAAS,EAAE;QAC7B,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM;QACxB,MAAM,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAC/B,aAAa;QACb,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC;QACpC,KAAK;QACL,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,aAA4B;IAChD,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;QAClC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE;YACxC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE;gBACxC,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBACnD,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACzB;SACF;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAMD,SAAS,mBAAmB,CAC1B,KAAqC,EACrC,OAAmC;IAEnC,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAEpC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;YAAE,SAAS;QACvC,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC;YAAE,SAAS;QAEzC,IAAI,MAAM,GAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,IAAI,GAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACzB,KAAK,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;SACxD;QAED,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QAEtB,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,MAAqB,CAAC;KAC9D;AACH,CAAC;AAOD,SAAS,WAAW,CAAC,OAAsB,EAAE,OAA2B;IACtE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEtE,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAEjC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;IACvC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAChD,CAAC;IAEF,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,OAAO,CAAC,MAAM;YAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACxD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;gBACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;aAC7B;SACF;QAED,KAAK,CAAC,IAAI,CAAC;YACT,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YAC7C,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;KACJ;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,MAAM,CAAC,OAAsB,EAAE,OAA2B;IACjE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC3C,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QACjD,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QACjD,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QACjD,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;KAClD;IACD,OAAO;QACL,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE;QACrE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,EAAE;KAClE,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAAmB,EAAE,WAAmB;IAC7D,IAAI,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;IACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,OAAO,CAAC,MAAM,GAAG,WAAW,EAAE;YAChC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACzB;KACF;IACD,OAAO,QAAQ,CAAC,MAAM,GAAG,cAAc;QACrC,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC;QACtC,CAAC,CAAC,QAAQ,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryByHOSE.js","sourceRoot":"","sources":["../../../src/prediction/utils/queryByHOSE.ts"],"names":[],"mappings":"AAkBA,MAAM,UAAU,WAAW,CACzB,MAA6B,EAC7B,EAAqB,EACrB,OAAkC;IAElC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAElC,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,GAAG,CAAC;QACR,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC/C,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;gBACT,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,KAAK,GAAG,CAAC,CAAC;aACX;SACF;QAED,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE;YACtC,IAAI,IAAI,GAAG;gBACT,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;gBACvB,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,IAAI;gBACzB,
|
|
1
|
+
{"version":3,"file":"queryByHOSE.js","sourceRoot":"","sources":["../../../src/prediction/utils/queryByHOSE.ts"],"names":[],"mappings":"AAkBA,MAAM,UAAU,WAAW,CACzB,MAA6B,EAC7B,EAAqB,EACrB,OAAkC;IAElC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAElC,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,GAAG,CAAC;QACR,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC/C,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;gBACT,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,KAAK,GAAG,CAAC,CAAC;aACX;SACF;QAED,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE;YACtC,IAAI,IAAI,GAAG;gBACT,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;gBACvB,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,IAAI;gBACzB,KAAK,EAAE,CAAC,UAAU,CAAC;gBACnB,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,KAAK;gBACZ,SAAS,EACP,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;oBACnB,CAAC,CAAC;wBACE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;wBACZ,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;wBACV,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;wBACX,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;wBACX,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;qBACX;oBACH,CAAC,CAAC,SAAS;aAChB,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrB;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|