From 5b823bf90b8c8b5a29e8704f7a6364eada438793 Mon Sep 17 00:00:00 2001
From: jinmingtao
Date: Tue, 17 Nov 2026 13:01:25 +0800
Subject: [PATCH 1/2] feat(v2.5): integrate order JNI contract
---
.../runtime/AlgorithmLibJNIBridgeService.java | 72 +-
.../PublicOrderTrackingAlgorithmService.java | 37 +-
.../core/jni/AlgorithmLibJNIBridge.java | 201 +++--
.../core/jni/OrderTrackingJNIBridge.java | 53 +-
.../AlgorithmLibBridgeContractTest.java | 81 +-
.../AlgorithmLibJNIBridgeServiceTest.java | 10 +-
.../runtime/OrderTrackingContractTest.java | 137 ++-
.../runtime/PublicAlgorithmServiceTest.java | 16 +-
.../PublicBkCpbAlgorithmServiceTest.java | 18 +-
.../runtime/PublicBkCpbSharedTaskTest.java | 12 +-
.../runtime/PublicBkTaskContractTest.java | 22 +-
.../opentest/core/jni/model/JNIErrorCode.java | 64 +-
.../core/jni/model/JNIErrorCodeMapper.java | 64 +-
.../native/windows-amd64/CRYASIODriverEx.dll | Bin 172032 -> 172032 bytes
.../native/windows-amd64/CRYAlgorithmLib.dll | Bin 1893376 -> 1914880 bytes
.../windows-amd64/CRYAudioDriverExport.dll | Bin 44032 -> 44032 bytes
.../native/windows-amd64/CRYBluetoothLib.dll | Bin 205312 -> 205312 bytes
.../windows-amd64/CRYJNIAudioProtocol.dll | Bin 2498560 -> 2499072 bytes
.../native/windows-amd64/CRYSequenceLib.dll | Bin 1181696 -> 1182208 bytes
.../windows-amd64/CRYUnitConversion.dll | Bin 144896 -> 144896 bytes
.../native/windows-amd64/License.dat | 2 +-
.../native/windows-amd64/OptDevHost.exe | Bin 1608704 -> 1609216 bytes
.../native/windows-amd64/cry_analyst.dll | Bin 2935808 -> 3404800 bytes
.../windows-amd64/cry_hw_51b_calibration.dll | Bin 45056 -> 45056 bytes
.../windows-amd64/cry_hw_51b_switch.dll | Bin 36864 -> 36864 bytes
.../native/windows-amd64/front-algorithm.dll | Bin 89088 -> 89088 bytes
.../native/windows-amd64/prd/License.dat | 1 -
.../native/windows-amd64/prd/cry_analyst.dll | Bin 2935808 -> 0 bytes
.../windows-amd64/wasapiDriverExport.dll | Bin 123392 -> 123392 bytes
.../core/overall/BandOverallCalculator.java | 6 +-
.../service/jni/AlgorithmBusinessService.java | 10 +-
.../jni/bkcpb/BkCpbBatchResultAdapter.java | 2 +-
.../jni/bkcpb/BkCpbSelectedResultAdapter.java | 2 +-
.../bkcpb/HostBkCpbBatchResultAdapter.java | 2 +-
.../jni/bkfft/BkFftSelectedResultAdapter.java | 4 +-
.../bkcpb/BkCpbBatchResultAdapterTest.java | 2 +-
.../api/OrderTrackingAlgorithmService.java | 48 +-
.../algorithm/api/OrderTrackingModels.java | 800 +++++-------------
.../runtime/OrderTrackingBindingsTest.java | 27 +-
apps/desktop/src/config/native-platform.js | 4 +-
apps/desktop/src/service/backend-launch.js | 2 +-
apps/native/docs/architecture.md | 17 -
apps/native/docs/code-review-standard.md | 448 ----------
apps/native/docs/framework-boundary-audit.md | 166 ----
...ramework-boundary-validation-2026-10-22.md | 90 --
.../docs/framework-plugin-contract-v240.md | 91 --
...-arm64-foundation-validation-2026-10-16.md | 60 --
.../plugins/AUDIO_OTPLUGIN_HANDOFF.zh-CN.md | 65 --
.../plugins/DEVICE_PLUGIN_RELEASE.zh-CN.md | 29 -
.../API_REFERENCE.zh-CN.md | 200 -----
.../ERROR_MESSAGES.zh-CN.md | 38 -
.../EXTENSIONS.zh-CN.md | 189 -----
.../plugins/OpenTestDevicePluginSDK/README.md | 31 -
.../OpenTestDevicePluginSDK/README.zh-CN.md | 99 ---
.../plugins/OptDevHost/tests/README.md | 16 -
.../OpenTestNiDaqDevicePlugin/MIGRATION.md | 18 -
.../OpenTestNiDaqDevicePlugin/README.zh-CN.md | 74 --
.../README.zh-CN.md | 55 --
.../package/README.md | 23 -
.../modules/plugins/RELEASE_LAYOUT.zh-CN.md | 130 ---
.../plugin-deactivation-dll-lock-20261029.md | 209 -----
apps/native/docs/public-build.md | 45 -
.../2026-10-22-framework-plugin-boundary.md | 17 -
.../2026-10-26-device-broker-integration.md | 154 ----
.../2026-10-26-device-duplex-transport.md | 35 -
.../2026-10-26-device-request-multiplexing.md | 76 --
.../2026-10-26-device-worker-foundation.md | 63 --
.../plans/2026-10-26-device-worker-process.md | 58 --
...026-10-26-device-fault-isolation-design.md | 101 ---
...10-26-physical-execution-scope-addendum.md | 36 -
docs/handoffs/math-fs-2026-11-12.md | 155 ++++
.../math-fs-evaluation-and-result-units.md | 141 +++
tools/__tests__/packaging.test.mjs | 46 +-
tools/__tests__/runtime.test.mjs | 8 +-
tools/__tests__/standalone-packaging.test.mjs | 11 +-
75 files changed, 1107 insertions(+), 3586 deletions(-)
delete mode 100644 apps/backend/crydaq-server/src/main/resources/native/windows-amd64/prd/License.dat
delete mode 100644 apps/backend/crydaq-server/src/main/resources/native/windows-amd64/prd/cry_analyst.dll
delete mode 100644 apps/native/docs/architecture.md
delete mode 100644 apps/native/docs/code-review-standard.md
delete mode 100644 apps/native/docs/framework-boundary-audit.md
delete mode 100644 apps/native/docs/framework-boundary-validation-2026-10-22.md
delete mode 100644 apps/native/docs/framework-plugin-contract-v240.md
delete mode 100644 apps/native/docs/linux-arm64-foundation-validation-2026-10-16.md
delete mode 100644 apps/native/docs/modules/plugins/AUDIO_OTPLUGIN_HANDOFF.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/DEVICE_PLUGIN_RELEASE.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/OpenTestDevicePluginSDK/API_REFERENCE.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/OpenTestDevicePluginSDK/ERROR_MESSAGES.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/OpenTestDevicePluginSDK/EXTENSIONS.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/OpenTestDevicePluginSDK/README.md
delete mode 100644 apps/native/docs/modules/plugins/OpenTestDevicePluginSDK/README.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/OptDevHost/tests/README.md
delete mode 100644 apps/native/docs/modules/plugins/Plugins/OpenTestNiDaqDevicePlugin/MIGRATION.md
delete mode 100644 apps/native/docs/modules/plugins/Plugins/OpenTestNiDaqDevicePlugin/README.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/Plugins/OpenTestSonoDaqDevicePlugin/README.zh-CN.md
delete mode 100644 apps/native/docs/modules/plugins/Plugins/OpenTestSonoDaqDevicePlugin/package/README.md
delete mode 100644 apps/native/docs/modules/plugins/RELEASE_LAYOUT.zh-CN.md
delete mode 100644 apps/native/docs/plugin-deactivation-dll-lock-20261029.md
delete mode 100644 apps/native/docs/public-build.md
delete mode 100644 apps/native/docs/superpowers/plans/2026-10-22-framework-plugin-boundary.md
delete mode 100644 apps/native/docs/superpowers/plans/2026-10-26-device-broker-integration.md
delete mode 100644 apps/native/docs/superpowers/plans/2026-10-26-device-duplex-transport.md
delete mode 100644 apps/native/docs/superpowers/plans/2026-10-26-device-request-multiplexing.md
delete mode 100644 apps/native/docs/superpowers/plans/2026-10-26-device-worker-foundation.md
delete mode 100644 apps/native/docs/superpowers/plans/2026-10-26-device-worker-process.md
delete mode 100644 apps/native/docs/superpowers/specs/2026-10-26-device-fault-isolation-design.md
delete mode 100644 apps/native/docs/superpowers/specs/2026-10-26-physical-execution-scope-addendum.md
create mode 100644 docs/handoffs/math-fs-2026-11-12.md
create mode 100644 docs/specs/math-fs-evaluation-and-result-units.md
diff --git a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeService.java b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeService.java
index a0d82ef0..2c6bb191 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeService.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeService.java
@@ -713,7 +713,7 @@ public void bkTriggerCreateTask(String taskId,
int delaySamples,
int holdOffSamples) {
requireTaskId(taskId);
- check(algorithmLibJNIBridge.createBkTriggerTask(taskId, referenceLevel, levelPercent,
+ check(algorithmLibJNIBridge.createSignalTriggerTask(taskId, referenceLevel, levelPercent,
hysteresisPercent, positive, divider, delaySamples, holdOffSamples),
"create BK trigger task");
}
@@ -724,7 +724,7 @@ public double bkTriggerSearchTask(String taskId, double[] samples, boolean force
throw new IllegalArgumentException("samples are required");
}
Object data = requireJsonValue(
- algorithmLibJNIBridge.searchBkTriggerTask(taskId, samples, forceTrigger),
+ algorithmLibJNIBridge.searchSignalTriggerTask(taskId, samples, forceTrigger),
"search BK trigger task");
if (!(data instanceof Number)) {
throw new IllegalStateException("BK trigger search result must be numeric");
@@ -734,12 +734,12 @@ public double bkTriggerSearchTask(String taskId, double[] samples, boolean force
public void bkTriggerResetTask(String taskId) {
requireTaskId(taskId);
- check(algorithmLibJNIBridge.resetBkTriggerTask(taskId), "reset BK trigger task");
+ check(algorithmLibJNIBridge.resetSignalTriggerTask(taskId), "reset BK trigger task");
}
public void bkTriggerDisposeTask(String taskId) {
requireTaskId(taskId);
- check(algorithmLibJNIBridge.disposeBkTriggerTask(taskId), "dispose BK trigger task");
+ check(algorithmLibJNIBridge.disposeSignalTriggerTask(taskId), "dispose BK trigger task");
}
public double[] slFilter(double[] data,
@@ -915,12 +915,12 @@ private EngineerSoundPowerResponseDto calculateEngineeringSoundPowerSurvey(
int bkFftCreateCompleteTask(String taskId, com.opentest.algorithm.api.BkFftTaskOptions options, boolean spectrogram) {
var p = options.fft();
return lifecycle(taskId, () -> spectrogram
- ? algorithmLibJNIBridge.createBkFftSpectrogramTask(taskId, p.sampleRateHz(), p.analysisMode(),
+ ? algorithmLibJNIBridge.createAdvancedFftSpectrogramTask(taskId, p.sampleRateHz(), p.analysisMode(),
p.spanHz(), p.lines(), p.centerFrequencyHz(), p.windowType(), p.windowParam(),
p.windowStartFraction(), p.windowEndFraction(), p.overlapPercent(), p.averageMode(),
p.averageCount(), p.averageTimeSeconds(), p.exponentialAlpha(), p.scaling(),
p.averageFixedMode(), p.averagingDomain(), p.overloadExclude())
- : algorithmLibJNIBridge.createBkFftTask(taskId, p.sampleRateHz(), p.analysisMode(),
+ : algorithmLibJNIBridge.createAdvancedFftTask(taskId, p.sampleRateHz(), p.analysisMode(),
p.spanHz(), p.lines(), p.centerFrequencyHz(), p.windowType(), p.windowParam(),
p.windowStartFraction(), p.windowEndFraction(), p.overlapPercent(), p.averageMode(),
p.averageCount(), p.averageTimeSeconds(), p.exponentialAlpha(), p.scaling(),
@@ -932,7 +932,7 @@ int bkFftCreateCompleteTask(String taskId, com.opentest.algorithm.api.BkFftTaskO
int bkFrfCreateCompleteTask(String taskId, com.opentest.algorithm.api.BkFrfTaskOptions options) {
var flags = options.fft();
var p = flags.fft();
- return lifecycle(taskId, () -> algorithmLibJNIBridge.createBkFrfTask(taskId,
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.createAdvancedFrequencyResponseTask(taskId,
p.sampleRateHz(), p.analysisMode(), p.spanHz(), p.lines(), p.centerFrequencyHz(),
p.windowType(), p.windowParam(), p.windowStartFraction(), p.windowEndFraction(),
p.overlapPercent(), p.averageMode(), p.averageCount(), p.averageTimeSeconds(),
@@ -945,8 +945,8 @@ int bkFrfCreateCompleteTask(String taskId, com.opentest.algorithm.api.BkFrfTaskO
com.opentest.algorithm.api.BkResultSnapshot bkReadCompleteTask(String taskId, int weighting, boolean paired) {
var messages = new java.util.LinkedHashMap();
var arrays = collect(paired ? "read BK FRF batch" : "read BK FFT batch", collector -> paired
- ? algorithmLibJNIBridge.readBkFrfTask(taskId, weighting, collector, messages)
- : algorithmLibJNIBridge.readBkFftTask(taskId, weighting, collector, messages));
+ ? algorithmLibJNIBridge.readAdvancedFrequencyResponseTask(taskId, weighting, collector, messages)
+ : algorithmLibJNIBridge.readAdvancedFftTask(taskId, weighting, collector, messages));
return new com.opentest.algorithm.api.BkResultSnapshot(arrays, messages);
}
@@ -960,7 +960,7 @@ public int bkFftCreateTask(String taskId, double sampleRateHz, int analysisMode,
if (isBlank(taskId) || sampleRateHz <= 0D) {
return -1;
}
- return lifecycle(taskId, () -> algorithmLibJNIBridge.createBkFftTask(taskId,
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.createAdvancedFftTask(taskId,
sampleRateHz, analysisMode, spanHz, lines, centerFrequencyHz, windowType,
windowParam, windowStartFraction, windowEndFraction, overlapPercent, averageMode,
averageCount, averageTimeSeconds, exponentialAlpha, scaling, averageFixedMode,
@@ -970,7 +970,7 @@ public int bkFftCreateTask(String taskId, double sampleRateHz, int analysisMode,
public int bkFftPushTask(String taskId, double[] frameData) {
if (frameData == null || frameData.length == 0) return -1;
return lifecycle(taskId,
- () -> algorithmLibJNIBridge.pushBkFftTask(taskId, frameData, frameData.length));
+ () -> algorithmLibJNIBridge.pushAdvancedFftTask(taskId, frameData, frameData.length));
}
public FftResponseDto bkFftReadTask(String taskId, boolean rmsEnable) {
@@ -985,17 +985,17 @@ public FftResponseDto bkFftReadTask(String taskId, boolean rmsEnable) {
public FftResponseDto bkFftReadTaskOrThrowNativeFailure(String taskId, boolean rmsEnable) {
if (isBlank(taskId)) return null;
Map result = collect("read BK FFT task",
- collector -> algorithmLibJNIBridge.readBkFftTask(taskId, 0, collector, new java.util.LinkedHashMap<>()));
+ collector -> algorithmLibJNIBridge.readAdvancedFftTask(taskId, 0, collector, new java.util.LinkedHashMap<>()));
if (!nativeResultSucceeded(result)) return null;
return applyFftSpectrumRms(fftResponse(result), rmsEnable);
}
public int bkFftResetTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.resetBkFftTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.resetAdvancedFftTask(taskId));
}
public int bkFftDisposeTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.disposeBkFftTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.disposeAdvancedFftTask(taskId));
}
public int bkFrfCreateTask(String taskId, double sampleRateHz, int analysisMode,
@@ -1007,7 +1007,7 @@ public int bkFrfCreateTask(String taskId, double sampleRateHz, int analysisMode,
int averageFixedMode, int averagingDomain, int overloadExclude,
int estimator, int unwrapPhase) {
if (isBlank(taskId) || sampleRateHz <= 0D) return -1;
- return lifecycle(taskId, () -> algorithmLibJNIBridge.createBkFrfTask(taskId,
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.createAdvancedFrequencyResponseTask(taskId,
sampleRateHz, analysisMode, spanHz, lines, centerFrequencyHz, windowType,
windowParam, windowStartFraction, windowEndFraction, overlapPercent, averageMode,
averageCount, averageTimeSeconds, exponentialAlpha, scaling, averageFixedMode,
@@ -1017,35 +1017,35 @@ public int bkFrfCreateTask(String taskId, double sampleRateHz, int analysisMode,
public int bkFrfPushTask(String taskId, double[] reference, double[] response) {
if (reference == null || response == null || reference.length == 0
|| reference.length != response.length) return -1;
- return lifecycle(taskId, () -> algorithmLibJNIBridge.pushBkFrfTask(
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.pushAdvancedFrequencyResponseTask(
taskId, reference, response, reference.length));
}
public TransferResponseDto bkFrfReadTask(String taskId) {
- return readBkTransfer(taskId, (id, collector) -> algorithmLibJNIBridge.readBkFrfTask(id, 0, collector, new java.util.LinkedHashMap<>()),
+ return readBkTransfer(taskId, (id, collector) -> algorithmLibJNIBridge.readAdvancedFrequencyResponseTask(id, 0, collector, new java.util.LinkedHashMap<>()),
"read BK FRF task");
}
public int bkFrfResetTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.resetBkFrfTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.resetAdvancedFrequencyResponseTask(taskId));
}
public int bkFrfDisposeTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.disposeBkFrfTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.disposeAdvancedFrequencyResponseTask(taskId));
}
com.opentest.algorithm.api.BkResultSnapshot bkReadCpbCompleteTask(String taskId, boolean paired) {
var messages = new java.util.LinkedHashMap();
var arrays = collect(paired ? "read BK CPB FRF batch" : "read BK CPB batch", collector -> paired
- ? algorithmLibJNIBridge.readBkCpbFrfTask(taskId, collector, messages)
- : algorithmLibJNIBridge.readBkCpbTask(taskId, collector, messages));
+ ? algorithmLibJNIBridge.readPrecisionOctaveFrequencyResponseTask(taskId, collector, messages)
+ : algorithmLibJNIBridge.readPrecisionOctaveTask(taskId, collector, messages));
return new com.opentest.algorithm.api.BkResultSnapshot(arrays, messages);
}
BkResultSnapshot bkReadCpbMultiCompleteTask(String taskId) {
var messages = new LinkedHashMap();
var arrays = collect("read BK CPB multi batch",
- collector -> algorithmLibJNIBridge.readBkCpbMultiTask(taskId, collector, messages));
+ collector -> algorithmLibJNIBridge.readPrecisionOctaveMultiTask(taskId, collector, messages));
return new BkResultSnapshot(arrays, messages);
}
@@ -1057,7 +1057,7 @@ public int bkCpbMultiCreateTask(String taskId, double sampleRateHz,
double tauSeconds, int acousticWeighting, int overallBands,
double cursorLowerFrequencyHz, double cursorUpperFrequencyHz) {
if (isBlank(taskId) || sampleRateHz <= 0D) return -1;
- return lifecycle(taskId, () -> algorithmLibJNIBridge.createBkCpbMultiTask(taskId,
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.createPrecisionOctaveMultiTask(taskId,
sampleRateHz, lowerCenterFrequencyHz, upperCenterFrequencyHz, referenceValue,
frameLength, frameDurationSeconds, filterCascadeCount, averageMode, averageCount,
linearAveragingTimeSeconds, exponentialAveragingTimeSeconds, tauSeconds,
@@ -1074,7 +1074,7 @@ public int bkCpbCreateTask(String taskId, double sampleRateHz, int bandwidth,
int acousticWeighting, int overallBands,
double cursorLowerFrequencyHz, double cursorUpperFrequencyHz) {
if (isBlank(taskId) || sampleRateHz <= 0D) return -1;
- return lifecycle(taskId, () -> algorithmLibJNIBridge.createBkCpbTask(taskId,
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.createPrecisionOctaveTask(taskId,
sampleRateHz, bandwidth, lowerCenterFrequencyHz, upperCenterFrequencyHz,
referenceValue, frameLength, frameDurationSeconds, filterCascadeCount,
averageMode, averageCount, linearAveragingTimeSeconds,
@@ -1085,14 +1085,14 @@ public int bkCpbCreateTask(String taskId, double sampleRateHz, int bandwidth,
public int bkCpbPushTask(String taskId, double[] frameData) {
if (frameData == null || frameData.length == 0) return -1;
return lifecycle(taskId,
- () -> algorithmLibJNIBridge.pushBkCpbTask(taskId, frameData, frameData.length));
+ () -> algorithmLibJNIBridge.pushPrecisionOctaveTask(taskId, frameData, frameData.length));
}
public OctaveResponseDto bkCpbReadTask(String taskId) {
if (isBlank(taskId)) return null;
try {
Map result = collect("read BK CPB task",
- collector -> algorithmLibJNIBridge.readBkCpbTask(taskId, collector, new java.util.LinkedHashMap<>()));
+ collector -> algorithmLibJNIBridge.readPrecisionOctaveTask(taskId, collector, new java.util.LinkedHashMap<>()));
if (!nativeResultSucceeded(result)) return null;
OctaveResponseDto response = octaveResponse(result);
if (response == null) return null;
@@ -1113,11 +1113,11 @@ public OctaveResponseDto bkCpbReadTask(String taskId) {
}
public int bkCpbResetTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.resetBkCpbTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.resetPrecisionOctaveTask(taskId));
}
public int bkCpbDisposeTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.disposeBkCpbTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.disposePrecisionOctaveTask(taskId));
}
public int bkCpbFrfCreateTask(String taskId, double sampleRateHz, int bandwidth,
@@ -1131,7 +1131,7 @@ public int bkCpbFrfCreateTask(String taskId, double sampleRateHz, int bandwidth,
double cursorLowerFrequencyHz, double cursorUpperFrequencyHz,
int estimator, int unwrapPhase) {
if (isBlank(taskId) || sampleRateHz <= 0D) return -1;
- return lifecycle(taskId, () -> algorithmLibJNIBridge.createBkCpbFrfTask(taskId,
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.createPrecisionOctaveFrequencyResponseTask(taskId,
sampleRateHz, bandwidth, lowerCenterFrequencyHz, upperCenterFrequencyHz,
referenceValue, frameLength, frameDurationSeconds, filterCascadeCount,
averageMode, averageCount, linearAveragingTimeSeconds,
@@ -1142,31 +1142,31 @@ public int bkCpbFrfCreateTask(String taskId, double sampleRateHz, int bandwidth,
public int bkCpbFrfPushTask(String taskId, double[] reference, double[] response) {
if (reference == null || response == null || reference.length == 0
|| reference.length != response.length) return -1;
- return lifecycle(taskId, () -> algorithmLibJNIBridge.pushBkCpbFrfTask(
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.pushPrecisionOctaveFrequencyResponseTask(
taskId, reference, response, reference.length));
}
public long bkCpbSharedCreate(String[] taskIds) {
- return algorithmLibJNIBridge.createBkCpbSharedGroup(taskIds);
+ return algorithmLibJNIBridge.createPrecisionOctaveSharedGroup(taskIds);
}
public int bkCpbSharedProcess(long handle, double[][] inputs) {
- return algorithmLibJNIBridge.processBkCpbSharedGroup(handle, inputs);
+ return algorithmLibJNIBridge.processPrecisionOctaveSharedGroup(handle, inputs);
}
public void bkCpbSharedDispose(long handle) {
- algorithmLibJNIBridge.disposeBkCpbSharedGroup(handle);
+ algorithmLibJNIBridge.disposePrecisionOctaveSharedGroup(handle);
}
public TransferResponseDto bkCpbFrfReadTask(String taskId) {
- return readBkTransfer(taskId, (id, collector) -> algorithmLibJNIBridge.readBkCpbFrfTask(id, collector, new java.util.LinkedHashMap<>()),
+ return readBkTransfer(taskId, (id, collector) -> algorithmLibJNIBridge.readPrecisionOctaveFrequencyResponseTask(id, collector, new java.util.LinkedHashMap<>()),
"read BK CPB FRF task");
}
public int bkCpbFrfResetTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.resetBkCpbFrfTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.resetPrecisionOctaveFrequencyResponseTask(taskId));
}
public int bkCpbFrfDisposeTask(String taskId) {
- return lifecycle(taskId, () -> algorithmLibJNIBridge.disposeBkCpbFrfTask(taskId));
+ return lifecycle(taskId, () -> algorithmLibJNIBridge.disposePrecisionOctaveFrequencyResponseTask(taskId));
}
public double[] weightByTime(double[] data, int frequencyWeighting,
diff --git a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicOrderTrackingAlgorithmService.java b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicOrderTrackingAlgorithmService.java
index e8bc1152..e160ba21 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicOrderTrackingAlgorithmService.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicOrderTrackingAlgorithmService.java
@@ -1,13 +1,18 @@
package com.opentest.algorithm.runtime;
import com.opentest.algorithm.api.OrderTrackingAlgorithmService;
-import com.opentest.algorithm.api.OrderTrackingModels.Config;
-import com.opentest.algorithm.api.OrderTrackingModels.Input;
-import com.opentest.algorithm.api.OrderTrackingModels.Result;
+import com.opentest.algorithm.api.OrderTrackingModels.AnglePreparationResult;
+import com.opentest.algorithm.api.OrderTrackingModels.AngleReference;
+import com.opentest.algorithm.api.OrderTrackingModels.FsSettings;
+import com.opentest.algorithm.api.OrderTrackingModels.OtSettings;
+import com.opentest.algorithm.api.OrderTrackingModels.Results;
+import com.opentest.algorithm.api.OrderTrackingModels.RpmReference;
+import com.opentest.algorithm.api.OrderTrackingModels.SpectrumSelection;
+import com.opentest.algorithm.api.OrderTrackingModels.VibrationSignal;
import com.opentest.core.jni.OrderTrackingJNIBridge;
import java.util.Objects;
-/** Host-owned thin adapter; forwards native results and exceptions without business interpretation. */
+/** Public order-analysis service that forwards the typed native contract unchanged. */
public final class PublicOrderTrackingAlgorithmService implements OrderTrackingAlgorithmService {
private final OrderTrackingJNIBridge bridge;
@@ -16,7 +21,27 @@ public PublicOrderTrackingAlgorithmService(OrderTrackingJNIBridge bridge) {
}
@Override
- public Result analyzeFromRpmFixed(Config config, Input input) {
- return bridge.analyzeFromRpmFixed(config, input);
+ public Results analyzeFs(VibrationSignal vibration, RpmReference rpm, FsSettings settings) {
+ return bridge.analyzeFs(vibration, rpm, settings);
+ }
+
+ @Override
+ public AnglePreparationResult prepareAngleReference(RpmReference rpm) {
+ return bridge.prepareAngleReference(rpm);
+ }
+
+ @Override
+ public Results analyzeOt(VibrationSignal vibration, AngleReference reference, OtSettings settings) {
+ return bridge.analyzeOt(vibration, reference, settings);
+ }
+
+ @Override
+ public SpectrumSelection selectFsSpectrum(Results results, int axis, double target) {
+ return bridge.selectFsSpectrum(results, axis, target);
+ }
+
+ @Override
+ public SpectrumSelection selectOtSpectrum(Results results, int axis, double target) {
+ return bridge.selectOtSpectrum(results, axis, target);
}
}
diff --git a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/AlgorithmLibJNIBridge.java b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/AlgorithmLibJNIBridge.java
index 6764e565..4bf83ac5 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/AlgorithmLibJNIBridge.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/AlgorithmLibJNIBridge.java
@@ -9,7 +9,7 @@
import java.util.Map;
/**
- * BK 批量结果公共合同(readBkFftTask/readBkFrfTask/readBkCpbTask/readBkCpbFrfTask)。
+ * 中性分析批量结果公共合同(readAdvancedFftTask/readAdvancedFrequencyResponseTask/readPrecisionOctaveTask/readPrecisionOctaveFrequencyResponseTask)。
*
* 一次读取 Native 快照,在 C++ 内枚举该来源支持的 Function × Coordinate × Unit,
* 一次写入 collector。SelectedResult 兼容接口仍保留。下列名称以 Java
@@ -222,8 +222,43 @@ public native int calculateFftDataInto(
int[] actualLengths
);
+ public native int createAdvancedFftChannelTask(
+ String taskId, String referenceTaskId, int channel, int referenceChannel,
+ int enableSpectrogram, int enableAutoCross, int frfEstimator,
+ int unwrapPhase, double sampleRateHz,
+ int analysisMode, double spanHz, int lines, double centerFrequencyHz,
+ int windowType, double windowParam, double windowStartFraction,
+ double windowEndFraction, double overlapPercent, int averageMode,
+ int averageCount, double averageTimeSeconds, double exponentialAlpha,
+ int scaling, int averageFixedMode, int averagingDomain,
+ int overloadExclude, int enableTimeResults, int enableLifteredSpectrum,
+ double lifterQuefrencyStartSeconds, double lifterQuefrencyStopSeconds,
+ int lifterKeepInside);
+
+ public native int pushAdvancedFftChannelTask(
+ String taskId, double[] samples, int sampleCount);
+
+ public native int pushAdvancedFftChannelTaskWithReference(
+ String taskId, double[] samples, double[] referenceSamples,
+ int sampleCount);
+
+ public native int publishAdvancedFftReference(
+ String referenceTaskId, long sourceStart, double[] samples, int sampleCount);
+
+ public native int pushAdvancedFftChannelFrame(
+ String taskId, long sourceStart, double[] samples, int sampleCount);
+
+ public native int readAdvancedFftChannelSelectedResults(
+ String taskId, int[] kinds, int[] functions, int[] coordinates,
+ int[] spectralUnits, int[] weightings,
+ JniNamedDoubleResultCollector collector, String[] messageOutput);
+
+ public native int resetAdvancedFftChannelTask(String taskId);
+
+ public native int disposeAdvancedFftChannelTask(String taskId);
+
/**
- * JNI 接口:{@code createBkFftTask}。
+ * JNI 接口:{@code createAdvancedFftTask}。
*
*
A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
@@ -252,7 +287,7 @@ public native int calculateFftDataInto(
* @param lifterKeepInside lifter 区间策略:1 保留区间内,0 保留区间外。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int createBkFftTask(String taskId, double sampleRateHz,
+ public native int createAdvancedFftTask(String taskId, double sampleRateHz,
int analysisMode, double spanHz, int lines, double centerFrequencyHz, int windowType,
double windowParam, double windowStartFraction, double windowEndFraction,
double overlapPercent, int averageMode, int averageCount, double averageTimeSeconds,
@@ -261,7 +296,7 @@ public native int createBkFftTask(String taskId, double sampleRateHz,
double lifterQuefrencyStartSeconds, double lifterQuefrencyStopSeconds,
int lifterKeepInside);
- public native int createBkFftSpectrogramTask(String taskId, double sampleRateHz,
+ public native int createAdvancedFftSpectrogramTask(String taskId, double sampleRateHz,
int analysisMode, double spanHz, int lines, double centerFrequencyHz, int windowType,
double windowParam, double windowStartFraction, double windowEndFraction,
double overlapPercent, int averageMode, int averageCount, double averageTimeSeconds,
@@ -269,7 +304,7 @@ public native int createBkFftSpectrogramTask(String taskId, double sampleRateHz,
int overloadExclude);
/**
- * JNI 接口:{@code pushBkFftTask}。
+ * JNI 接口:{@code pushAdvancedFftTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
@@ -277,10 +312,10 @@ public native int createBkFftSpectrogramTask(String taskId, double sampleRateHz,
* @param sampleCount {@code sampleCount} 参数。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int pushBkFftTask(String taskId, double[] samples, int sampleCount);
+ public native int pushAdvancedFftTask(String taskId, double[] samples, int sampleCount);
/**
- * 一次读取 BK FFT 当前帧的全部结果集。
+ * 一次读取 Advanced FFT 当前帧的全部结果集。
*
* 该接口不接收结果选择参数。Native 对同一帧只获取一次快照,并将以下 Key/Value
* 全部写入 collector;页面本次是否勾选某结果不影响计算、返回和后续入库。
@@ -292,34 +327,34 @@ public native int createBkFftSpectrogramTask(String taskId, double sampleRateHz,
* {@code dataasd}:幅值谱密度。
* {@code datapsd}:功率谱密度。
* {@code dataenhancement}:增强后的时域波形;任务未启用时域结果时为空数组。
- * {@code bkRetCode}:BK 原生返回码,单元素数组。
+ * {@code bkRetCode}:原生返回码,单元素数组。
* {@code geometry}:分析几何参数;顺序为
* {@code [analysisMode, lines, sampleCount, fftLength, outputLength,
* inputSampleRate, analyzerSampleRate, span, centerFrequency,
* frequencyResolution, duration, frequencyStart, frequencyStop, zoomFlag]}。
- * {@code status}:BK 当前帧状态标志数组,索引含义由对接文档定义。
- * {@code bkInfo}:BK 当前帧信息数组,索引含义由对接文档定义。
+ * {@code status}:当前帧状态标志数组,索引含义由对接文档定义。
+ * {@code bkInfo}:当前帧信息数组,索引含义由对接文档定义。
* {@code retCode}:批量读取业务状态码,单元素数组;0 表示成功。
*
*
- * @param taskId 已创建且未释放的 BK FFT 任务标识。
+ * @param taskId 已创建且未释放的 Advanced FFT 任务标识。
* @param weighting 与旧单项接口完全相同:0=AS_SIGNAL,1=Z,2=A,3=B,4=C,5=D。
* @param collector Java 侧创建的 named-double 结果收集器,不允许为 null。
* @param messageCollector Java 侧可写 Map,不允许为 null;按结果分组 Key 保存每项 Native message。
* @return JNI 发布状态码;0 表示 Key/Value 已成功写入 collector。算法状态请读取 {@code retCode}。
*/
- public native int readBkFftTask(String taskId, int weighting,
+ public native int readAdvancedFftTask(String taskId, int weighting,
JniNamedDoubleResultCollector collector, Map messageCollector);
/**
- * 兼容接口:按结果函数读取一个 BK FFT 结果。
+ * 兼容接口:按结果函数读取一个 Advanced FFT 结果。
*
* 批量接口迁移完成前保留。collector 固定输出 {@code axis}、{@code values}、
* {@code validity}、{@code lowerFrequencyHz}、{@code upperFrequencyHz} 和
* {@code metadata};{@code metadata} 为
* {@code [axisKind, resolvedSpectralUnit, resolvedWeighting, nativeCode]}。
*
- * @param taskId BK FFT 任务标识。
+ * @param taskId Advanced FFT 任务标识。
* @param function FFT 结果函数枚举值(0..44)。
* @param coordinate 0=幅值,1=实部,2=虚部,3=相位。
* @param spectralUnit 0=native,1=RMS,2=power,3=PSD,4=RMS spectral density,5=ESD。
@@ -328,30 +363,34 @@ public native int readBkFftTask(String taskId, int weighting,
* @param messageOutput Native 消息输出,长度至少为 1。
* @return JNI 状态码,0 表示成功。
*/
- public native int readBkFftSelectedResult(String taskId, int function, int coordinate,
+ public native int readAdvancedFftSelectedResult(String taskId, int function, int coordinate,
int spectralUnit, int weighting, JniNamedDoubleResultCollector collector,
String[] messageOutput);
+ public native int readAdvancedFftSelectedResults(String taskId, int[] functions,
+ int[] coordinates, int[] spectralUnits, int[] weightings,
+ JniNamedDoubleResultCollector collector, String[] messageOutput);
+
/**
- * JNI 接口:{@code resetBkFftTask}。
+ * JNI 接口:{@code resetAdvancedFftTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int resetBkFftTask(String taskId);
+ public native int resetAdvancedFftTask(String taskId);
/**
- * JNI 接口:{@code disposeBkFftTask}。
+ * JNI 接口:{@code disposeAdvancedFftTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int disposeBkFftTask(String taskId);
+ public native int disposeAdvancedFftTask(String taskId);
/**
- * JNI 接口:{@code createBkFrfTask}。
+ * JNI 接口:{@code createAdvancedFrequencyResponseTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
@@ -382,7 +421,7 @@ public native int readBkFftSelectedResult(String taskId, int function, int coord
* @param lifterKeepInside lifter 区间策略:1 保留区间内,0 保留区间外。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int createBkFrfTask(String taskId, double sampleRateHz,
+ public native int createAdvancedFrequencyResponseTask(String taskId, double sampleRateHz,
int analysisMode, double spanHz, int lines, double centerFrequencyHz, int windowType,
double windowParam, double windowStartFraction, double windowEndFraction,
double overlapPercent, int averageMode, int averageCount, double averageTimeSeconds,
@@ -392,7 +431,7 @@ public native int createBkFrfTask(String taskId, double sampleRateHz,
double lifterQuefrencyStopSeconds, int lifterKeepInside);
/**
- * JNI 接口:{@code pushBkFrfTask}。
+ * JNI 接口:{@code pushAdvancedFrequencyResponseTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
@@ -401,10 +440,10 @@ public native int createBkFrfTask(String taskId, double sampleRateHz,
* @param sampleCount {@code sampleCount} 参数。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int pushBkFrfTask(String taskId, double[] referenceSamples, double[] responseSamples, int sampleCount);
+ public native int pushAdvancedFrequencyResponseTask(String taskId, double[] referenceSamples, double[] responseSamples, int sampleCount);
/**
- * 一次读取 BK FRF 当前帧的全部结果集。
+ * 一次读取 Advanced Frequency Response 当前帧的全部结果集。
*
* 稳定 Key(值均为 {@code double[]}):{@code datafreq}、{@code gxx}、
* {@code gyy}、{@code gxyReal}、{@code gxyImag}、{@code coherence}、
@@ -423,22 +462,22 @@ public native int createBkFrfTask(String taskId, double sampleRateHz,
*
公共状态 Key:{@code bkRetCode}、{@code geometry}、{@code status}、
* {@code bkInfo}、{@code retCode}。所有 Key 的拼写和大小写均属于持久化接口合同,不得改写。
*
- * @param taskId 已创建且未释放的 BK FRF 任务标识。
+ * @param taskId 已创建且未释放的 Advanced Frequency Response 任务标识。
* @param weighting 与旧单项接口完全相同:0=AS_SIGNAL,1=Z,2=A,3=B,4=C,5=D。
* @param collector Java 侧创建的 named-double 结果收集器,不允许为 null。
* @param messageCollector Java 侧可写 Map,不允许为 null;按结果分组 Key 保存每项 Native message。
* @return JNI 发布状态码;0 表示结果已写入 collector,算法状态读取 {@code retCode}。
*/
- public native int readBkFrfTask(String taskId, int weighting,
+ public native int readAdvancedFrequencyResponseTask(String taskId, int weighting,
JniNamedDoubleResultCollector collector, Map messageCollector);
/**
- * 兼容接口:按结果函数读取一个 BK FRF 结果。
+ * 兼容接口:按结果函数读取一个 Advanced Frequency Response 结果。
*
- * 输出 Key 及 {@code metadata} 结构与 {@link #readBkFftSelectedResult} 相同,
+ *
输出 Key 及 {@code metadata} 结构与 {@link #readAdvancedFftSelectedResult} 相同,
* 仅用于批量接口迁移期间维持现有后端编译和运行。
*
- * @param taskId BK FRF 任务标识。
+ * @param taskId Advanced Frequency Response 任务标识。
* @param function FFT/FRF 结果函数枚举值(0..44)。
* @param coordinate 0=幅值,1=实部,2=虚部,3=相位。
* @param spectralUnit 0=native,1=RMS,2=power,3=PSD,4=RMS spectral density,5=ESD。
@@ -447,30 +486,34 @@ public native int readBkFrfTask(String taskId, int weighting,
* @param messageOutput Native 消息输出,长度至少为 1。
* @return JNI 状态码,0 表示成功。
*/
- public native int readBkFrfSelectedResult(String taskId, int function, int coordinate,
+ public native int readAdvancedFrequencyResponseSelectedResult(String taskId, int function, int coordinate,
int spectralUnit, int weighting, JniNamedDoubleResultCollector collector,
String[] messageOutput);
+ public native int readAdvancedFrequencyResponseSelectedResults(String taskId, int[] functions,
+ int[] coordinates, int[] spectralUnits, int[] weightings,
+ JniNamedDoubleResultCollector collector, String[] messageOutput);
+
/**
- * JNI 接口:{@code resetBkFrfTask}。
+ * JNI 接口:{@code resetAdvancedFrequencyResponseTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int resetBkFrfTask(String taskId);
+ public native int resetAdvancedFrequencyResponseTask(String taskId);
/**
- * JNI 接口:{@code disposeBkFrfTask}。
+ * JNI 接口:{@code disposeAdvancedFrequencyResponseTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int disposeBkFrfTask(String taskId);
+ public native int disposeAdvancedFrequencyResponseTask(String taskId);
/**
- * JNI 接口:{@code createBkCpbTask}。
+ * JNI 接口:{@code createPrecisionOctaveTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
@@ -493,7 +536,7 @@ public native int readBkFrfSelectedResult(String taskId, int function, int coord
* @param cursorUpperFrequencyHz {@code cursorUpperFrequencyHz} 参数。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int createBkCpbTask(String taskId, double sampleRateHz,
+ public native int createPrecisionOctaveTask(String taskId, double sampleRateHz,
int bandwidth, double lowerCenterFrequencyHz, double upperCenterFrequencyHz,
double referenceValue, int frameLen, double frameDurationSeconds,
int filterCascadeCount, int averageMode, int averageCount,
@@ -502,7 +545,7 @@ public native int createBkCpbTask(String taskId, double sampleRateHz,
double cursorLowerFrequencyHz, double cursorUpperFrequencyHz);
/**
- * JNI 接口:{@code pushBkCpbTask}。
+ * JNI 接口:{@code pushPrecisionOctaveTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
@@ -510,24 +553,24 @@ public native int createBkCpbTask(String taskId, double sampleRateHz,
* @param sampleCount {@code sampleCount} 参数。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native long createBkCpbSharedGroup(String[] responseTaskIds);
- public native int processBkCpbSharedGroup(long handle, double[][] alignedInputs);
- public native void disposeBkCpbSharedGroup(long handle);
+ public native long createPrecisionOctaveSharedGroup(String[] responseTaskIds);
+ public native int processPrecisionOctaveSharedGroup(long handle, double[][] alignedInputs);
+ public native void disposePrecisionOctaveSharedGroup(long handle);
- public native int pushBkCpbTask(String taskId, double[] samples, int sampleCount);
+ public native int pushPrecisionOctaveTask(String taskId, double[] samples, int sampleCount);
/**
- * 创建单通道、五种分辨率共享输入的普通 BK CPB 任务。
+ * 创建单通道、五种分辨率共享输入的普通 Precision Octave 任务。
* 上下限数组必须各有 5 项,依次对应 bandwidth=1、3、6、12、24
* (Java octaveType=0..4)。各项为该分辨率独立裁剪后的中心频率范围,
* 不能将一种分辨率的 Nyquist 上限用于其他分辨率。
- * 其余参数与 {@link #createBkCpbTask} 同义;全部分辨率共享采样率、
- * 帧长、平均和计权配置。使用 {@link #pushBkCpbTask} 每帧推送一次,
- * {@link #resetBkCpbTask} 一次重置全部分辨率,{@link #disposeBkCpbTask}
+ *
其余参数与 {@link #createPrecisionOctaveTask} 同义;全部分辨率共享采样率、
+ * 帧长、平均和计权配置。使用 {@link #pushPrecisionOctaveTask} 每帧推送一次,
+ * {@link #resetPrecisionOctaveTask} 一次重置全部分辨率,{@link #disposePrecisionOctaveTask}
* 一次释放任务。上述生命周期接口同时支持单分辨率和多分辨率任务。
* @return JNI 状态码,0 成功,非 0 失败;失败码不转换为成功。
*/
- public native int createBkCpbMultiTask(String taskId, double sampleRateHz,
+ public native int createPrecisionOctaveMultiTask(String taskId, double sampleRateHz,
double[] lowerCenterFrequencyHz, double[] upperCenterFrequencyHz,
double referenceValue, int frameLen, double frameDurationSeconds,
int filterCascadeCount, int averageMode, int averageCount,
@@ -539,17 +582,17 @@ public native int createBkCpbMultiTask(String taskId, double sampleRateHz,
* 一次读取多分辨率任务的全部五组结果;collector 和消息 Map 均不可为 null。
* 平面结果 Map 的组前缀依次为 {@code bandwidth_1/}、{@code bandwidth_3/}、
* {@code bandwidth_6/}、{@code bandwidth_12/}、{@code bandwidth_24/}。
- * 每组包含 {@link #readBkCpbTask} 的所有原始键(含状态、元数据和逐项错误码),
+ * 每组包含 {@link #readPrecisionOctaveTask} 的所有原始键(含状态、元数据和逐项错误码),
* 消息 Map 使用同样的前缀。去除前缀后可直接复用单分辨率结果解析。
* 顶层另有单元素数组 {@code retCode} 和 {@code bkRetCode},
* 分别保留批量操作状态和 BK 状态;单组或单项失败不应覆盖其他组结果。
* @return JNI 发布状态码;0 表示已发布,算法状态仍读取结果中的原始状态码。
*/
- public native int readBkCpbMultiTask(String taskId, JniNamedDoubleResultCollector collector,
+ public native int readPrecisionOctaveMultiTask(String taskId, JniNamedDoubleResultCollector collector,
Map messageCollector);
/**
- * 一次读取单通道 BK CPB 当前帧的全部结果集。
+ * 一次读取单通道 Precision Octave 当前帧的全部结果集。
*
* 稳定 Key(值均为 {@code double[]}):{@code dataxFreq}(中心频率轴)、
* {@code datayValue}(兼容频带级结果)、{@code centerFrequencyHz}、
@@ -561,21 +604,21 @@ public native int readBkCpbMultiTask(String taskId, JniNamedDoubleResultCollecto
* {@code cursorLevelDb}、{@code bkRetCode}、{@code geometry}、{@code status}、
* {@code bkInfo}、{@code retCode}。标量均使用单元素数组。
*
- * @param taskId 已创建且未释放的 BK CPB 任务标识。
+ * @param taskId 已创建且未释放的 Precision Octave 任务标识。
* @param collector Java 侧创建的 named-double 结果收集器,不允许为 null。
* @param messageCollector Java 侧可写 Map,不允许为 null;按结果分组 Key 保存每项 Native message。
* @return JNI 发布状态码;0 表示结果已写入 collector,算法状态读取 {@code retCode}。
*/
- public native int readBkCpbTask(String taskId, JniNamedDoubleResultCollector collector,
+ public native int readPrecisionOctaveTask(String taskId, JniNamedDoubleResultCollector collector,
Map messageCollector);
/**
- * 兼容接口:按结果函数读取一个单通道 BK CPB 结果。
+ * 兼容接口:按结果函数读取一个单通道 Precision Octave 结果。
*
* collector 固定输出 {@code axis}、{@code values}、{@code validity}、
* {@code lowerFrequencyHz}、{@code upperFrequencyHz} 和 {@code metadata}。
*
- * @param taskId BK CPB 任务标识。
+ * @param taskId Precision Octave 任务标识。
* @param function CPB 结果函数枚举值(0..21)。
* @param coordinate 0=幅值,1=实部,2=虚部,3=相位。
* @param spectralUnit 0=native,1=RMS,2=power,3=level dB。
@@ -583,28 +626,28 @@ public native int readBkCpbTask(String taskId, JniNamedDoubleResultCollector col
* @param messageOutput Native 消息输出,长度至少为 1。
* @return JNI 状态码,0 表示成功。
*/
- public native int readBkCpbSelectedResult(String taskId, int function, int coordinate,
+ public native int readPrecisionOctaveSelectedResult(String taskId, int function, int coordinate,
int spectralUnit, JniNamedDoubleResultCollector collector, String[] messageOutput);
/**
- * JNI 接口:{@code resetBkCpbTask}。
+ * JNI 接口:{@code resetPrecisionOctaveTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int resetBkCpbTask(String taskId);
+ public native int resetPrecisionOctaveTask(String taskId);
/**
- * JNI 接口:{@code disposeBkCpbTask}。
+ * JNI 接口:{@code disposePrecisionOctaveTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int disposeBkCpbTask(String taskId);
+ public native int disposePrecisionOctaveTask(String taskId);
- public native int createBkCpbFrfTask(String taskId, double sampleRateHz,
+ public native int createPrecisionOctaveFrequencyResponseTask(String taskId, double sampleRateHz,
int bandwidth, double lowerCenterFrequencyHz, double upperCenterFrequencyHz,
double referenceValue, int frameLen, double frameDurationSeconds,
int filterCascadeCount, int averageMode, int averageCount,
@@ -613,11 +656,11 @@ public native int createBkCpbFrfTask(String taskId, double sampleRateHz,
double cursorLowerFrequencyHz, double cursorUpperFrequencyHz,
int estimator, int unwrapPhase);
- public native int pushBkCpbFrfTask(String taskId, double[] reference,
+ public native int pushPrecisionOctaveFrequencyResponseTask(String taskId, double[] reference,
double[] response, int sampleCount);
/**
- * 一次读取双通道 BK CPB FRF 当前帧的全部结果集。
+ * 一次读取双通道 Precision Octave FRF 当前帧的全部结果集。
*
* 稳定 Key(值均为 {@code double[]}):
* {@code Auto Spectrum}、{@code Auto Spectrum Phase}、{@code Cross Spectrum}、
@@ -630,21 +673,21 @@ public native int pushBkCpbFrfTask(String taskId, double[] reference,
* {@code upperFrequencyHz}、{@code bkRetCode}、{@code retCode}。
* 所有结果在一次 JNI 调用中返回。
*
- * @param taskId 已创建且未释放的 BK CPB FRF 任务标识。
+ * @param taskId 已创建且未释放的 Precision Octave FRF 任务标识。
* @param collector Java 侧创建的 named-double 结果收集器,不允许为 null。
* @param messageCollector Java 侧可写 Map,不允许为 null;按结果分组 Key 保存每项 Native message。
* @return JNI 发布状态码;0 表示结果已写入 collector,算法状态读取 {@code retCode}。
*/
- public native int readBkCpbFrfTask(String taskId, JniNamedDoubleResultCollector collector,
+ public native int readPrecisionOctaveFrequencyResponseTask(String taskId, JniNamedDoubleResultCollector collector,
Map messageCollector);
/**
- * 兼容接口:按结果函数读取一个双通道 BK CPB FRF 结果。
+ * 兼容接口:按结果函数读取一个双通道 Precision Octave FRF 结果。
*
* 输出 Key 及 {@code metadata} 结构与单通道 CPB selected-result 接口相同,
- * 仅在后端迁移到 {@link #readBkCpbFrfTask} 前保留。
+ * 仅在后端迁移到 {@link #readPrecisionOctaveFrequencyResponseTask} 前保留。
*
- * @param taskId BK CPB FRF 任务标识。
+ * @param taskId Precision Octave FRF 任务标识。
* @param function CPB 结果函数枚举值(0..21)。
* @param coordinate 0=幅值,1=实部,2=虚部,3=相位。
* @param spectralUnit 0=native,1=RMS,2=power,3=level dB。
@@ -652,15 +695,19 @@ public native int readBkCpbFrfTask(String taskId, JniNamedDoubleResultCollector
* @param messageOutput Native 消息输出,长度至少为 1。
* @return JNI 状态码,0 表示成功。
*/
- public native int readBkCpbFrfSelectedResult(String taskId, int function, int coordinate,
+ public native int readPrecisionOctaveFrequencyResponseSelectedResult(String taskId, int function, int coordinate,
int spectralUnit, JniNamedDoubleResultCollector collector, String[] messageOutput);
- public native int resetBkCpbFrfTask(String taskId);
+ public native int readPrecisionOctaveFrequencyResponseSelectedResults(String taskId, int[] functions,
+ int[] coordinates, int[] spectralUnits, int[] weightings,
+ JniNamedDoubleResultCollector collector, String[] messageOutput);
+
+ public native int resetPrecisionOctaveFrequencyResponseTask(String taskId);
- public native int disposeBkCpbFrfTask(String taskId);
+ public native int disposePrecisionOctaveFrequencyResponseTask(String taskId);
/**
- * JNI 接口:{@code createBkTriggerTask}。
+ * JNI 接口:{@code createSignalTriggerTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
@@ -673,7 +720,7 @@ public native int readBkCpbFrfSelectedResult(String taskId, int function, int co
* @param holdOffSamples {@code holdOffSamples} 参数。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int createBkTriggerTask(
+ public native int createSignalTriggerTask(
String taskId,
double referenceLevel,
double levelPercent,
@@ -685,7 +732,7 @@ public native int createBkTriggerTask(
);
/**
- * JNI 接口:{@code searchBkTriggerTask}。
+ * JNI 接口:{@code searchSignalTriggerTask}。
*
* A 类 JSON 接口:返回统一响应,固定包含 {@code version}、{@code code}、{@code message} 和 {@code data}。
* @param taskId 任务标识。
@@ -693,26 +740,26 @@ public native int createBkTriggerTask(
* @param forceTrigger {@code forceTrigger} 参数。
* @return 统一 JSON 响应字符串
*/
- public native String searchBkTriggerTask(String taskId, double[] samples,
+ public native String searchSignalTriggerTask(String taskId, double[] samples,
boolean forceTrigger);
/**
- * JNI 接口:{@code resetBkTriggerTask}。
+ * JNI 接口:{@code resetSignalTriggerTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int resetBkTriggerTask(String taskId);
+ public native int resetSignalTriggerTask(String taskId);
/**
- * JNI 接口:{@code disposeBkTriggerTask}。
+ * JNI 接口:{@code disposeSignalTriggerTask}。
*
* A 类状态接口:不通过返回值携带业务数据。
* @param taskId 任务标识。
* @return JNI 状态码,0 表示成功,非 0 表示失败
*/
- public native int disposeBkTriggerTask(String taskId);
+ public native int disposeSignalTriggerTask(String taskId);
/**
diff --git a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/OrderTrackingJNIBridge.java b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/OrderTrackingJNIBridge.java
index 3e7eff6a..4d431535 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/OrderTrackingJNIBridge.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/core/jni/OrderTrackingJNIBridge.java
@@ -1,41 +1,26 @@
package com.opentest.core.jni;
-import com.opentest.algorithm.api.OrderTrackingModels.Config;
-import com.opentest.algorithm.api.OrderTrackingModels.Input;
-import com.opentest.algorithm.api.OrderTrackingModels.Result;
+import com.opentest.algorithm.api.OrderTrackingModels.AnglePreparationResult;
+import com.opentest.algorithm.api.OrderTrackingModels.AngleReference;
+import com.opentest.algorithm.api.OrderTrackingModels.FsSettings;
+import com.opentest.algorithm.api.OrderTrackingModels.OtSettings;
+import com.opentest.algorithm.api.OrderTrackingModels.Results;
+import com.opentest.algorithm.api.OrderTrackingModels.RpmReference;
+import com.opentest.algorithm.api.OrderTrackingModels.SpectrumSelection;
+import com.opentest.algorithm.api.OrderTrackingModels.VibrationSignal;
/**
- * Typed JNI boundary to {@code CRYOrderTrack::AnalyzeFromRpmFixedEx} in {@code CRYAlgorithmLib}.
- * The host owns DLL loading and initialization; constructing this class never loads another runtime.
- * All bridge instances serialize native order-analysis calls through one native mutex. This does not
- * make unrelated algorithms or a second independently loaded runtime safe to call concurrently.
+ * Direct JNI boundary for the delivered fixed-sampling and order-tracking SDK.
+ *
+ * The bridge performs no resampling, filtering, unit conversion, result selection, or
+ * business error translation. FS and OT analysis return the native result model, the angle
+ * preparation method returns the reference consumed by OT, and selectors read frame metadata
+ * from an existing result.
*/
public class OrderTrackingJNIBridge {
- /**
- * Performs synchronous whole-record fixed-sampling analysis using already supplied RPM values.
- * Vibration samples retain the caller's physical unit; RPM values are revolutions per minute,
- * sampling rates are Hz and both start times are seconds relative to the same clock origin.
- * Native code performs any required RPM interpolation; Java performs no numerical processing.
- * Zero start times reproduce the ordinary {@code AnalyzeFromRpmFixed} timing contract.
- *
- * Configuration defaults and enum codes are declared in {@code OrderTrackingModels}.
- * Required nested objects and arrays must be non-null; optional selections use empty arrays.
- * JNI copies input arrays into call-local storage. Do not mutate any reachable input/configuration
- * during the call. Returned arrays are independent Java allocations; no native handles survive
- * the call and no close/dispose operation is required. Fixed maps use {@code data[y/RPM][x/Hz]},
- * while the native derived map uses {@code data[x/RPM][y/order]}; neither is transposed by JNI.
- * Actual and nominal axes are retained separately, and nonfinite result values are not normalized.
- *
- *
Binding errors throw; algorithm rejection returns {@code success=false} with the original
- * errors, warnings and any partial facts. A false success flag is never replaced by synthetic data.
- *
- * @param config complete native configuration, including required common/fixed/standard objects
- * @param input vibration and speed records with independent rates and common-origin start times
- * @return complete native result, including chain, sections, curves, maps and diagnostics
- * @throws IllegalArgumentException for null required objects/arrays or invalid integer enum codes
- * @throws IllegalStateException for an escaping native exception, preserving its message
- * @throws OutOfMemoryError for binding allocation failure
- * @throws UnsatisfiedLinkError if a matching CRYAlgorithmLib has not been loaded by the host
- */
- public native Result analyzeFromRpmFixed(Config config, Input input);
+ public native Results analyzeFs(VibrationSignal vibration, RpmReference rpm, FsSettings settings);
+ public native AnglePreparationResult prepareAngleReference(RpmReference rpm);
+ public native Results analyzeOt(VibrationSignal vibration, AngleReference reference, OtSettings settings);
+ public native SpectrumSelection selectFsSpectrum(Results results, int axis, double target);
+ public native SpectrumSelection selectOtSpectrum(Results results, int axis, double target);
}
diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibBridgeContractTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibBridgeContractTest.java
index 0a96db6b..81b0c858 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibBridgeContractTest.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibBridgeContractTest.java
@@ -1,10 +1,11 @@
package com.opentest.algorithm.runtime;
import com.opentest.core.jni.AlgorithmLibJNIBridge;
-import org.junit.jupiter.api.Test;
-
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -13,13 +14,81 @@ class AlgorithmLibBridgeContractTest {
@Test
void bkTriggerMethodsExposeTheFinalRawJniContract() throws Exception {
- assertNative("createBkTriggerTask", int.class,
+ assertNative("createSignalTriggerTask", int.class,
String.class, double.class, double.class, double.class, boolean.class,
int.class, int.class, int.class);
- assertNative("searchBkTriggerTask", String.class,
+ assertNative("searchSignalTriggerTask", String.class,
String.class, double[].class, boolean.class);
- assertNative("resetBkTriggerTask", int.class, String.class);
- assertNative("disposeBkTriggerTask", int.class, String.class);
+ assertNative("resetSignalTriggerTask", int.class, String.class);
+ assertNative("disposeSignalTriggerTask", int.class, String.class);
+ }
+
+ @Test
+ void newlyDeclaredChannelAndBatchMethodsExposeTheirNativeDescriptors() throws Exception {
+ assertNative("createAdvancedFftChannelTask", int.class,
+ String.class, String.class, int.class, int.class, int.class, int.class, int.class,
+ int.class, double.class, int.class, double.class, int.class, double.class, int.class,
+ double.class, double.class, double.class, double.class, int.class, int.class, double.class,
+ double.class, int.class, int.class, int.class, int.class, int.class, int.class,
+ double.class, double.class, int.class);
+ assertNative("pushAdvancedFftChannelTask", int.class, String.class, double[].class, int.class);
+ assertNative("pushAdvancedFftChannelTaskWithReference", int.class,
+ String.class, double[].class, double[].class, int.class);
+ assertNative("publishAdvancedFftReference", int.class,
+ String.class, long.class, double[].class, int.class);
+ assertNative("pushAdvancedFftChannelFrame", int.class,
+ String.class, long.class, double[].class, int.class);
+ assertNative("readAdvancedFftChannelSelectedResults", int.class,
+ String.class, int[].class, int[].class, int[].class, int[].class, int[].class,
+ JniNamedDoubleResultCollector.class, String[].class);
+ assertNative("readAdvancedFftSelectedResults", int.class,
+ String.class, int[].class, int[].class, int[].class, int[].class,
+ JniNamedDoubleResultCollector.class, String[].class);
+ assertNative("readAdvancedFrequencyResponseSelectedResults", int.class,
+ String.class, int[].class, int[].class, int[].class, int[].class,
+ JniNamedDoubleResultCollector.class, String[].class);
+ assertNative("readPrecisionOctaveFrequencyResponseSelectedResults", int.class,
+ String.class, int[].class, int[].class, int[].class, int[].class,
+ JniNamedDoubleResultCollector.class, String[].class);
+ assertNative("createPrecisionOctaveSharedGroup", long.class, String[].class);
+ assertNative("processPrecisionOctaveSharedGroup", int.class, long.class, double[][].class);
+ assertNative("disposePrecisionOctaveSharedGroup", void.class, long.class);
+ }
+
+ @Test
+ void allDocumentedNeutralAnalysisNamesExistWithoutTheRemovedAliases() {
+ Set expected = Set.of(
+ "createAdvancedFftChannelTask", "pushAdvancedFftChannelTask",
+ "pushAdvancedFftChannelTaskWithReference", "publishAdvancedFftReference",
+ "pushAdvancedFftChannelFrame", "readAdvancedFftChannelSelectedResults",
+ "resetAdvancedFftChannelTask", "disposeAdvancedFftChannelTask",
+ "createAdvancedFftTask", "createAdvancedFftSpectrogramTask", "pushAdvancedFftTask",
+ "readAdvancedFftTask", "readAdvancedFftSelectedResult", "readAdvancedFftSelectedResults",
+ "resetAdvancedFftTask", "disposeAdvancedFftTask",
+ "createAdvancedFrequencyResponseTask", "pushAdvancedFrequencyResponseTask",
+ "readAdvancedFrequencyResponseTask", "readAdvancedFrequencyResponseSelectedResult",
+ "readAdvancedFrequencyResponseSelectedResults", "resetAdvancedFrequencyResponseTask",
+ "disposeAdvancedFrequencyResponseTask", "createPrecisionOctaveMultiTask",
+ "readPrecisionOctaveMultiTask", "createPrecisionOctaveTask", "pushPrecisionOctaveTask",
+ "readPrecisionOctaveTask", "readPrecisionOctaveSelectedResult",
+ "resetPrecisionOctaveTask", "disposePrecisionOctaveTask",
+ "createPrecisionOctaveFrequencyResponseTask",
+ "pushPrecisionOctaveFrequencyResponseTask",
+ "readPrecisionOctaveFrequencyResponseTask",
+ "readPrecisionOctaveFrequencyResponseSelectedResult",
+ "readPrecisionOctaveFrequencyResponseSelectedResults",
+ "resetPrecisionOctaveFrequencyResponseTask",
+ "disposePrecisionOctaveFrequencyResponseTask", "createSignalTriggerTask",
+ "searchSignalTriggerTask", "resetSignalTriggerTask", "disposeSignalTriggerTask",
+ "createPrecisionOctaveSharedGroup", "processPrecisionOctaveSharedGroup",
+ "disposePrecisionOctaveSharedGroup");
+ Set actual = Set.of(Arrays.stream(AlgorithmLibJNIBridge.class.getDeclaredMethods())
+ .map(Method::getName)
+ .filter(expected::contains)
+ .toArray(String[]::new));
+ assertEquals(expected, actual);
+ assertTrue(Arrays.stream(AlgorithmLibJNIBridge.class.getDeclaredMethods())
+ .noneMatch(method -> method.getName().matches(".*Bk(Fft|Frf|Cpb|Trigger).*")));
}
private void assertNative(String name, Class> returnType, Class>... parameterTypes)
diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeServiceTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeServiceTest.java
index 21375d03..fb483020 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeServiceTest.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/AlgorithmLibJNIBridgeServiceTest.java
@@ -152,7 +152,7 @@ public int calculateFftData(double[] audioData, int length, double sampleRate,
}
@Override
- public int createBkFftTask(String taskId, double sampleRateHz, int analysisMode,
+ public int createAdvancedFftTask(String taskId, double sampleRateHz, int analysisMode,
double spanHz, int lines, double centerFrequencyHz,
int windowType, double windowParam,
double windowStartFraction, double windowEndFraction,
@@ -171,13 +171,13 @@ public int createBkFftTask(String taskId, double sampleRateHz, int analysisMode,
}
@Override
- public int pushBkFftTask(String taskId, double[] samples, int sampleCount) {
+ public int pushAdvancedFftTask(String taskId, double[] samples, int sampleCount) {
bkFftSampleCount = sampleCount;
return 0;
}
@Override
- public int readBkFftTask(String taskId, int weighting, JniNamedDoubleResultCollector collector,
+ public int readAdvancedFftTask(String taskId, int weighting, JniNamedDoubleResultCollector collector,
java.util.Map messages) {
collector.acquire("datafreq", 2)[1] = 1D;
collector.acquire("datafft", 2)[0] = 3D;
@@ -188,8 +188,8 @@ public int readBkFftTask(String taskId, int weighting, JniNamedDoubleResultColle
return 0;
}
- @Override public int resetBkFftTask(String taskId) { return 0; }
- @Override public int disposeBkFftTask(String taskId) { return 0; }
+ @Override public int resetAdvancedFftTask(String taskId) { return 0; }
+ @Override public int disposeAdvancedFftTask(String taskId) { return 0; }
@Override
public int filterSoundLevel(double sampleRate, double lowCutoffFrequency,
diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/OrderTrackingContractTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/OrderTrackingContractTest.java
index 5c2feeb1..eae585a0 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/OrderTrackingContractTest.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/OrderTrackingContractTest.java
@@ -1,65 +1,128 @@
package com.opentest.algorithm.runtime;
-import com.opentest.algorithm.api.OrderTrackingModels.Config;
-import com.opentest.algorithm.api.OrderTrackingModels.Input;
-import com.opentest.algorithm.api.OrderTrackingModels.Result;
+import com.opentest.algorithm.api.OrderTrackingAlgorithmService;
+import com.opentest.algorithm.api.OrderTrackingModels.AnglePreparationResult;
+import com.opentest.algorithm.api.OrderTrackingModels.AngleReference;
+import com.opentest.algorithm.api.OrderTrackingModels.FsSettings;
+import com.opentest.algorithm.api.OrderTrackingModels.OtSettings;
+import com.opentest.algorithm.api.OrderTrackingModels.Results;
+import com.opentest.algorithm.api.OrderTrackingModels.RpmReference;
+import com.opentest.algorithm.api.OrderTrackingModels.SpectrumSelection;
+import com.opentest.algorithm.api.OrderTrackingModels.VibrationSignal;
import com.opentest.core.jni.OrderTrackingJNIBridge;
+import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.Arrays;
+import java.util.List;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
class OrderTrackingContractTest {
@Test
- void forwardsInputsAndAlgorithmFailureWithoutRetryOrNormalization() {
- var config = new Config();
- var input = new Input();
- var result = new Result();
- result.success = false;
- result.errors = new String[]{"native rejection"};
- result.chain.shared.rpmMean = Double.NaN;
- int[] calls = {0};
+ void forwardsEachNativeOperationWithoutNormalization() {
+ var vibration = new VibrationSignal();
+ var rpm = new RpmReference();
+ var fsSettings = new FsSettings();
+ var otSettings = new OtSettings();
+ var angleReference = new AngleReference();
+ var results = new Results();
+ var anglePreparation = new AnglePreparationResult();
+ var fsSelection = new SpectrumSelection();
+ var otSelection = new SpectrumSelection();
+ var calls = new StringBuilder();
var service = new PublicOrderTrackingAlgorithmService(new OrderTrackingJNIBridge() {
- @Override public Result analyzeFromRpmFixed(Config c, Input i) {
- assertSame(config, c);
- assertSame(input, i);
- calls[0]++;
- return result;
+ @Override
+ public Results analyzeFs(VibrationSignal actualVibration, RpmReference actualRpm, FsSettings actualSettings) {
+ assertSame(vibration, actualVibration);
+ assertSame(rpm, actualRpm);
+ assertSame(fsSettings, actualSettings);
+ calls.append("fs;");
+ return results;
+ }
+
+ @Override
+ public AnglePreparationResult prepareAngleReference(RpmReference actualRpm) {
+ assertSame(rpm, actualRpm);
+ calls.append("prepare;");
+ return anglePreparation;
+ }
+
+ @Override
+ public Results analyzeOt(VibrationSignal actualVibration, AngleReference actualReference, OtSettings actualSettings) {
+ assertSame(vibration, actualVibration);
+ assertSame(angleReference, actualReference);
+ assertSame(otSettings, actualSettings);
+ calls.append("ot;");
+ return results;
+ }
+
+ @Override
+ public SpectrumSelection selectFsSpectrum(Results actualResults, int axis, double target) {
+ assertSame(results, actualResults);
+ assertEquals(1, axis);
+ assertEquals(2.5, target);
+ calls.append("select-fs;");
+ return fsSelection;
+ }
+
+ @Override
+ public SpectrumSelection selectOtSpectrum(Results actualResults, int axis, double target) {
+ assertSame(results, actualResults);
+ assertEquals(2, axis);
+ assertEquals(3.5, target);
+ calls.append("select-ot;");
+ return otSelection;
}
});
- assertSame(result, service.analyzeFromRpmFixed(config, input));
- assertEquals(1, calls[0]);
- assertTrue(Double.isNaN(result.chain.shared.rpmMean));
+
+ assertSame(results, service.analyzeFs(vibration, rpm, fsSettings));
+ assertSame(anglePreparation, service.prepareAngleReference(rpm));
+ assertSame(results, service.analyzeOt(vibration, angleReference, otSettings));
+ assertSame(fsSelection, service.selectFsSpectrum(results, 1, 2.5));
+ assertSame(otSelection, service.selectOtSpectrum(results, 2, 3.5));
+ assertEquals("fs;prepare;ot;select-fs;select-ot;", calls.toString());
}
@Test
void preservesBindingExceptionIdentity() {
var failure = new IllegalArgumentException("invalid native option");
var service = new PublicOrderTrackingAlgorithmService(new OrderTrackingJNIBridge() {
- @Override public Result analyzeFromRpmFixed(Config config, Input input) { throw failure; }
+ @Override
+ public Results analyzeFs(VibrationSignal vibration, RpmReference rpm, FsSettings settings) {
+ throw failure;
+ }
});
+
assertSame(failure, assertThrows(IllegalArgumentException.class,
- () -> service.analyzeFromRpmFixed(new Config(), new Input())));
+ () -> service.analyzeFs(new VibrationSignal(), new RpmReference(), new FsSettings())));
}
@Test
- void exposesOneTypedNativeEntryAndPublicService() throws Exception {
- Class> config = Class.forName("com.opentest.algorithm.api.OrderTrackingModels$Config");
- Class> input = Class.forName("com.opentest.algorithm.api.OrderTrackingModels$Input");
- Class> result = Class.forName("com.opentest.algorithm.api.OrderTrackingModels$Result");
- Class> bridge = Class.forName("com.opentest.core.jni.OrderTrackingJNIBridge");
- var method = bridge.getMethod("analyzeFromRpmFixed", config, input);
- assertTrue(Modifier.isNative(method.getModifiers()));
- assertEquals(result, method.getReturnType());
- assertEquals(1, Arrays.stream(bridge.getDeclaredMethods())
- .filter(m -> m.getName().equals("analyzeFromRpmFixed")).count());
- Class> service = Class.forName("com.opentest.algorithm.api.OrderTrackingAlgorithmService");
- assertEquals(result, service.getMethod("analyzeFromRpmFixed", config, input).getReturnType());
- assertTrue(service.isAssignableFrom(Class.forName(
- "com.opentest.algorithm.runtime.PublicOrderTrackingAlgorithmService")));
+ void exposesTheFiveTypedNativeEntriesAndPublicService() throws Exception {
+ var expected = List.of(
+ new Signature("analyzeFs", Results.class, VibrationSignal.class, RpmReference.class, FsSettings.class),
+ new Signature("prepareAngleReference", AnglePreparationResult.class, RpmReference.class),
+ new Signature("analyzeOt", Results.class, VibrationSignal.class, AngleReference.class, OtSettings.class),
+ new Signature("selectFsSpectrum", SpectrumSelection.class, Results.class, int.class, double.class),
+ new Signature("selectOtSpectrum", SpectrumSelection.class, Results.class, int.class, double.class));
+
+ for (var signature : expected) {
+ Method method = OrderTrackingJNIBridge.class.getMethod(signature.name(), signature.parameters());
+ assertTrue(Modifier.isNative(method.getModifiers()), signature.name());
+ assertEquals(signature.returnType(), method.getReturnType(), signature.name());
+ assertTrue(Modifier.isPublic(method.getModifiers()), signature.name());
+ }
+ assertEquals(expected.size(), OrderTrackingJNIBridge.class.getDeclaredMethods().length);
+ assertTrue(OrderTrackingAlgorithmService.class.isAssignableFrom(PublicOrderTrackingAlgorithmService.class));
+ for (var signature : expected) {
+ Method method = OrderTrackingAlgorithmService.class.getMethod(signature.name(), signature.parameters());
+ assertEquals(signature.returnType(), method.getReturnType(), signature.name());
+ }
+ }
+
+ private record Signature(String name, Class> returnType, Class>... parameters) {
}
}
diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicAlgorithmServiceTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicAlgorithmServiceTest.java
index 605a4a95..27230bc8 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicAlgorithmServiceTest.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicAlgorithmServiceTest.java
@@ -28,7 +28,7 @@ class PublicAlgorithmServiceTest {
@Test void reportsNativeFailureInsteadOfTreatingItAsAnEmptyFftResult() {
StatefulBridge bridge = new StatefulBridge() {
- @Override public int readBkFftTask(String id, int weighting,
+ @Override public int readAdvancedFftTask(String id, int weighting,
JniNamedDoubleResultCollector collector, Map messages) { return 13300010; }
};
var runtime = new AlgorithmLibJNIBridgeService(bridge);
@@ -44,9 +44,9 @@ class PublicAlgorithmServiceTest {
@Test void callerCanRetryFailedDisposalAndOwnsAnImmutableResultSnapshot() {
StatefulBridge bridge = new StatefulBridge() {
boolean fail = true;
- @Override public int disposeBkFftTask(String id) {
+ @Override public int disposeAdvancedFftTask(String id) {
if (fail) { fail = false; return 123; }
- return super.disposeBkFftTask(id);
+ return super.disposeAdvancedFftTask(id);
}
};
AlgorithmService service = new PublicAlgorithmService(new AlgorithmLibJNIBridgeService(bridge));
@@ -277,7 +277,7 @@ private static final class AverageBridge extends AlgorithmLibJNIBridge {
private static class StatefulBridge extends AlgorithmLibJNIBridge {
final Map tasks = new HashMap<>();
- @Override public int createBkFftTask(String id, double sampleRate, int mode, double span,
+ @Override public int createAdvancedFftTask(String id, double sampleRate, int mode, double span,
int lines, double center, int window, double param, double start, double end,
double overlap, int averageMode, int count, double seconds, double alpha,
int scaling, int fixed, int domain, int overload, int time, int lifter,
@@ -285,11 +285,11 @@ private static class StatefulBridge extends AlgorithmLibJNIBridge {
if (tasks.containsKey(id)) return -9;
tasks.put(id, null); return 0;
}
- @Override public int pushBkFftTask(String id, double[] samples, int count) {
+ @Override public int pushAdvancedFftTask(String id, double[] samples, int count) {
if (!tasks.containsKey(id)) return -9;
tasks.put(id, samples.clone()); return 0;
}
- @Override public int readBkFftTask(String id, int weighting,
+ @Override public int readAdvancedFftTask(String id, int weighting,
JniNamedDoubleResultCollector collector, Map messages) {
double[] values = tasks.get(id);
if (values == null) { collector.commit(); return 0; }
@@ -297,8 +297,8 @@ private static class StatefulBridge extends AlgorithmLibJNIBridge {
for (String key : List.of("datafreq", "dataasd", "datapsd")) collector.acquire(key, values.length);
collector.commit(); return 0;
}
- @Override public int resetBkFftTask(String id) { tasks.put(id, null); return 0; }
- @Override public int disposeBkFftTask(String id) {
+ @Override public int resetAdvancedFftTask(String id) { tasks.put(id, null); return 0; }
+ @Override public int disposeAdvancedFftTask(String id) {
if (!tasks.containsKey(id)) return -9;
tasks.remove(id); return 0;
}
diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbAlgorithmServiceTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbAlgorithmServiceTest.java
index fedb3300..3862d3fc 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbAlgorithmServiceTest.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbAlgorithmServiceTest.java
@@ -27,15 +27,15 @@ class PublicBkCpbAlgorithmServiceTest {
}
static final class Bridge extends AlgorithmLibJNIBridge {
Set ids=new LinkedHashSet<>();int publicationCode,disposeCode;
- @Override public int createBkCpbMultiTask(String id,double sr,double[] lower,double[] upper,double ref,int length,double duration,int filters,int avg,int count,double linear,double exp,double tau,int weight,int overall,double cursorLo,double cursorHi) {assertArrayEquals(new double[]{20,20,20,20,20},lower);assertArrayEquals(new double[]{16000,18000,19000,19500,20000},upper);assertEquals(.1,duration);ids.add(id);return 0;}
- @Override public int createBkCpbFrfTask(String id,double sr,int band,double lo,double hi,double ref,int length,double duration,int filters,int avg,int count,double linear,double exp,double tau,int weight,int overall,double cursorLo,double cursorHi,int estimator,int unwrap) {assertEquals(1,unwrap);ids.add(id);return 0;}
- @Override public int pushBkCpbTask(String id,double[] samples,int n) {assertTrue(ids.contains(id));assertArrayEquals(new double[]{1,2},samples);return 0;}
- @Override public int pushBkCpbFrfTask(String id,double[] reference,double[] response,int n) {assertArrayEquals(new double[]{3,4},reference);assertArrayEquals(new double[]{5,6},response);return 0;}
- @Override public int readBkCpbMultiTask(String id,JniNamedDoubleResultCollector collector,Map messages) {return read(collector,messages);}
- @Override public int readBkCpbFrfTask(String id,JniNamedDoubleResultCollector collector,Map messages) {return read(collector,messages);}
+ @Override public int createPrecisionOctaveMultiTask(String id,double sr,double[] lower,double[] upper,double ref,int length,double duration,int filters,int avg,int count,double linear,double exp,double tau,int weight,int overall,double cursorLo,double cursorHi) {assertArrayEquals(new double[]{20,20,20,20,20},lower);assertArrayEquals(new double[]{16000,18000,19000,19500,20000},upper);assertEquals(.1,duration);ids.add(id);return 0;}
+ @Override public int createPrecisionOctaveFrequencyResponseTask(String id,double sr,int band,double lo,double hi,double ref,int length,double duration,int filters,int avg,int count,double linear,double exp,double tau,int weight,int overall,double cursorLo,double cursorHi,int estimator,int unwrap) {assertEquals(1,unwrap);ids.add(id);return 0;}
+ @Override public int pushPrecisionOctaveTask(String id,double[] samples,int n) {assertTrue(ids.contains(id));assertArrayEquals(new double[]{1,2},samples);return 0;}
+ @Override public int pushPrecisionOctaveFrequencyResponseTask(String id,double[] reference,double[] response,int n) {assertArrayEquals(new double[]{3,4},reference);assertArrayEquals(new double[]{5,6},response);return 0;}
+ @Override public int readPrecisionOctaveMultiTask(String id,JniNamedDoubleResultCollector collector,Map messages) {return read(collector,messages);}
+ @Override public int readPrecisionOctaveFrequencyResponseTask(String id,JniNamedDoubleResultCollector collector,Map messages) {return read(collector,messages);}
private int read(JniNamedDoubleResultCollector collector,Map messages) {if(publicationCode!=0)return publicationCode;collector.acquire("retCode",1)[0]=123;messages.put("diagnostic","original status");collector.commit();return 0;}
- @Override public int resetBkCpbTask(String id) {assertTrue(ids.contains(id));return 0;}
- @Override public int disposeBkCpbTask(String id) {if(disposeCode==0)ids.remove(id);return disposeCode;}
- @Override public int disposeBkCpbFrfTask(String id) {return disposeBkCpbTask(id);}
+ @Override public int resetPrecisionOctaveTask(String id) {assertTrue(ids.contains(id));return 0;}
+ @Override public int disposePrecisionOctaveTask(String id) {if(disposeCode==0)ids.remove(id);return disposeCode;}
+ @Override public int disposePrecisionOctaveFrequencyResponseTask(String id) {return disposePrecisionOctaveTask(id);}
}
}
diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbSharedTaskTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbSharedTaskTest.java
index d30fcfbc..f2320620 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbSharedTaskTest.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkCpbSharedTaskTest.java
@@ -76,16 +76,16 @@ private static final class Bridge extends AlgorithmLibJNIBridge {
final Set live = new HashSet<>(); long handle = 1; int pushes, processes, disposes, processStatus;
volatile boolean running, disposedDuringProcess; boolean missing;
CountDownLatch enter, release;
- @Override public int createBkCpbFrfTask(String id,double sr,int band,double lo,double hi,double ref,int length,double duration,int filters,int avg,int count,double linear,double exp,double tau,int weight,int overall,double cursorLo,double cursorHi,int estimator,int unwrap) {live.add(id); return 0;}
- @Override public long createBkCpbSharedGroup(String[] ids) {if(missing)throw new UnsatisfiedLinkError("fixture missing group symbol");assertEquals(7,ids.length);assertEquals(7,new HashSet<>(List.of(ids)).size());assertTrue(live.containsAll(List.of(ids)));return handle;}
- @Override public int processBkCpbSharedGroup(long group,double[][] inputs) {
+ @Override public int createPrecisionOctaveFrequencyResponseTask(String id,double sr,int band,double lo,double hi,double ref,int length,double duration,int filters,int avg,int count,double linear,double exp,double tau,int weight,int overall,double cursorLo,double cursorHi,int estimator,int unwrap) {live.add(id); return 0;}
+ @Override public long createPrecisionOctaveSharedGroup(String[] ids) {if(missing)throw new UnsatisfiedLinkError("fixture missing group symbol");assertEquals(7,ids.length);assertEquals(7,new HashSet<>(List.of(ids)).size());assertTrue(live.containsAll(List.of(ids)));return handle;}
+ @Override public int processPrecisionOctaveSharedGroup(long group,double[][] inputs) {
running = true; try {assertEquals(8,inputs.length); processes++;
if (enter != null) {enter.countDown(); assertTrue(release.await(2,TimeUnit.SECONDS));}
assertEquals(7, live.size()); return processStatus;
} catch(InterruptedException problem) {throw new IllegalStateException(problem);} finally {running=false;}
}
- @Override public void disposeBkCpbSharedGroup(long group) {disposedDuringProcess |= running; disposes++;}
- @Override public int pushBkCpbFrfTask(String id,double[] x,double[] y,int count) {assertTrue(live.contains(id));pushes++;return 0;}
- @Override public int disposeBkCpbFrfTask(String id) {disposedDuringProcess |= running; live.remove(id);return 0;}
+ @Override public void disposePrecisionOctaveSharedGroup(long group) {disposedDuringProcess |= running; disposes++;}
+ @Override public int pushPrecisionOctaveFrequencyResponseTask(String id,double[] x,double[] y,int count) {assertTrue(live.contains(id));pushes++;return 0;}
+ @Override public int disposePrecisionOctaveFrequencyResponseTask(String id) {disposedDuringProcess |= running; live.remove(id);return 0;}
}
}
diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkTaskContractTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkTaskContractTest.java
index 14d45975..1414f26a 100644
--- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkTaskContractTest.java
+++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicBkTaskContractTest.java
@@ -74,28 +74,28 @@ private int create(String id, String type, double rate, int mode, double span, i
private void flags(int time, int lifter, double start, double end, int keep) {
assertArrayEquals(new double[]{1,0,.001,.002,0}, new double[]{time,lifter,start,end,keep});
}
- @Override public int createBkFftTask(String id, double rate, int mode, double span, int lines, double center,
+ @Override public int createAdvancedFftTask(String id, double rate, int mode, double span, int lines, double center,
int window, double param, double start, double end, double overlap, int avg, int count,
double seconds, double alpha, int scale, int fixed, int domain, int overload,
int time, int lifter, double lifterStart, double lifterEnd, int keep) {
flags(time,lifter,lifterStart,lifterEnd,keep);
return create(id,"fft",rate,mode,span,lines,center,window,param,start,end,overlap,avg,count,seconds,alpha,scale,fixed,domain,overload);
}
- @Override public int createBkFftSpectrogramTask(String id, double rate, int mode, double span, int lines, double center,
+ @Override public int createAdvancedFftSpectrogramTask(String id, double rate, int mode, double span, int lines, double center,
int window, double param, double start, double end, double overlap, int avg, int count,
double seconds, double alpha, int scale, int fixed, int domain, int overload) {
return create(id,"spectrogram",rate,mode,span,lines,center,window,param,start,end,overlap,avg,count,seconds,alpha,scale,fixed,domain,overload);
}
- @Override public int createBkFrfTask(String id, double rate, int mode, double span, int lines, double center,
+ @Override public int createAdvancedFrequencyResponseTask(String id, double rate, int mode, double span, int lines, double center,
int window, double param, double start, double end, double overlap, int avg, int count,
double seconds, double alpha, int scale, int fixed, int domain, int overload, int estimator, int unwrap,
int time, int lifter, double lifterStart, double lifterEnd, int keep) {
assertEquals(2, estimator); assertEquals(1, unwrap); flags(time,lifter,lifterStart,lifterEnd,keep);
return create(id,"frf",rate,mode,span,lines,center,window,param,start,end,overlap,avg,count,seconds,alpha,scale,fixed,domain,overload);
}
- @Override public int pushBkFftTask(String id, double[] data, int count) { assertEquals(data.length,count); tasks.put(id,data.clone()); return 0; }
- @Override public int pushBkFrfTask(String id, double[] ref, double[] data, int count) { reference=ref.clone(); return pushBkFftTask(id,data,count); }
- @Override public int readBkFftTask(String id, int weight, JniNamedDoubleResultCollector collector, Map messages) {
+ @Override public int pushAdvancedFftTask(String id, double[] data, int count) { assertEquals(data.length,count); tasks.put(id,data.clone()); return 0; }
+ @Override public int pushAdvancedFrequencyResponseTask(String id, double[] ref, double[] data, int count) { reference=ref.clone(); return pushAdvancedFftTask(id,data,count); }
+ @Override public int readAdvancedFftTask(String id, int weight, JniNamedDoubleResultCollector collector, Map messages) {
weighting=weight;
if (readCode != 0) return readCode;
var data=tasks.get(id);
@@ -105,10 +105,10 @@ private void flags(int time, int lifter, double start, double end, int keep) {
arrays.forEach((key,value)->System.arraycopy(value,0,collector.acquire(key,value.length),0,value.length));
messages.put("Coherence","not available"); collector.commit(); return 0;
}
- @Override public int readBkFrfTask(String id, int weight, JniNamedDoubleResultCollector collector, Map messages) { return readBkFftTask(id,weight,collector,messages); }
- @Override public int resetBkFftTask(String id) { tasks.put(id,new double[0]); return 0; }
- @Override public int resetBkFrfTask(String id) { return resetBkFftTask(id); }
- @Override public int disposeBkFftTask(String id) { if(disposeCode==0) tasks.remove(id); return disposeCode; }
- @Override public int disposeBkFrfTask(String id) { return disposeBkFftTask(id); }
+ @Override public int readAdvancedFrequencyResponseTask(String id, int weight, JniNamedDoubleResultCollector collector, Map messages) { return readAdvancedFftTask(id,weight,collector,messages); }
+ @Override public int resetAdvancedFftTask(String id) { tasks.put(id,new double[0]); return 0; }
+ @Override public int resetAdvancedFrequencyResponseTask(String id) { return resetAdvancedFftTask(id); }
+ @Override public int disposeAdvancedFftTask(String id) { if(disposeCode==0) tasks.remove(id); return disposeCode; }
+ @Override public int disposeAdvancedFrequencyResponseTask(String id) { return disposeAdvancedFftTask(id); }
}
}
diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCode.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCode.java
index 5c65b8f9..1067342f 100644
--- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCode.java
+++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCode.java
@@ -95,31 +95,31 @@ public enum JNIErrorCode {
ALGORITHM_NOT_INITIALIZED(13200015, "Algorithm Not Initialized"),
ALGORITHM_OUT_OF_MEMORY(13200016, "Algorithm Out Of Memory"),
ALGORITHM_FREQUENCY_EXCEEDS_NYQUIST(13200017, "Algorithm Frequency Exceeds Nyquist"),
- ALGORITHM_BK_FFT_INVALID_ARGUMENT(13200018, "Algorithm BK FFT Invalid Argument"),
- ALGORITHM_BK_FFT_GEOMETRY_ERROR(13200019, "Algorithm BK FFT Geometry Error"),
- ALGORITHM_BK_FFT_ALLOCATION_ERROR(13200020, "Algorithm BK FFT Allocation Error"),
- ALGORITHM_BK_FFT_ANALYSIS_ERROR(13200021, "Algorithm BK FFT Analysis Error"),
- ALGORITHM_BK_FFT_STATE_ERROR(13200022, "Algorithm BK FFT State Error"),
- ALGORITHM_BK_FFT_CAPACITY_ERROR(13200023, "Algorithm BK FFT Capacity Error"),
- ALGORITHM_BK_FFT_UNSUPPORTED(13200024, "Algorithm BK FFT Unsupported"),
- ALGORITHM_BK_FFT_FRAME_LENGTH_ERROR(13200025, "Algorithm BK FFT Frame Length Error"),
- ALGORITHM_BK_TRIGGER_INVALID_ARGUMENT(13200026, "Algorithm BK Trigger Invalid Argument"),
- ALGORITHM_BK_TRIGGER_INVALID_MODE(13200027, "Algorithm BK Trigger Invalid Mode"),
- ALGORITHM_BK_TRIGGER_INVALID_EDGE(13200028, "Algorithm BK Trigger Invalid Edge"),
- ALGORITHM_BK_TRIGGER_NO_TRIGGER(13200029, "Algorithm BK Trigger No Trigger"),
- ALGORITHM_BK_TRIGGER_INSUFFICIENT_PRETRIGGER(13200030, "Algorithm BK Trigger Insufficient Pretrigger"),
- ALGORITHM_BK_TRIGGER_NO_COMPLETE_RECORD(13200031, "Algorithm BK Trigger No Complete Record"),
- ALGORITHM_BK_TRIGGER_CAPACITY_ERROR(13200032, "Algorithm BK Trigger Capacity Error"),
- ALGORITHM_BK_TRIGGER_STATE_ERROR(13200033, "Algorithm BK Trigger State Error"),
- ALGORITHM_BK_TRIGGER_ALLOCATION_ERROR(13200034, "Algorithm BK Trigger Allocation Error"),
- ALGORITHM_BK_TRIGGER_UNSUPPORTED(13200035, "Algorithm BK Trigger Unsupported"),
- ALGORITHM_BK_CPB_INVALID_ARGUMENT(13200036, "Algorithm BK CPB Invalid Argument"),
- ALGORITHM_BK_CPB_GEOMETRY_ERROR(13200037, "Algorithm BK CPB Geometry Error"),
- ALGORITHM_BK_CPB_ALLOCATION_ERROR(13200038, "Algorithm BK CPB Allocation Error"),
- ALGORITHM_BK_CPB_ANALYSIS_ERROR(13200039, "Algorithm BK CPB Analysis Error"),
- ALGORITHM_BK_CPB_STATE_ERROR(13200040, "Algorithm BK CPB State Error"),
- ALGORITHM_BK_CPB_CAPACITY_ERROR(13200041, "Algorithm BK CPB Capacity Error"),
- ALGORITHM_BK_CPB_UNSUPPORTED(13200042, "Algorithm BK CPB Unsupported"),
+ ALGORITHM_ADVANCED_FFT_INVALID_ARGUMENT(13200018, "Algorithm Advanced FFT Invalid Argument"),
+ ALGORITHM_ADVANCED_FFT_GEOMETRY_ERROR(13200019, "Algorithm Advanced FFT Geometry Error"),
+ ALGORITHM_ADVANCED_FFT_ALLOCATION_ERROR(13200020, "Algorithm Advanced FFT Allocation Error"),
+ ALGORITHM_ADVANCED_FFT_ANALYSIS_ERROR(13200021, "Algorithm Advanced FFT Analysis Error"),
+ ALGORITHM_ADVANCED_FFT_STATE_ERROR(13200022, "Algorithm Advanced FFT State Error"),
+ ALGORITHM_ADVANCED_FFT_CAPACITY_ERROR(13200023, "Algorithm Advanced FFT Capacity Error"),
+ ALGORITHM_ADVANCED_FFT_UNSUPPORTED(13200024, "Algorithm Advanced FFT Unsupported"),
+ ALGORITHM_ADVANCED_FFT_FRAME_LENGTH_ERROR(13200025, "Algorithm Advanced FFT Frame Length Error"),
+ ALGORITHM_SIGNAL_TRIGGER_INVALID_ARGUMENT(13200026, "Algorithm Signal Trigger Invalid Argument"),
+ ALGORITHM_SIGNAL_TRIGGER_INVALID_MODE(13200027, "Algorithm Signal Trigger Invalid Mode"),
+ ALGORITHM_SIGNAL_TRIGGER_INVALID_EDGE(13200028, "Algorithm Signal Trigger Invalid Edge"),
+ ALGORITHM_SIGNAL_TRIGGER_NO_TRIGGER(13200029, "Algorithm Signal Trigger No Trigger"),
+ ALGORITHM_SIGNAL_TRIGGER_INSUFFICIENT_PRETRIGGER(13200030, "Algorithm Signal Trigger Insufficient Pretrigger"),
+ ALGORITHM_SIGNAL_TRIGGER_NO_COMPLETE_RECORD(13200031, "Algorithm Signal Trigger No Complete Record"),
+ ALGORITHM_SIGNAL_TRIGGER_CAPACITY_ERROR(13200032, "Algorithm Signal Trigger Capacity Error"),
+ ALGORITHM_SIGNAL_TRIGGER_STATE_ERROR(13200033, "Algorithm Signal Trigger State Error"),
+ ALGORITHM_SIGNAL_TRIGGER_ALLOCATION_ERROR(13200034, "Algorithm Signal Trigger Allocation Error"),
+ ALGORITHM_SIGNAL_TRIGGER_UNSUPPORTED(13200035, "Algorithm Signal Trigger Unsupported"),
+ ALGORITHM_PRECISION_OCTAVE_INVALID_ARGUMENT(13200036, "Algorithm Precision Octave Invalid Argument"),
+ ALGORITHM_PRECISION_OCTAVE_GEOMETRY_ERROR(13200037, "Algorithm Precision Octave Geometry Error"),
+ ALGORITHM_PRECISION_OCTAVE_ALLOCATION_ERROR(13200038, "Algorithm Precision Octave Allocation Error"),
+ ALGORITHM_PRECISION_OCTAVE_ANALYSIS_ERROR(13200039, "Algorithm Precision Octave Analysis Error"),
+ ALGORITHM_PRECISION_OCTAVE_STATE_ERROR(13200040, "Algorithm Precision Octave State Error"),
+ ALGORITHM_PRECISION_OCTAVE_CAPACITY_ERROR(13200041, "Algorithm Precision Octave Capacity Error"),
+ ALGORITHM_PRECISION_OCTAVE_UNSUPPORTED(13200042, "Algorithm Precision Octave Unsupported"),
ALGORITHM_RT60_INVALID_PARAMETER(13200043, "Algorithm RT60 Invalid Parameter"),
ALGORITHM_RT60_INSUFFICIENT_DATA(13200044, "Algorithm RT60 Insufficient Data"),
ALGORITHM_RT60_SNR_LOW(13200045, "Algorithm RT60 SNR Low"),
@@ -168,13 +168,13 @@ public enum JNIErrorCode {
ALGORITHM_AMPLITUDESWEEPGETCHART_FAILED(13200105, "ALGORITHM_AMPLITUDESWEEPGETCHART_FAILED"),
ALGORITHM_BANDRMSSPECTRUM_FAILED(13200106, "ALGORITHM_BANDRMSSPECTRUM_FAILED"),
ALGORITHM_BANDRMSWAVEFORM_FAILED(13200107, "ALGORITHM_BANDRMSWAVEFORM_FAILED"),
- ALGORITHM_BKCPB_FAILED(13200108, "ALGORITHM_BKCPB_FAILED"),
- ALGORITHM_BKCPBPUSHTASK_FAILED(13200109, "ALGORITHM_BKCPBPUSHTASK_FAILED"),
- ALGORITHM_BKFFT_FAILED(13200110, "ALGORITHM_BKFFT_FAILED"),
- ALGORITHM_BKFFTPUSHTASK_FAILED(13200111, "ALGORITHM_BKFFTPUSHTASK_FAILED"),
- ALGORITHM_BKFRF_FAILED(13200112, "ALGORITHM_BKFRF_FAILED"),
- ALGORITHM_BKFRFPUSHTASK_FAILED(13200113, "ALGORITHM_BKFRFPUSHTASK_FAILED"),
- ALGORITHM_BKTRIGGER_FAILED(13200114, "ALGORITHM_BKTRIGGER_FAILED"),
+ ALGORITHM_PRECISION_OCTAVE_FAILED(13200108, "ALGORITHM_PRECISION_OCTAVE_FAILED"),
+ ALGORITHM_PRECISION_OCTAVE_PUSH_TASK_FAILED(13200109, "ALGORITHM_PRECISION_OCTAVE_PUSH_TASK_FAILED"),
+ ALGORITHM_ADVANCED_FFT_FAILED(13200110, "ALGORITHM_ADVANCED_FFT_FAILED"),
+ ALGORITHM_ADVANCED_FFT_PUSH_TASK_FAILED(13200111, "ALGORITHM_ADVANCED_FFT_PUSH_TASK_FAILED"),
+ ALGORITHM_ADVANCED_FREQUENCY_RESPONSE_FAILED(13200112, "ALGORITHM_ADVANCED_FREQUENCY_RESPONSE_FAILED"),
+ ALGORITHM_ADVANCED_FREQUENCY_RESPONSE_PUSH_TASK_FAILED(13200113, "ALGORITHM_ADVANCED_FREQUENCY_RESPONSE_PUSH_TASK_FAILED"),
+ ALGORITHM_SIGNAL_TRIGGER_FAILED(13200114, "ALGORITHM_SIGNAL_TRIGGER_FAILED"),
ALGORITHM_CALCULATEFFTDATA_FAILED(13200115, "ALGORITHM_CALCULATEFFTDATA_FAILED"),
ALGORITHM_CALCULATELAEQ_FAILED(13200116, "ALGORITHM_CALCULATELAEQ_FAILED"),
ALGORITHM_CALCULATEMETER_FAILED(13200117, "ALGORITHM_CALCULATEMETER_FAILED"),
diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCodeMapper.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCodeMapper.java
index b7384025..578ec905 100644
--- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCodeMapper.java
+++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/jni/model/JNIErrorCodeMapper.java
@@ -126,14 +126,14 @@ public static ErrorCode mapToSystemErrorCode(JNIErrorCode jniErrorCode) {
return ErrorCode.JNI_ALGORITHM_CALIBRATION_FAILED;
case ALGORITHM_INVALID_PARAMETER:
case ALGORITHM_FREQUENCY_EXCEEDS_NYQUIST:
- case ALGORITHM_BK_FFT_INVALID_ARGUMENT:
- case ALGORITHM_BK_FFT_GEOMETRY_ERROR:
- case ALGORITHM_BK_FFT_FRAME_LENGTH_ERROR:
- case ALGORITHM_BK_TRIGGER_INVALID_ARGUMENT:
- case ALGORITHM_BK_TRIGGER_INVALID_MODE:
- case ALGORITHM_BK_TRIGGER_INVALID_EDGE:
- case ALGORITHM_BK_CPB_INVALID_ARGUMENT:
- case ALGORITHM_BK_CPB_GEOMETRY_ERROR:
+ case ALGORITHM_ADVANCED_FFT_INVALID_ARGUMENT:
+ case ALGORITHM_ADVANCED_FFT_GEOMETRY_ERROR:
+ case ALGORITHM_ADVANCED_FFT_FRAME_LENGTH_ERROR:
+ case ALGORITHM_SIGNAL_TRIGGER_INVALID_ARGUMENT:
+ case ALGORITHM_SIGNAL_TRIGGER_INVALID_MODE:
+ case ALGORITHM_SIGNAL_TRIGGER_INVALID_EDGE:
+ case ALGORITHM_PRECISION_OCTAVE_INVALID_ARGUMENT:
+ case ALGORITHM_PRECISION_OCTAVE_GEOMETRY_ERROR:
case ALGORITHM_GJB4058_INVALID_ARGUMENT:
case ALGORITHM_GJB4058_GEOMETRY_ERROR:
case ALGORITHM_NULL_INPUT:
@@ -157,9 +157,9 @@ public static ErrorCode mapToSystemErrorCode(JNIErrorCode jniErrorCode) {
return ErrorCode.JNI_INVALID_TASK_ID;
case ALGORITHM_UNSUPPORTED_MODE:
case ALGORITHM_NOT_SUPPORTED:
- case ALGORITHM_BK_FFT_UNSUPPORTED:
- case ALGORITHM_BK_TRIGGER_UNSUPPORTED:
- case ALGORITHM_BK_CPB_UNSUPPORTED:
+ case ALGORITHM_ADVANCED_FFT_UNSUPPORTED:
+ case ALGORITHM_SIGNAL_TRIGGER_UNSUPPORTED:
+ case ALGORITHM_PRECISION_OCTAVE_UNSUPPORTED:
case ALGORITHM_GJB4058_UNSUPPORTED:
case ALGORITHM_VIBRATION_NOT_SUPPORTED:
case ALGORITHM_RT60_UNSUPPORTED_SAMPLE_RATE:
@@ -186,13 +186,13 @@ public static ErrorCode mapToSystemErrorCode(JNIErrorCode jniErrorCode) {
case ALGORITHM_AMPLITUDESWEEPGETCHART_FAILED:
case ALGORITHM_BANDRMSSPECTRUM_FAILED:
case ALGORITHM_BANDRMSWAVEFORM_FAILED:
- case ALGORITHM_BKCPB_FAILED:
- case ALGORITHM_BKCPBPUSHTASK_FAILED:
- case ALGORITHM_BKFFT_FAILED:
- case ALGORITHM_BKFFTPUSHTASK_FAILED:
- case ALGORITHM_BKFRF_FAILED:
- case ALGORITHM_BKFRFPUSHTASK_FAILED:
- case ALGORITHM_BKTRIGGER_FAILED:
+ case ALGORITHM_PRECISION_OCTAVE_FAILED:
+ case ALGORITHM_PRECISION_OCTAVE_PUSH_TASK_FAILED:
+ case ALGORITHM_ADVANCED_FFT_FAILED:
+ case ALGORITHM_ADVANCED_FFT_PUSH_TASK_FAILED:
+ case ALGORITHM_ADVANCED_FREQUENCY_RESPONSE_FAILED:
+ case ALGORITHM_ADVANCED_FREQUENCY_RESPONSE_PUSH_TASK_FAILED:
+ case ALGORITHM_SIGNAL_TRIGGER_FAILED:
case ALGORITHM_CALCULATEFFTDATA_FAILED:
case ALGORITHM_CALCULATELAEQ_FAILED:
case ALGORITHM_CALCULATEMETER_FAILED:
@@ -246,20 +246,20 @@ public static ErrorCode mapToSystemErrorCode(JNIErrorCode jniErrorCode) {
case ALGORITHM_AMPLITUDE_SWEEP_GENERATION_LENGTH_MISMATCH:
case ALGORITHM_AMPLITUDE_SWEEP_ANALYSIS_FAILED:
case ALGORITHM_AMPLITUDE_SWEEP_CHART_DATA_EMPTY:
- case ALGORITHM_BK_FFT_ALLOCATION_ERROR:
- case ALGORITHM_BK_FFT_ANALYSIS_ERROR:
- case ALGORITHM_BK_FFT_STATE_ERROR:
- case ALGORITHM_BK_FFT_CAPACITY_ERROR:
- case ALGORITHM_BK_TRIGGER_NO_TRIGGER:
- case ALGORITHM_BK_TRIGGER_INSUFFICIENT_PRETRIGGER:
- case ALGORITHM_BK_TRIGGER_NO_COMPLETE_RECORD:
- case ALGORITHM_BK_TRIGGER_CAPACITY_ERROR:
- case ALGORITHM_BK_TRIGGER_STATE_ERROR:
- case ALGORITHM_BK_TRIGGER_ALLOCATION_ERROR:
- case ALGORITHM_BK_CPB_ALLOCATION_ERROR:
- case ALGORITHM_BK_CPB_ANALYSIS_ERROR:
- case ALGORITHM_BK_CPB_STATE_ERROR:
- case ALGORITHM_BK_CPB_CAPACITY_ERROR:
+ case ALGORITHM_ADVANCED_FFT_ALLOCATION_ERROR:
+ case ALGORITHM_ADVANCED_FFT_ANALYSIS_ERROR:
+ case ALGORITHM_ADVANCED_FFT_STATE_ERROR:
+ case ALGORITHM_ADVANCED_FFT_CAPACITY_ERROR:
+ case ALGORITHM_SIGNAL_TRIGGER_NO_TRIGGER:
+ case ALGORITHM_SIGNAL_TRIGGER_INSUFFICIENT_PRETRIGGER:
+ case ALGORITHM_SIGNAL_TRIGGER_NO_COMPLETE_RECORD:
+ case ALGORITHM_SIGNAL_TRIGGER_CAPACITY_ERROR:
+ case ALGORITHM_SIGNAL_TRIGGER_STATE_ERROR:
+ case ALGORITHM_SIGNAL_TRIGGER_ALLOCATION_ERROR:
+ case ALGORITHM_PRECISION_OCTAVE_ALLOCATION_ERROR:
+ case ALGORITHM_PRECISION_OCTAVE_ANALYSIS_ERROR:
+ case ALGORITHM_PRECISION_OCTAVE_STATE_ERROR:
+ case ALGORITHM_PRECISION_OCTAVE_CAPACITY_ERROR:
case ALGORITHM_GJB4058_ANALYSIS_ERROR:
case ALGORITHM_GJB4058_CALL_FAILED:
case ALGORITHM_EXCEPTION:
diff --git a/apps/backend/crydaq-server/src/main/resources/native/windows-amd64/CRYASIODriverEx.dll b/apps/backend/crydaq-server/src/main/resources/native/windows-amd64/CRYASIODriverEx.dll
index 08601feb4721e1e09cb440ee8e397f3ce24a01c4..1dabfc6cf3c1ba148d0b5fcb705524cf80576da4 100644
GIT binary patch
delta 189
zcmZoTz}0YoYXb)(^An4&&D@Ob+>DIdxfz*WidzE(vKWAX35YX+xIl}Ep+FAAV_<;E
z@c`K(Kzs)%cLyOiU0;$(5@h0bZ%HOgRz}wCt#V8c9T~f(rzbF(GWJiOo4};c*ggGh
z0+S{a1LO1`2}~7?E2kGGGBt9$G1>?EdqM%(GP
QlbDA^w#jSw?SqwnH1jLy@T%g6oP#_25F)+a7
zcz|pXAie{XyMvIMt}n?X2{LiJwjGfcd6PQdH`=-xLVA5yontnEc
zNt5Xh!}K2sOcjhfrWYnMHFA3}+6NTnC#Mz{J50Zy#AH3)B8ka}@#ggGB&K{um+7~Y
Pn4B5;x63CpJ+uJ;o_#WX
diff --git a/apps/backend/crydaq-server/src/main/resources/native/windows-amd64/CRYAlgorithmLib.dll b/apps/backend/crydaq-server/src/main/resources/native/windows-amd64/CRYAlgorithmLib.dll
index 8f0bc60dc3a779f3a46ce9bb4445b054a0e9cb14..405258a51685c77adbf72a9e7e79b0479521b100 100644
GIT binary patch
delta 630490
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