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 57720b4e..a754e05f 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 @@ -253,6 +253,40 @@ public native int calculateFftDataInto( * @return JNI 状态码,0 表示成功,非 0 表示失败 */ // Keep Java callers source-compatible while binding the neutral names exported by native SDK 2.4.1. + 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); + public int createBkFftTask(String taskId, double sampleRateHz, int analysisMode, double spanHz, int lines, double centerFrequencyHz, int windowType, double windowParam, double windowStartFraction, double windowEndFraction, @@ -264,7 +298,7 @@ public int createBkFftTask(String taskId, double sampleRateHz, return createAdvancedFftTask(taskId, sampleRateHz, analysisMode, spanHz, lines, centerFrequencyHz, windowType, windowParam, windowStartFraction, windowEndFraction, overlapPercent, averageMode, averageCount, averageTimeSeconds, exponentialAlpha, scaling, averageFixedMode, averagingDomain, overloadExclude, enableTimeResults, enableLifteredSpectrum, lifterQuefrencyStartSeconds, lifterQuefrencyStopSeconds, lifterKeepInside); } - private native int createAdvancedFftTask(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, @@ -282,7 +316,7 @@ public int createBkFftSpectrogramTask(String taskId, double sampleRateHz, return createAdvancedFftSpectrogramTask(taskId, sampleRateHz, analysisMode, spanHz, lines, centerFrequencyHz, windowType, windowParam, windowStartFraction, windowEndFraction, overlapPercent, averageMode, averageCount, averageTimeSeconds, exponentialAlpha, scaling, averageFixedMode, averagingDomain, overloadExclude); } - private native int createAdvancedFftSpectrogramTask(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, @@ -302,7 +336,7 @@ public int pushBkFftTask(String taskId, double[] samples, int sampleCount) { return pushAdvancedFftTask(taskId, samples, sampleCount); } - private native int pushAdvancedFftTask(String taskId, double[] samples, int sampleCount); + public native int pushAdvancedFftTask(String taskId, double[] samples, int sampleCount); /** * 一次读取 BK FFT 当前帧的全部结果集。 @@ -338,7 +372,7 @@ public int readBkFftTask(String taskId, int weighting, return readAdvancedFftTask(taskId, weighting, collector, messageCollector); } - private native int readAdvancedFftTask(String taskId, int weighting, + public native int readAdvancedFftTask(String taskId, int weighting, JniNamedDoubleResultCollector collector, Map messageCollector); /** @@ -364,7 +398,7 @@ public int readBkFftSelectedResult(String taskId, int function, int coordinate, return readAdvancedFftSelectedResult(taskId, function, coordinate, spectralUnit, weighting, collector, messageOutput); } - private native int readAdvancedFftSelectedResult(String taskId, int function, int coordinate, + public native int readAdvancedFftSelectedResult(String taskId, int function, int coordinate, int spectralUnit, int weighting, JniNamedDoubleResultCollector collector, String[] messageOutput); @@ -375,11 +409,15 @@ private native int readAdvancedFftSelectedResult(String taskId, int function, in * @param taskId 任务标识。 * @return JNI 状态码,0 表示成功,非 0 表示失败 */ + public native int readAdvancedFftSelectedResults(String taskId, int[] functions, + int[] coordinates, int[] spectralUnits, int[] weightings, + JniNamedDoubleResultCollector collector, String[] messageOutput); + public int resetBkFftTask(String taskId) { return resetAdvancedFftTask(taskId); } - private native int resetAdvancedFftTask(String taskId); + public native int resetAdvancedFftTask(String taskId); /** * JNI 接口:{@code disposeBkFftTask}。 @@ -392,7 +430,7 @@ public int disposeBkFftTask(String taskId) { return disposeAdvancedFftTask(taskId); } - private native int disposeAdvancedFftTask(String taskId); + public native int disposeAdvancedFftTask(String taskId); /** * JNI 接口:{@code createBkFrfTask}。 @@ -437,7 +475,7 @@ public int createBkFrfTask(String taskId, double sampleRateHz, return createAdvancedFrequencyResponseTask(taskId, sampleRateHz, analysisMode, spanHz, lines, centerFrequencyHz, windowType, windowParam, windowStartFraction, windowEndFraction, overlapPercent, averageMode, averageCount, averageTimeSeconds, exponentialAlpha, scaling, averageFixedMode, averagingDomain, overloadExclude, estimator, unwrapPhase, enableTimeResults, enableLifteredSpectrum, lifterQuefrencyStartSeconds, lifterQuefrencyStopSeconds, lifterKeepInside); } - private native int createAdvancedFrequencyResponseTask(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, @@ -460,7 +498,7 @@ public int pushBkFrfTask(String taskId, double[] referenceSamples, double[] resp return pushAdvancedFrequencyResponseTask(taskId, referenceSamples, responseSamples, sampleCount); } - private native int pushAdvancedFrequencyResponseTask(String taskId, double[] referenceSamples, double[] responseSamples, int sampleCount); + public native int pushAdvancedFrequencyResponseTask(String taskId, double[] referenceSamples, double[] responseSamples, int sampleCount); /** * 一次读取 BK FRF 当前帧的全部结果集。 @@ -493,7 +531,7 @@ public int readBkFrfTask(String taskId, int weighting, return readAdvancedFrequencyResponseTask(taskId, weighting, collector, messageCollector); } - private native int readAdvancedFrequencyResponseTask(String taskId, int weighting, + public native int readAdvancedFrequencyResponseTask(String taskId, int weighting, JniNamedDoubleResultCollector collector, Map messageCollector); /** @@ -517,7 +555,7 @@ public int readBkFrfSelectedResult(String taskId, int function, int coordinate, return readAdvancedFrequencyResponseSelectedResult(taskId, function, coordinate, spectralUnit, weighting, collector, messageOutput); } - private native int readAdvancedFrequencyResponseSelectedResult(String taskId, int function, int coordinate, + public native int readAdvancedFrequencyResponseSelectedResult(String taskId, int function, int coordinate, int spectralUnit, int weighting, JniNamedDoubleResultCollector collector, String[] messageOutput); @@ -528,11 +566,15 @@ private native int readAdvancedFrequencyResponseSelectedResult(String taskId, in * @param taskId 任务标识。 * @return JNI 状态码,0 表示成功,非 0 表示失败 */ + public native int readAdvancedFrequencyResponseSelectedResults(String taskId, int[] functions, + int[] coordinates, int[] spectralUnits, int[] weightings, + JniNamedDoubleResultCollector collector, String[] messageOutput); + public int resetBkFrfTask(String taskId) { return resetAdvancedFrequencyResponseTask(taskId); } - private native int resetAdvancedFrequencyResponseTask(String taskId); + public native int resetAdvancedFrequencyResponseTask(String taskId); /** * JNI 接口:{@code disposeBkFrfTask}。 @@ -545,7 +587,7 @@ public int disposeBkFrfTask(String taskId) { return disposeAdvancedFrequencyResponseTask(taskId); } - private native int disposeAdvancedFrequencyResponseTask(String taskId); + public native int disposeAdvancedFrequencyResponseTask(String taskId); /** * JNI 接口:{@code createBkCpbTask}。 @@ -581,7 +623,7 @@ public int createBkCpbTask(String taskId, double sampleRateHz, return createPrecisionOctaveTask(taskId, sampleRateHz, bandwidth, lowerCenterFrequencyHz, upperCenterFrequencyHz, referenceValue, frameLen, frameDurationSeconds, filterCascadeCount, averageMode, averageCount, linearAveragingTimeSeconds, exponentialAveragingTimeSeconds, tauSeconds, acousticWeighting, overallBands, cursorLowerFrequencyHz, cursorUpperFrequencyHz); } - private native int createPrecisionOctaveTask(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, @@ -602,23 +644,23 @@ public long createBkCpbSharedGroup(String[] responseTaskIds) { return createPrecisionOctaveSharedGroup(responseTaskIds); } - private native long createPrecisionOctaveSharedGroup(String[] responseTaskIds); + public native long createPrecisionOctaveSharedGroup(String[] responseTaskIds); public int processBkCpbSharedGroup(long handle, double[][] alignedInputs) { return processPrecisionOctaveSharedGroup(handle, alignedInputs); } - private native int processPrecisionOctaveSharedGroup(long handle, double[][] alignedInputs); + public native int processPrecisionOctaveSharedGroup(long handle, double[][] alignedInputs); public void disposeBkCpbSharedGroup(long handle) { disposePrecisionOctaveSharedGroup(handle); } - private native void disposePrecisionOctaveSharedGroup(long handle); + public native void disposePrecisionOctaveSharedGroup(long handle); public int pushBkCpbTask(String taskId, double[] samples, int sampleCount) { return pushPrecisionOctaveTask(taskId, samples, sampleCount); } - private native int pushPrecisionOctaveTask(String taskId, double[] samples, int sampleCount); + public native int pushPrecisionOctaveTask(String taskId, double[] samples, int sampleCount); /** * 创建单通道、五种分辨率共享输入的普通 BK CPB 任务。 @@ -641,7 +683,7 @@ public int createBkCpbMultiTask(String taskId, double sampleRateHz, return createPrecisionOctaveMultiTask(taskId, sampleRateHz, lowerCenterFrequencyHz, upperCenterFrequencyHz, referenceValue, frameLen, frameDurationSeconds, filterCascadeCount, averageMode, averageCount, linearAveragingTimeSeconds, exponentialAveragingTimeSeconds, tauSeconds, acousticWeighting, overallBands, cursorLowerFrequencyHz, cursorUpperFrequencyHz); } - private native int createPrecisionOctaveMultiTask(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, @@ -664,7 +706,7 @@ public int readBkCpbMultiTask(String taskId, JniNamedDoubleResultCollector colle return readPrecisionOctaveMultiTask(taskId, collector, messageCollector); } - private native int readPrecisionOctaveMultiTask(String taskId, JniNamedDoubleResultCollector collector, + public native int readPrecisionOctaveMultiTask(String taskId, JniNamedDoubleResultCollector collector, Map messageCollector); /** @@ -690,7 +732,7 @@ public int readBkCpbTask(String taskId, JniNamedDoubleResultCollector collector, return readPrecisionOctaveTask(taskId, collector, messageCollector); } - private native int readPrecisionOctaveTask(String taskId, JniNamedDoubleResultCollector collector, + public native int readPrecisionOctaveTask(String taskId, JniNamedDoubleResultCollector collector, Map messageCollector); /** @@ -712,7 +754,7 @@ public int readBkCpbSelectedResult(String taskId, int function, int coordinate, return readPrecisionOctaveSelectedResult(taskId, function, coordinate, spectralUnit, collector, messageOutput); } - private native int readPrecisionOctaveSelectedResult(String taskId, int function, int coordinate, + public native int readPrecisionOctaveSelectedResult(String taskId, int function, int coordinate, int spectralUnit, JniNamedDoubleResultCollector collector, String[] messageOutput); /** @@ -726,7 +768,7 @@ public int resetBkCpbTask(String taskId) { return resetPrecisionOctaveTask(taskId); } - private native int resetPrecisionOctaveTask(String taskId); + public native int resetPrecisionOctaveTask(String taskId); /** * JNI 接口:{@code disposeBkCpbTask}。 @@ -739,7 +781,7 @@ public int disposeBkCpbTask(String taskId) { return disposePrecisionOctaveTask(taskId); } - private native int disposePrecisionOctaveTask(String taskId); + public native int disposePrecisionOctaveTask(String taskId); public int createBkCpbFrfTask(String taskId, double sampleRateHz, int bandwidth, double lowerCenterFrequencyHz, double upperCenterFrequencyHz, @@ -752,7 +794,7 @@ public int createBkCpbFrfTask(String taskId, double sampleRateHz, return createPrecisionOctaveFrequencyResponseTask(taskId, sampleRateHz, bandwidth, lowerCenterFrequencyHz, upperCenterFrequencyHz, referenceValue, frameLen, frameDurationSeconds, filterCascadeCount, averageMode, averageCount, linearAveragingTimeSeconds, exponentialAveragingTimeSeconds, tauSeconds, acousticWeighting, overallBands, cursorLowerFrequencyHz, cursorUpperFrequencyHz, estimator, unwrapPhase); } - private native int createPrecisionOctaveFrequencyResponseTask(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, @@ -766,7 +808,7 @@ public int pushBkCpbFrfTask(String taskId, double[] reference, return pushPrecisionOctaveFrequencyResponseTask(taskId, reference, response, sampleCount); } - private native int pushPrecisionOctaveFrequencyResponseTask(String taskId, double[] reference, + public native int pushPrecisionOctaveFrequencyResponseTask(String taskId, double[] reference, double[] response, int sampleCount); /** @@ -793,7 +835,7 @@ public int readBkCpbFrfTask(String taskId, JniNamedDoubleResultCollector collect return readPrecisionOctaveFrequencyResponseTask(taskId, collector, messageCollector); } - private native int readPrecisionOctaveFrequencyResponseTask(String taskId, JniNamedDoubleResultCollector collector, + public native int readPrecisionOctaveFrequencyResponseTask(String taskId, JniNamedDoubleResultCollector collector, Map messageCollector); /** @@ -815,20 +857,24 @@ public int readBkCpbFrfSelectedResult(String taskId, int function, int coordinat return readPrecisionOctaveFrequencyResponseSelectedResult(taskId, function, coordinate, spectralUnit, collector, messageOutput); } - private native int readPrecisionOctaveFrequencyResponseSelectedResult(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 readPrecisionOctaveFrequencyResponseSelectedResults(String taskId, int[] functions, + int[] coordinates, int[] spectralUnits, int[] weightings, + JniNamedDoubleResultCollector collector, String[] messageOutput); + public int resetBkCpbFrfTask(String taskId) { return resetPrecisionOctaveFrequencyResponseTask(taskId); } - private native int resetPrecisionOctaveFrequencyResponseTask(String taskId); + public native int resetPrecisionOctaveFrequencyResponseTask(String taskId); public int disposeBkCpbFrfTask(String taskId) { return disposePrecisionOctaveFrequencyResponseTask(taskId); } - private native int disposePrecisionOctaveFrequencyResponseTask(String taskId); + public native int disposePrecisionOctaveFrequencyResponseTask(String taskId); /** * JNI 接口:{@code createBkTriggerTask}。 @@ -857,7 +903,7 @@ public int createBkTriggerTask( return createSignalTriggerTask(taskId, referenceLevel, levelPercent, hysteresisPercent, positive, divider, delaySamples, holdOffSamples); } - private native int createSignalTriggerTask( + public native int createSignalTriggerTask( String taskId, double referenceLevel, double levelPercent, @@ -882,7 +928,7 @@ public String searchBkTriggerTask(String taskId, double[] samples, return searchSignalTriggerTask(taskId, samples, forceTrigger); } - private native String searchSignalTriggerTask(String taskId, double[] samples, + public native String searchSignalTriggerTask(String taskId, double[] samples, boolean forceTrigger); /** @@ -896,7 +942,7 @@ public int resetBkTriggerTask(String taskId) { return resetSignalTriggerTask(taskId); } - private native int resetSignalTriggerTask(String taskId); + public native int resetSignalTriggerTask(String taskId); /** * JNI 接口:{@code disposeBkTriggerTask}。 @@ -909,7 +955,7 @@ public int disposeBkTriggerTask(String taskId) { return disposeSignalTriggerTask(taskId); } - private native int disposeSignalTriggerTask(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 19ed688b..472e72f8 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 @@ -7,8 +7,11 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.util.Arrays; import java.util.Map; +import java.util.Set; import java.util.stream.Stream; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -26,10 +29,47 @@ void compatibilityMethodsMatchNeutralJniSignatures(String name, String nativeNam assertFalse(Modifier.isNative(method.getModifiers())); Method nativeMethod = AlgorithmLibJNIBridge.class.getDeclaredMethod(nativeName, parameterTypes); assertEquals(returnType, nativeMethod.getReturnType()); - assertTrue(Modifier.isPrivate(nativeMethod.getModifiers())); + assertTrue(Modifier.isPublic(nativeMethod.getModifiers())); assertTrue(Modifier.isNative(nativeMethod.getModifiers())); } + @Test + void allDocumentedNeutralAnalysisNamesExistWithoutRemovedNativeAliases() { + 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()) + .filter(method -> method.getName().matches(".*Bk(Fft|Frf|Cpb|Trigger).*")) + .allMatch(method -> !Modifier.isNative(method.getModifiers()))); + } + private static Stream bindings() { return Stream.of( Arguments.of("createBkFftTask", "createAdvancedFftTask", int.class, new Class[] {String.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}), 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-service/src/main/java/com/opentest/service/grpc/core/overall/BandOverallCalculator.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/core/overall/BandOverallCalculator.java index 12ff1b55..58961448 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/core/overall/BandOverallCalculator.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/core/overall/BandOverallCalculator.java @@ -64,7 +64,7 @@ public double calculateRms(SampleSource source, double sampleRateHz, sampleRateHz, lowerFrequencyHz, upperFrequencyHz); String taskId = "band-overall-" + UUID.randomUUID(); int nativeFrameLength = (int) sampleCount; - JNIUtils.checkJniReturn(bridge.createBkCpbTask( + JNIUtils.checkJniReturn(bridge.createPrecisionOctaveTask( taskId, sampleRateHz, BAND_FRACTION, lowerFrequencyHz, effectiveUpperFrequencyHz, 1D, nativeFrameLength, sampleCount / sampleRateHz, @@ -81,7 +81,7 @@ public double calculateRms(SampleSource source, double sampleRateHz, "band overall sample source produced too many samples"); } JNIUtils.checkJniReturn( - bridge.pushBkCpbTask(taskId, samples, samples.length), + bridge.pushPrecisionOctaveTask(taskId, samples, samples.length), "push band overall waveform"); pushedSampleCount[0] = nextSampleCount; }); @@ -97,7 +97,7 @@ public double calculateRms(SampleSource source, double sampleRateHz, return Math.sqrt(power); } finally { batchAdapter.clearTaskDiagnostics(taskId); - JNIUtils.checkJniReturn(bridge.disposeBkCpbTask(taskId), + JNIUtils.checkJniReturn(bridge.disposePrecisionOctaveTask(taskId), "dispose band overall task"); } } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/AlgorithmBusinessService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/AlgorithmBusinessService.java index e02632cc..0808427c 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/AlgorithmBusinessService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/AlgorithmBusinessService.java @@ -1985,7 +1985,7 @@ private int bkFftCreateTask(String taskId, FftConfigDto fftConfig, int sampleRat try { int ret; if (spectrogram) { - ret = algorithmLibJNIBridge.createBkFftSpectrogramTask( + ret = algorithmLibJNIBridge.createAdvancedFftSpectrogramTask( taskId, sampleRate, fftConfig.getBkAnalysisMode(), fftConfig.resolveBkSpan(sampleRate), fftConfig.resolveBkLines(sampleRate), fftConfig.resolveBkCenterFrequency(sampleRate), resolveBkWindowType(fftWindowType), @@ -1995,7 +1995,7 @@ private int bkFftCreateTask(String taskId, FftConfigDto fftConfig, int sampleRat ObjectUtil.defaultIfNull(fftConfig.getOverlap(), 0D), 0, 1, 0D, 0D, 1, 3, 0, fftConfig.resolveBkOverloadAction()); } else { - ret = algorithmLibJNIBridge.createBkFftTask( + ret = algorithmLibJNIBridge.createAdvancedFftTask( taskId, sampleRate, fftConfig.getBkAnalysisMode(), fftConfig.resolveBkSpan(sampleRate), fftConfig.resolveBkLines(sampleRate), fftConfig.resolveBkCenterFrequency(sampleRate), resolveBkWindowType(fftWindowType), @@ -2102,7 +2102,7 @@ public int bkFrfCreateTask(String taskId, FftConfigDto fftConfig, int sampleRate ? BkFftSelectedResultTaskPlan.compatibilityDefaults() : resultPlan; try { int frameLength = resolveBkFftFrameLength(fftConfig, sampleRate); - int ret = algorithmLibJNIBridge.createBkFrfTask( + int ret = algorithmLibJNIBridge.createAdvancedFrequencyResponseTask( taskId, sampleRate, fftConfig.getBkAnalysisMode(), @@ -2167,7 +2167,7 @@ public int bkCpbCreateTask(String taskId, OctaveBandConfigDto octaveConfig, int double exponentialAveragingTime = resolveBkCpbExponentialAveragingTime(octaveConfig); double upperCenterFrequency = resolveBkCpbUpperCenterFrequency(octaveConfig, sampleRate, octaveType); double lowerCenterFrequency = resolveBkCpbLowerCenterFrequency(octaveConfig, upperCenterFrequency); - int ret = algorithmLibJNIBridge.createBkCpbTask( + int ret = algorithmLibJNIBridge.createPrecisionOctaveTask( taskId, sampleRate, resolveBkCpbBandwidth(octaveType), @@ -2237,7 +2237,7 @@ public int bkCpbFrfCreateTask(String taskId, OctaveBandConfigDto config, double upperCenterFrequency = resolveBkCpbUpperCenterFrequency(config, sampleRate, octaveType); double lowerCenterFrequency = resolveBkCpbLowerCenterFrequency(config, upperCenterFrequency); int unwrapPhase = StrUtil.equalsIgnoreCase("UNWRAPPED", config.getCrossSpectrumMode()) ? 1 : 0; - return algorithmLibJNIBridge.createBkCpbFrfTask( + return algorithmLibJNIBridge.createPrecisionOctaveFrequencyResponseTask( taskId, sampleRate, resolveBkCpbBandwidth(octaveType), lowerCenterFrequency, upperCenterFrequency, 1.0D, 0, resolveBkCpbFrameDurationSeconds(config), 2, diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapter.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapter.java index 115c28da..e2ea35bf 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapter.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapter.java @@ -17,7 +17,7 @@ public final class BkCpbBatchResultAdapter { public Snapshot read(AlgorithmLibJNIBridge bridge, String taskId) { Map messages = new LinkedHashMap<>(); Map batch = BkBatchResultParser.read("read BK CPB batch", - collector -> bridge.readBkCpbTask(taskId, collector, messages)); + collector -> bridge.readPrecisionOctaveTask(taskId, collector, messages)); return new Snapshot(taskId, batch, messages); } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbSelectedResultAdapter.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbSelectedResultAdapter.java index 96af8413..6e18e145 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbSelectedResultAdapter.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/BkCpbSelectedResultAdapter.java @@ -50,7 +50,7 @@ public BkCpbSelectedResultFrame readFrame( Map messages = new LinkedHashMap<>(); Map batch = BkBatchResultParser.read("read BK CPB FRF batch", - collector -> bridge.readBkCpbFrfTask(taskId, collector, messages)); + collector -> bridge.readPrecisionOctaveFrequencyResponseTask(taskId, collector, messages)); Map frameResults = new LinkedHashMap<>(); for (BkCpbSelectedResultTaskPlan.Entry entry : plan.getEntries()) { BkCpbSelectedResult selectedResult = readNative( diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/HostBkCpbBatchResultAdapter.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/HostBkCpbBatchResultAdapter.java index 75106143..00982735 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/HostBkCpbBatchResultAdapter.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkcpb/HostBkCpbBatchResultAdapter.java @@ -19,7 +19,7 @@ public final class HostBkCpbBatchResultAdapter { public Snapshot read(AlgorithmLibJNIBridge bridge, String taskId) { Map messages = new LinkedHashMap<>(); Map batch = BkBatchResultParser.read("read BK CPB batch", - collector -> bridge.readBkCpbTask(taskId, collector, messages)); + collector -> bridge.readPrecisionOctaveTask(taskId, collector, messages)); return new Snapshot(taskId, batch, messages); } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkfft/BkFftSelectedResultAdapter.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkfft/BkFftSelectedResultAdapter.java index c38dbd77..b2fa8f23 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkfft/BkFftSelectedResultAdapter.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/jni/bkfft/BkFftSelectedResultAdapter.java @@ -68,8 +68,8 @@ public BkFftSelectedResultFrame readFrame( Map messages = new LinkedHashMap<>(); Map batch = BkBatchResultParser.read("read BK " + taskType + " batch", collector -> taskType == BkFftSelectedResultTaskType.FFT - ? bridge.readBkFftTask(taskId.trim(), BkFftSelectedResultCatalog.resolveWeighting(weighting), collector, messages) - : bridge.readBkFrfTask(taskId.trim(), BkFftSelectedResultCatalog.resolveWeighting(weighting), collector, messages)); + ? bridge.readAdvancedFftTask(taskId.trim(), BkFftSelectedResultCatalog.resolveWeighting(weighting), collector, messages) + : bridge.readAdvancedFrequencyResponseTask(taskId.trim(), BkFftSelectedResultCatalog.resolveWeighting(weighting), collector, messages)); Map readCache = new LinkedHashMap<>(); Set unavailableSelections = new HashSet<>(); Set resultKeys = new HashSet<>(); diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapterTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapterTest.java index 7d8c8abb..6ad2f661 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapterTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/jni/bkcpb/BkCpbBatchResultAdapterTest.java @@ -48,7 +48,7 @@ private static class Bridge extends AlgorithmLibJNIBridge { boolean empty; @Override - public int readBkCpbTask(String taskId, JniNamedDoubleResultCollector collector, + public int readPrecisionOctaveTask(String taskId, JniNamedDoubleResultCollector collector, Map messages) { reads++; Map batch = new LinkedHashMap<>(); diff --git a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingAlgorithmService.java b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingAlgorithmService.java index f5662d21..5118350c 100644 --- a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingAlgorithmService.java +++ b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingAlgorithmService.java @@ -1,25 +1,33 @@ package com.opentest.algorithm.api; -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; -/** Host-provided, synchronous fixed-sampling order analysis from a supplied RPM record. */ +/** + * Host-provided synchronous fixed-sampling and angle-resampled order analysis. + * + *

Implementations forward the typed JNI contract. They do not add numerical processing, + * persistence, or policy around application error codes.

+ */ public interface OrderTrackingAlgorithmService { - /** - * Analyzes a complete vibration record using the supplied speed record and native settings. - * RPM and vibration may have different sampling rates and start times on a common clock. - * This is a blocking whole-record operation, so callers should schedule it off UI/event threads. - * The host must have initialized its matching native runtime before calling this service. - * No DLL loading, speed estimation, unit conversion, persistence or validity policy is added here. - * - * @param config complete native configuration; do not mutate any reachable object during the call - * @param input complete vibration/RPM records; samples are copied and never modified by JNI - * @return Java-owned native result; check {@code success} and inspect {@code errors} and warnings - * @throws IllegalArgumentException if required objects/arrays are null or an enum code is invalid - * @throws IllegalStateException if a native exception escapes the algorithm - * @throws OutOfMemoryError if binding allocation fails - * @throws UnsatisfiedLinkError if the host has not loaded a matching JNI library - */ - Result analyzeFromRpmFixed(Config config, Input input); + /** Runs fixed-sampling analysis from vibration and RPM records. */ + Results analyzeFs(VibrationSignal vibration, RpmReference rpm, FsSettings settings); + + /** Prepares the angle reference consumed by angle-resampled analysis. */ + AnglePreparationResult prepareAngleReference(RpmReference rpm); + + /** Runs angle-resampled analysis from a prepared reference. */ + Results analyzeOt(VibrationSignal vibration, AngleReference reference, OtSettings settings); + + /** Selects an existing FS frame by the requested axis and target value. */ + SpectrumSelection selectFsSpectrum(Results results, int axis, double target); + + /** Selects an existing OT frame by the requested axis and target value. */ + SpectrumSelection selectOtSpectrum(Results results, int axis, double target); } diff --git a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingModels.java b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingModels.java index 801aa315..9e445e78 100644 --- a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingModels.java +++ b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/OrderTrackingModels.java @@ -1,594 +1,228 @@ package com.opentest.algorithm.api; /** - * Typed mirrors of the delivered cry_order fixed-sampling SDK. No resampling, unit conversion or business policy is applied. - * All arrays and required nested input objects must be non-null; use empty arrays for optional selections. - * Do not mutate any reachable input object during a call. Returned objects and arrays are owned by Java and require no disposal. - * Result containers default to empty; IEEE NaN and infinities are preserved rather than replaced with zero. - * Integer constants match the native enums. An out-of-range enum is a binding error; a valid but unsupported mode is a native failure. + * Typed Java contract for the delivered fixed-sampling and order-tracking JNI SDK. + * + *

Inputs use Java-owned arrays and required nested objects. Native code copies input data for + * the duration of each call, and returned arrays are Java-owned. Empty arrays represent absent + * optional data. Error fields use application error codes; native status names and diagnostics + * remain in the native logcode mapping.

+ * + *

{@link Results#values} follows {@link Results#frames} and {@link Results#axis}. FS keeps + * frequency axes, while OT also exposes order and angle data. Spectrum selectors return the + * selected frame index and coordinates without recomputing or interpolating results.

*/ public final class OrderTrackingModels { private OrderTrackingModels() {} - - /** Native WindowType codes, in SDK declaration order. */ - public static final class WindowType { - private WindowType() {} - /** Native WindowType::Hann (0). */ - public static final int HANN = 0; - /** Native WindowType::Hamming (1). */ - public static final int HAMMING = 1; - /** Native WindowType::FlatTop (2). */ - public static final int FLAT_TOP = 2; - /** Native WindowType::Rectangular (3). */ - public static final int RECTANGULAR = 3; - /** Native WindowType::Exponential (4). */ - public static final int EXPONENTIAL = 4; - /** Native WindowType::Force (5). */ - public static final int FORCE = 5; - /** Native WindowType::ForceExponential (6). */ - public static final int FORCE_EXPONENTIAL = 6; - /** Native WindowType::BlackmanHarris (7). */ - public static final int BLACKMAN_HARRIS = 7; - /** Native WindowType::KaiserBessel (8). */ - public static final int KAISER_BESSEL = 8; - /** Native WindowType::Tukey (9). */ - public static final int TUKEY = 9; - } - - /** Native SpectrumUnit codes, in SDK declaration order. */ - public static final class SpectrumUnit { - private SpectrumUnit() {} - /** Native SpectrumUnit::Amplitude (0). */ - public static final int AMPLITUDE = 0; - /** Native SpectrumUnit::RMS (1). */ - public static final int RMS = 1; - /** Native SpectrumUnit::dB (2). */ - public static final int D_B = 2; - } - - /** Native FixedSpectrumOutputFormat codes, in SDK declaration order. */ - public static final class FixedSpectrumOutputFormat { - private FixedSpectrumOutputFormat() {} - /** Native FixedSpectrumOutputFormat::FollowCommonSpectrumUnit (0). */ - public static final int FOLLOW_COMMON_SPECTRUM_UNIT = 0; - /** Native FixedSpectrumOutputFormat::Peak (1). */ - public static final int PEAK = 1; - /** Native FixedSpectrumOutputFormat::RMS (2). */ - public static final int RMS = 2; - /** Native FixedSpectrumOutputFormat::Power (3). */ - public static final int POWER = 3; - /** Native FixedSpectrumOutputFormat::AutoPower (4). */ - public static final int AUTO_POWER = 4; - /** Native FixedSpectrumOutputFormat::PSD (5). */ - public static final int PSD = 5; - /** Native FixedSpectrumOutputFormat::dB (6). */ - public static final int D_B = 6; - } - - /** Native FrequencyWeighting codes, in SDK declaration order. */ - public static final class FrequencyWeighting { - private FrequencyWeighting() {} - /** Native FrequencyWeighting::NoChange (0). */ - public static final int NO_CHANGE = 0; - /** Native FrequencyWeighting::AWeighting (1). */ - public static final int AWEIGHTING = 1; - /** Native FrequencyWeighting::CWeighting (2). */ - public static final int CWEIGHTING = 2; - } - - /** Native FixedSamplingCompatibilityMode codes, in SDK declaration order. */ - public static final class FixedSamplingCompatibilityMode { - private FixedSamplingCompatibilityMode() {} - /** Native FixedSamplingCompatibilityMode::Native (0). */ - public static final int NATIVE = 0; - /** Native FixedSamplingCompatibilityMode::TestLabFixed (1). */ - public static final int TEST_LAB_FIXED = 1; - } - - /** Native FixedFrameCenterSource codes, in SDK declaration order. */ - public static final class FixedFrameCenterSource { - private FixedFrameCenterSource() {} - /** Native FixedFrameCenterSource::RpmCrossing (0). */ - public static final int RPM_CROSSING = 0; - /** Native FixedFrameCenterSource::ExplicitTrackingTime (1). */ - public static final int EXPLICIT_TRACKING_TIME = 1; - } - - /** Native FixedTestLabFrameAnchorPolicy codes, in SDK declaration order. */ - public static final class FixedTestLabFrameAnchorPolicy { - private FixedTestLabFrameAnchorPolicy() {} - /** Native FixedTestLabFrameAnchorPolicy::Current (0). */ - public static final int CURRENT = 0; - /** Native FixedTestLabFrameAnchorPolicy::TargetFirstCrossing (1). */ - public static final int TARGET_FIRST_CROSSING = 1; - } - - /** Native FixedWindowCorrectionMode codes, in SDK declaration order. */ - public static final class FixedWindowCorrectionMode { - private FixedWindowCorrectionMode() {} - /** Native FixedWindowCorrectionMode::Amplitude (0). */ - public static final int AMPLITUDE = 0; - /** Native FixedWindowCorrectionMode::Energy (1). */ - public static final int ENERGY = 1; - /** Native FixedWindowCorrectionMode::None (2). */ - public static final int NONE = 2; - } - - /** Native FixedWindowEndpointPolicy codes, in SDK declaration order. */ - public static final class FixedWindowEndpointPolicy { - private FixedWindowEndpointPolicy() {} - /** Native FixedWindowEndpointPolicy::Symmetric (0). */ - public static final int SYMMETRIC = 0; - /** Native FixedWindowEndpointPolicy::Periodic (1). */ - public static final int PERIODIC = 1; - } - - /** Native FixedOrderSectionMethod codes, in SDK declaration order. */ - public static final class FixedOrderSectionMethod { - private FixedOrderSectionMethod() {} - /** Native FixedOrderSectionMethod::BandPeakFromColormap (0). */ - public static final int BAND_PEAK_FROM_COLORMAP = 0; - /** Native FixedOrderSectionMethod::BandRmsFromColormap (1). */ - public static final int BAND_RMS_FROM_COLORMAP = 1; - /** Native FixedOrderSectionMethod::DerivedOrderInterpolation (2). */ - public static final int DERIVED_ORDER_INTERPOLATION = 2; - /** Native FixedOrderSectionMethod::TestLabBandRmsFromColormap (3). */ - public static final int TEST_LAB_BAND_RMS_FROM_COLORMAP = 3; - } - - /** Native FixedSectionCoordinateMode codes, in SDK declaration order. */ - public static final class FixedSectionCoordinateMode { - private FixedSectionCoordinateMode() {} - /** Native FixedSectionCoordinateMode::NativeAxis (0). */ - public static final int NATIVE_AXIS = 0; - /** Native FixedSectionCoordinateMode::TestLabDiscreteColumn (1). */ - public static final int TEST_LAB_DISCRETE_COLUMN = 1; - } - - /** Native ProcessingBranch codes, in SDK declaration order. */ - public static final class ProcessingBranch { - private ProcessingBranch() {} - /** Native ProcessingBranch::Shared (0). */ - public static final int SHARED = 0; - /** Native ProcessingBranch::FixedSampling (1). */ - public static final int FIXED_SAMPLING = 1; - /** Native ProcessingBranch::Derived (2). */ - public static final int DERIVED = 2; - } - - /** Native BranchSelect codes, in SDK declaration order. */ - public static final class BranchSelect { - private BranchSelect() {} - /** Native BranchSelect::FixedOnly (0). */ - public static final int FIXED_ONLY = 0; - } - - /** Native OtCurveType codes, in SDK declaration order. */ - public static final class OtCurveType { - private OtCurveType() {} - /** Native OtCurveType::RpmCurve (0). */ - public static final int RPM_CURVE = 0; - /** Native OtCurveType::FixedSpectrumFrame (1). */ - public static final int FIXED_SPECTRUM_FRAME = 1; - /** Native OtCurveType::FrequencySection (2). */ - public static final int FREQUENCY_SECTION = 2; - /** Native OtCurveType::OrderSectionFixed (3). */ - public static final int ORDER_SECTION_FIXED = 3; - /** Native OtCurveType::DerivedOrderSpectrum (4). */ - public static final int DERIVED_ORDER_SPECTRUM = 4; - /** Native OtCurveType::FrameRpmTrack (5). */ - public static final int FRAME_RPM_TRACK = 5; - /** Native OtCurveType::OverallRmsVsRpm (6). */ - public static final int OVERALL_RMS_VS_RPM = 6; + public static final class Unit { + public static final int G = 0; + } + public static final class AxisKind { + public static final int FrequencyHz = 0; + public static final int Order = 1; + } + public static final class Window { + public static final int Hann = 0; + public static final int Hamming = 1; + public static final int Rectangular = 2; + } + public static final class SpectrumSelectionAxis { + public static final int Time = 0; + public static final int RepresentativeRpm = 1; + public static final int TrackingRpm = 2; + } + public static final class Schedule { + public static final int Free = 0; + public static final int Time = 1; + public static final int Rpm = 2; + } + public static final class Direction { + public static final int Up = 0; + public static final int Down = 1; + } + public static final class Format { + public static final int Rms = 0; + public static final int Peak = 1; + public static final int PeakPeak = 2; + } + public static final class Function { + public static final int AutoPowerLinear = 0; + public static final int Spectrum = 1; + public static final int Psd = 2; + public static final int Power = 3; + public static final int Order = 4; + public static final int Angle = 5; + } + public static final class Weighting { + public static final int NoChange = 0; + public static final int Linear = 1; + public static final int A = 2; + public static final int B = 3; + public static final int C = 4; + public static final int D = 5; + public static final int AB = 6; + public static final int BC = 7; + } + public static final class BandAxis { + public static final int Full = 0; + public static final int FrequencyHz = 1; + public static final int Order = 2; } - - /** Native FrameMode codes, in SDK declaration order. */ - public static final class FrameMode { - private FrameMode() {} - /** Native FrameMode::ByTime (0). */ - public static final int BY_TIME = 0; - /** Native FrameMode::ByRevolution (1). */ - public static final int BY_REVOLUTION = 1; - /** Native FrameMode::ByRpmStep (2). */ - public static final int BY_RPM_STEP = 2; - } - - /** Native AnalysisMode codes, in SDK declaration order. */ - public static final class AnalysisMode { - private AnalysisMode() {} - /** Native AnalysisMode::StandardOrder (0). */ - public static final int STANDARD_ORDER = 0; - } - - /** Native DataSourceMode codes, in SDK declaration order. */ - public static final class DataSourceMode { - private DataSourceMode() {} - /** Native DataSourceMode::FromRpm (0). */ - public static final int FROM_RPM = 0; - } - - /** Uniformly sampled vibration record. Values retain the caller's physical unit; no unit conversion is performed. */ public static final class VibrationSignal { - /** Sample values in the caller's vibration unit; default empty. */ - public double[] data = new double[0]; - /** Vibration sampling frequency in Hz; default 0, set a finite positive value. */ - public double fsHz = 0.0; - } - - /** A native one-dimensional curve. axis and values are paired; actual/nominal axes are preserved separately when supplied. */ - public static final class Curve { - /** OtCurveType constant identifying the native curve kind. */ - public int type = OtCurveType.RPM_CURVE; - /** Native label; empty if no label was supplied. */ - public String label = ""; - /** Curve display coordinates, paired with values; units are xunit. */ + public double[] samples = new double[0]; + public double sampleRateHz = 25600; + public double startTimeS; + public double[] timeS = null; + public SignalMetadata metadata = new SignalMetadata(); + } + public static final class RpmReference { + public double[] samples = new double[0]; + public double sampleRateHz = 25600; + public double startTimeS; + public double[] timeS = null; + public ReferenceMetadata metadata = new ReferenceMetadata(); + } + public static final class SignalMetadata { + public int unit; + public String timebaseId = ""; + } + public static final class ReferenceMetadata { + public String timebaseId = ""; + } + public static final class Section { + public String id = ""; + public int axis = 1; + public double center = 1000; + public double width = 100; + } + public static final class Overall { + public boolean enabled = true; + public int axis; + public double lower; + public double upper; + } + public static final class FsSettings { + public int schedule; + public int direction; + public double timeStartS; + public double timeLengthS; + public double overlapPercent = 50; + public double timeIncrementS = 0.125; + public double rpmMin = 1500; + public double rpmMax = 3000; + public double rpmStep = 25; + public double frequencyResolutionHz = 4; + public int window; + public int format; + public int function; + public int weighting; + public Section[] sections = new Section[0]; + public Overall overall = new Overall(); + } + public static final class OtSettings { + public int schedule; + public int direction; + public double timeStartS; + public double timeLengthS; + public double overlapPercent = 50; + public double timeIncrementS = 0.125; + public double rpmMin = 1500; + public double rpmMax = 3000; + public double rpmStep = 25; + public double frequencyResolutionHz = 4; + public int window; + public int format; + public int function = 4; + public int weighting; + public Section[] sections = new Section[0]; + public Overall overall = new Overall(); + } + public static final class EffectiveSettings { + public int schedule; + public int direction; + public double timeStartS; + public double timeLengthS; + public double overlapPercent; + public double timeIncrementS; + public double rpmMin; + public double rpmMax; + public double rpmStep; + public double frequencyResolutionHz; + public int window; + public int format; + public int function; + public int weighting; + public Section[] sections = new Section[0]; + public Overall overall = new Overall(); + } + public static final class Frame { + public long candidateIndex; + public long startSample; + public long highPpr; + public double timeS; + public double centerTimeS; + public double rpm; + public double targetRpm = -1; + public double paddedStartS; + public double paddedEndS; + } + public static final class BandValue { + public boolean valid; + public double rmsG; + } + public static final class BandResult { + public String id = ""; + public int axis; + public double lower; + public double upper; + public BandValue[] values = new BandValue[0]; + } + public static final class Rejected { + public long candidateIndex; + public double timeS; + } + public static final class Results { + public int errorCode = 13200217; + public EffectiveSettings effective = new EffectiveSettings(); + public int axisKind; + public double sampleRateHz = 25600; + public double frequencyResolutionHz; + public double maxOrder = 64; + public double orderResolution = 0.25; + public long fftSamples; + public long candidateCount; + public String valueUnit = "g"; public double[] axis = new double[0]; - /** Actual X coordinates when supplied; empty means absent. */ - public double[] xAxisActual = new double[0]; - /** Nominal X coordinates when supplied; empty means absent. */ - public double[] xAxisNominal = new double[0]; - /** Native curve values paired with axis; units are yunit. Nonfinite values are retained. */ - public double[] values = new double[0]; - /** Native X-axis unit label; do not infer it from the curve or map index. */ - public String xunit = ""; - /** Native Y-axis unit label. */ - public String yunit = ""; - /** Native curve selection index; -1 means unspecified. */ - public int index = -1; - /** Native channel index; -1 means unspecified. */ - public int channelIndex = -1; - /** Native channel name; empty means unspecified. */ - public String channelName = ""; - /** ProcessingBranch constant identifying the origin of this output. */ - public int branch = ProcessingBranch.FIXED_SAMPLING; - } - - /** Fixed-sampling analysis settings. Defaults match the delivered C++ SDK. ByRevolution is reserved and returns algorithm failure. */ - public static final class FixedSamplingOptions { - /** Frame placement mode (FrameMode constants); default BY_TIME. BY_REVOLUTION is reserved and unsupported. */ - public int frameMode = FrameMode.BY_TIME; - /** Frame duration in seconds; default 1.0, must be finite and positive. */ - public double frameSizeS = 1.0; - /** Time increment between frames in seconds; default 0.5, must be finite and positive. */ - public double incrementS = 0.5; - /** RPM-step lower/starting target in revolutions per minute; default 0 (native range selection). */ - public double rpmStart = 0.0; - /** RPM-step upper/ending target in revolutions per minute; default 0 (native range selection). */ - public double rpmEnd = 0.0; - /** RPM-step spacing in revolutions per minute; default 25. */ - public double rpmStep = 25.0; - /** Explicit speed targets in revolutions per minute; default empty (native target generation). */ - public double[] rpmTargets = new double[0]; - /** Explicit target tracking times in seconds on the native aligned vibration timeline; default empty. When supplied with rpmTargets, lengths must match. */ - public double[] rpmTargetTimesS = new double[0]; - /** Actual RPM values for explicit targets; default empty. When supplied with rpmTargets, lengths must match. */ - public double[] rpmActualTargets = new double[0]; - /** Display/nominal RPM values for explicit targets; default empty. When supplied with rpmTargets, lengths must match. */ - public double[] rpmDisplayTargets = new double[0]; - /** Reserved revolutions-per-frame setting; default 8. Does not enable the unsupported BY_REVOLUTION mode. */ - public int revPerFrame = 8; - /** FFT length in samples; default 0 selects the native automatic length. */ - public int nfft = 0; - /** WindowType constant; default HANN (0). */ - public int window = WindowType.HANN; - /** First window-specific parameter; default 0. Percent-based window parameters use percent, not a 0..1 fraction. */ - public double windowParam = 0.0; - /** Second window-specific parameter; default 0. Force/exponential window stop uses percent. */ - public double windowParam2 = 0.0; - /** Maximum returned spectral frequency in Hz; default 0 uses the native full range. */ - public double maxFreqHz = 0.0; - /** Number of initial frequency bins cleared by native processing; default 0. */ - public int clearFirstFrequencyBins = 0; - /** Lower frequency bound for overall RMS in Hz; default 0. */ - public double overallMinFreqHz = 0.0; - /** Upper frequency bound for overall RMS in Hz; default 0 uses the native full range. */ - public double overallMaxFreqHz = 0.0; - /** FrequencyWeighting constant; default NO_CHANGE (0). */ - public int weighting = FrequencyWeighting.NO_CHANGE; - /** FixedSpectrumOutputFormat constant; default FOLLOW_COMMON_SPECTRUM_UNIT (0). */ - public int outputFormat = FixedSpectrumOutputFormat.FOLLOW_COMMON_SPECTRUM_UNIT; - /** FixedSamplingCompatibilityMode constant; default NATIVE (0). TestLab compatibility behavior remains native-owned. */ - public int compatibilityMode = FixedSamplingCompatibilityMode.NATIVE; - /** FixedFrameCenterSource constant; default RPM_CROSSING (0); explicit times use rpmTargetTimesS. */ - public int frameCenterSource = FixedFrameCenterSource.RPM_CROSSING; - /** FixedTestLabFrameAnchorPolicy constant; default CURRENT (0), interpreted by the native compatibility mode. */ - public int testlabFrameAnchorPolicy = FixedTestLabFrameAnchorPolicy.CURRENT; - /** FixedWindowCorrectionMode constant; default AMPLITUDE (0). */ - public int windowCorrection = FixedWindowCorrectionMode.AMPLITUDE; - /** FixedWindowEndpointPolicy constant; default SYMMETRIC (0). */ - public int windowEndpointPolicy = FixedWindowEndpointPolicy.SYMMETRIC; - /** FixedOrderSectionMethod constant; default BAND_PEAK_FROM_COLORMAP (0). TEST_LAB_BAND_RMS_FROM_COLORMAP requires TEST_LAB_FIXED compatibility. */ - public int orderSectionMethod = FixedOrderSectionMethod.BAND_PEAK_FROM_COLORMAP; - /** FixedSectionCoordinateMode constant; default NATIVE_AXIS (0). */ - public int sectionCoordinateMode = FixedSectionCoordinateMode.NATIVE_AXIS; - /** Whether to derive an order view from fixed spectra; default true. */ - public boolean buildDerivedOrderView = true; - /** Maximum derived dimensionless order; default 50. */ - public int derivedMaxOrder = 50; - /** Derived dimensionless order spacing; default 0.25. */ - public double derivedOrderStep = 0.25; - /** Default section half-width in dimensionless orders; default 0.25. */ - public double orderSectionHalfWidthOrder = 0.25; - /** Per-request section half-widths in orders; default empty (use the common half-width). */ - public double[] orderSectionHalfWidthsOrder = new double[0]; - /** Whether native peak interpolation is enabled for order sections; default true. */ - public boolean orderSectionPeakInterpolation = true; - } - - /** Common spectrum, framing and section settings. Frequencies use Hz and speed targets use revolutions per minute. */ - public static final class OrderTrackOptions { - /** Common spectrum representation: SpectrumUnit constants; default AMPLITUDE. */ - public int spectrumUnit = SpectrumUnit.AMPLITUDE; - /** Fixed-sampling options; required, default native settings. */ - public FixedSamplingOptions fixed = new FixedSamplingOptions(); - /** Processing selection; only BranchSelect.FIXED_ONLY (0) is supported. */ - public int branchSelect = BranchSelect.FIXED_ONLY; - /** Requested frequency sections in Hz; default empty (no frequency sections). */ - public double[] sectionTargetFreqsHz = new double[0]; - /** Requested RPM sections in revolutions per minute; default empty. */ - public double[] sectionTargetRpms = new double[0]; - } - - /** Native RPM input/interpolation facts. FromRpm consumes provided RPM rather than estimating it from vibration. */ - public static final class RpmEstimateResult { - /** Raw RPM time coordinates in seconds. */ - public double[] rpmRawT = new double[0]; - /** Raw speed values in revolutions per minute. */ - public double[] rpmRaw = new double[0]; - /** Processed RPM time coordinates in seconds. */ - public double[] rpmT = new double[0]; - /** Native processed RPM values in revolutions per minute. */ - public double[] rpmSmooth = new double[0]; - /** Mean speed in revolutions per minute. */ - public double rpmMean = 0.0; - /** Minimum speed in revolutions per minute. */ - public double rpmMin = 0.0; - /** Maximum speed in revolutions per minute. */ - public double rpmMax = 0.0; - /** Native warning messages in order; default empty. */ - public String[] warnings = new String[0]; - } - - /** One requested order section: paired RPM coordinates and native amplitudes. */ - public static final class OrderSliceCurve { - /** Requested dimensionless order. */ - public double targetOrder = 0.0; - /** Section coordinates in revolutions per minute. */ - public double[] rpm = new double[0]; - /** Section values in the native selected spectrum representation; paired with rpm. */ - public double[] amplitude = new double[0]; - } - - /** Aligned vibration/RPM facts used by the native algorithm. Arrays are preserved without Java resampling. */ - public static final class SharedInputContext { - /** Vibration sampling frequency in Hz used by the native chain. */ - public double fsVibHz = 0.0; - /** Number of vibration samples used by the native chain. */ - public int nSamples = 0; - /** Aligned vibration time coordinates in seconds. */ - public double[] timeAxisS = new double[0]; - /** RPM input on the native aligned vibration sample grid, in revolutions per minute. */ - public double[] rpmCurveInput = new double[0]; - /** RPM values used by analysis on the vibration grid, in revolutions per minute. */ - public double[] rpmCurveUsed = new double[0]; - /** Minimum speed in revolutions per minute. */ - public double rpmMin = 0.0; - /** Maximum speed in revolutions per minute. */ - public double rpmMax = 0.0; - /** Mean speed in revolutions per minute. */ - public double rpmMean = 0.0; - /** Native monotonicity classification of the aligned speed record. */ - public boolean rpmMonotonic = false; - /** Native warning messages in order; default empty. */ - public String[] warnings = new String[0]; - } - - /** Framing facts from the native algorithm. Sample indices refer to the vibration input and endSample is exclusive. */ - public static final class FixedSamplingFrameMeta { - /** Native zero-based frame index. */ - public int frameIndex = 0; - /** Inclusive first sample index in the vibration record. */ - public int startSample = 0; - /** Exclusive end sample index in the vibration record. */ - public int endSample = 0; - /** Native frame-center time in seconds on the aligned vibration timeline. */ - public double timeCenterS = 0.0; - /** Frame-center speed in revolutions per minute. */ - public double rpmCenter = 0.0; - /** Nominal/display speed for this frame in revolutions per minute. */ - public double rpmNominal = 0.0; - /** Actual speed for this frame in revolutions per minute. */ - public double rpmActual = 0.0; - /** Actual FFT length in samples for this frame. */ - public int nFft = 0; - } - - /** One fixed-sampling spectrum. All spectral vectors follow freqAxisHz; magnitude uses the selected output format. */ - public static final class FixedSpectrumFrame { - /** Native zero-based frame index. */ - public int frameIndex = 0; - /** Frame-center speed in revolutions per minute. */ - public double rpmCenter = 0.0; - /** Nominal/display speed for this frame in revolutions per minute. */ - public double rpmNominal = 0.0; - /** Actual speed for this frame in revolutions per minute. */ - public double rpmActual = 0.0; - /** Native frame-center time in seconds on the aligned vibration timeline. */ - public double timeCenterS = 0.0; - /** Spectral coordinates in Hz. */ - public double[] freqAxisHz = new double[0]; - /** Frame spectrum in the selected native output format, paired with freqAxisHz. */ - public double[] magnitude = new double[0]; - /** Per-bin RMS in the input vibration unit, paired with freqAxisHz; independent of magnitude output format. */ - public double[] lineRms = new double[0]; - } - - /** Fixed frequency map. data[rpmFrame][frequencyBin]; rows follow rpmAxis and columns follow freqAxisHz. */ - public static final class FrequencyRpmMap { - /** Native display RPM coordinates in revolutions per minute. */ - public double[] rpmAxis = new double[0]; - /** Native nominal RPM coordinates in revolutions per minute. */ - public double[] rpmNominalAxis = new double[0]; - /** Native actual RPM coordinates in revolutions per minute. */ - public double[] rpmActualAxis = new double[0]; - /** Spectral coordinates in Hz. */ - public double[] freqAxisHz = new double[0]; - /** Matrix [rpmFrame][frequencyBin], following rpmAxis and freqAxisHz. */ - public double[][] data = new double[0][]; - /** Native warning messages in order; default empty. */ - public String[] warnings = new String[0]; - } - - /** Full fixed branch including per-frame spectra, RPM map, warnings and overall RMS curve. */ - public static final class FixedSamplingBranchOutput { - /** Frame metadata in native frame order. */ - public FixedSamplingFrameMeta[] frameMeta = new FixedSamplingFrameMeta[0]; - /** Per-frame spectra in native frame order. */ - public FixedSpectrumFrame[] frames = new FixedSpectrumFrame[0]; - /** Fixed spectrum map with data[rpmFrame][frequencyBin]. */ - public FrequencyRpmMap freqRpmMap = new FrequencyRpmMap(); - /** Native warning messages in order; default empty. */ - public String[] warnings = new String[0]; - /** Native overall RMS curve, independent of selected spectrum magnitude format; preserve its unit and coordinates. */ - public Curve overallRmsVsRpm = new Curve(); - } - - /** Order view derived from fixed spectra. data[rpmFrame][orderBin]; this is not angle-resampled order tracking. */ - public static final class DerivedOrderView { - /** Native display RPM coordinates in revolutions per minute. */ - public double[] rpmAxis = new double[0]; - /** Native actual RPM coordinates in revolutions per minute. */ - public double[] rpmActualAxis = new double[0]; - /** Native nominal RPM coordinates in revolutions per minute. */ - public double[] rpmNominalAxis = new double[0]; - /** Dimensionless order coordinates for matrix columns. */ - public double[] orderAxis = new double[0]; - /** Matrix [rpmFrame][orderBin], following rpmAxis and orderAxis. */ - public double[][] data = new double[0][]; - /** Native warning messages in order; default empty. */ - public String[] warnings = new String[0]; - } - - /** Native processing chain facts. fixedBranchExecuted indicates a nonempty fixed frequency-RPM map. */ - public static final class MainChainOutput { - /** Native RPM input/interpolation result. */ - public RpmEstimateResult rpmResult = new RpmEstimateResult(); - /** Native warning messages in order; default empty. */ - public String[] warnings = new String[0]; - /** Native aligned input facts. */ - public SharedInputContext shared = new SharedInputContext(); - /** Complete native fixed-sampling branch output. */ - public FixedSamplingBranchOutput fixed = new FixedSamplingBranchOutput(); - /** Derived fixed-spectrum order view with data[rpmFrame][orderBin]. */ - public DerivedOrderView derivedOrderView = new DerivedOrderView(); - /** True when native fixed processing produced a nonempty frequency-RPM map. */ - public boolean fixedBranchExecuted = false; - } - - /** Requested order sections. Orders are dimensionless frequency divided by rotational frequency. */ - public static final class StandardOrderParams { - /** Requested dimensionless orders; default empty. Native algorithm determines section generation. */ - public double[] interestOrders = new double[0]; - /** Native half-order selection flag; default false. */ - public boolean halfOrderEnable = false; - } - - /** Native standard-order section results. An empty array means no sections were produced. */ - public static final class StandardOrderResult { - /** Requested order slice results in native order; default empty. */ - public OrderSliceCurve[] interestSlices = new OrderSliceCurve[0]; - } - - /** Complete FromRpm input. Both clocks use seconds relative to the same origin. RPM is speed, not tachometer pulses. */ - public static final class Input { - /** Vibration record and its sampling rate; required, default empty record. */ - public VibrationSignal vib = new VibrationSignal(); - /** Speed samples in revolutions per minute; default empty, required for analysis. */ - public double[] rpmCurve = new double[0]; - /** RPM sampling frequency in Hz, independently specified from vibration; default 0, must be positive. */ - public double rpmFsHz = 0.0; - /** Time of the first vibration sample in seconds on the common clock; default 0. */ - public double vibStartS = 0.0; - /** Time of the first RPM sample in seconds on the common clock; default 0. */ - public double rpmStartS = 0.0; - } - - /** Complete native configuration. Only FromRpm, StandardOrder and FixedOnly are currently supported. */ - public static final class Config { - /** Data-source mode; only DataSourceMode.FROM_RPM (0) is supported. */ - public int source = DataSourceMode.FROM_RPM; - /** Analysis mode; only AnalysisMode.STANDARD_ORDER (0) is supported. */ - public int mode = AnalysisMode.STANDARD_ORDER; - /** Common analysis options; required, default native settings. */ - public OrderTrackOptions common = new OrderTrackOptions(); - /** Standard-order requests; required, default no requested orders. */ - public StandardOrderParams standard = new StandardOrderParams(); - } - - /** Native diagnostics. Text is retained; warnings do not independently determine success. */ - public static final class Debug { - /** Native diagnostic log messages in order; default empty. */ - public String[] log = new String[0]; - /** Native warning messages in order; default empty. */ - public String[] warnings = new String[0]; - } - - /** - * Native map with the original SDK layout. Fixed_FrequencyRpmMap uses x=Hz, y=RPM and - * data[rpmFrame][frequencyBin] (data[y][x]). Derived_OrderMap uses x=RPM, y=order and - * data[rpmFrame][orderBin] (data[x][y]). The SDK uses different orientations for these maps; - * JNI deliberately does not transpose either one. Consult branch, label and units before plotting. - */ - public static final class MapData { - /** Native label; empty if no label was supplied. */ - public String label = ""; - /** Native X coordinates in xunit; correspond to columns for the fixed map and rows for the derived map. */ - public double[] xAxis = new double[0]; - /** Actual X coordinates when supplied; empty means absent. */ - public double[] xAxisActual = new double[0]; - /** Nominal X coordinates when supplied; empty means absent. */ - public double[] xAxisNominal = new double[0]; - /** Native Y coordinates in yunit; correspond to rows for the fixed map and columns for the derived map. */ - public double[] yAxis = new double[0]; - /** Actual Y/RPM coordinates when supplied; empty means absent. */ - public double[] yAxisActual = new double[0]; - /** Nominal Y/RPM coordinates when supplied; empty means absent. */ - public double[] yAxisNominal = new double[0]; - /** Native matrix: fixed map [y/RPM][x/Hz], derived map [x/RPM][y/order]; no transposition is performed. */ - public double[][] data = new double[0][]; - /** Native X-axis unit label; do not infer it from the curve or map index. */ - public String xunit = ""; - /** Native Y-axis unit label. */ - public String yunit = ""; - /** Native map value unit label. */ - public String zunit = ""; - /** Native channel index; -1 means unspecified. */ - public int channelIndex = -1; - /** Native channel name; empty means unspecified. */ - public String channelName = ""; - /** ProcessingBranch constant identifying the origin of this output. */ - public int branch = ProcessingBranch.FIXED_SAMPLING; - } - - /** Complete native output, including partial diagnostics on failure. Check success before consuming numerical results. */ - public static final class Result { - /** Native overall success flag; false does not suppress errors, warnings or partial result facts. */ - public boolean success = false; - /** Data-source mode; only DataSourceMode.FROM_RPM (0) is supported. */ - public int source = DataSourceMode.FROM_RPM; - /** Analysis mode; only AnalysisMode.STANDARD_ORDER (0) is supported. */ - public int mode = AnalysisMode.STANDARD_ORDER; - /** Complete native main-chain output; includes aligned inputs and all branch results. */ - public MainChainOutput chain = new MainChainOutput(); - /** Native standard-order section results. */ - public StandardOrderResult standard = new StandardOrderResult(); - /** Native debug logs and warnings. */ - public Debug debug = new Debug(); - /** Native error messages; empty means no reported errors, not an independent success guarantee. */ - public String[] errors = new String[0]; - /** Unified native curves in native order; default empty. */ - public Curve[] curves = new Curve[0]; - /** Unified native maps in native order; default empty. */ - public MapData[] maps = new MapData[0]; + public Frame[] frames = new Frame[0]; + public double[][] values = new double[0][]; + public double[][] complexValuesReal = new double[0][]; + public double[][] complexValuesImag = new double[0][]; + public double[][] rmsSpectraReal = new double[0][]; + public double[][] rmsSpectraImag = new double[0][]; + public double[] angleAxisRev = new double[0]; + public double[][] angleWaveformsG = new double[0][]; + public BandResult[] sections = new BandResult[0]; + public BandResult overall = new BandResult(); + public Rejected[] rejected = new Rejected[0]; + } + public static final class AngleReference { + public ReferenceMetadata metadata = new ReferenceMetadata(); + public double[] angleTimesS = new double[0]; + public double[] angleValuesRev = new double[0]; + public double[] angularVelocityRevPerMin = new double[0]; + } + public static final class AnglePreparationResult { + public int errorCode = 13200217; + public AngleReference reference = new AngleReference(); + } + public static final class SpectrumSelection { + public int errorCode = 13200220; + public int axis; + public double requestedValue; + public double actualValue; + public long frameIndex; + public double timeS; + public double representativeRpm; + public double trackingRpm; } } diff --git a/apps/backend/opentest-plugin-runtime/src/test/java/com/opentest/runtime/OrderTrackingBindingsTest.java b/apps/backend/opentest-plugin-runtime/src/test/java/com/opentest/runtime/OrderTrackingBindingsTest.java index 193c1c26..5711e42b 100644 --- a/apps/backend/opentest-plugin-runtime/src/test/java/com/opentest/runtime/OrderTrackingBindingsTest.java +++ b/apps/backend/opentest-plugin-runtime/src/test/java/com/opentest/runtime/OrderTrackingBindingsTest.java @@ -4,7 +4,14 @@ import com.opentest.algorithm.api.BkFftOptions; import com.opentest.algorithm.api.FftSession; import com.opentest.algorithm.api.OrderTrackingAlgorithmService; -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.dashboard.api.frame.ChannelFrame; import com.opentest.dashboard.api.pipeline.ProcessorPipelineBuilder; import com.opentest.dashboard.api.pipeline.ProcessorPipelineCompiler; @@ -27,7 +34,23 @@ void suppliesTheSameOrderServiceToProviderAndPipeline() throws Exception { @Override public float[] applyDcOffset(float[] samples, double offset) { return samples; } @Override public FftSession openBkFft(BkFftOptions options) { throw new UnsupportedOperationException(); } }; - OrderTrackingAlgorithmService order = (config, input) -> new Result(); + OrderTrackingAlgorithmService order = new OrderTrackingAlgorithmService() { + @Override public Results analyzeFs(VibrationSignal vibration, RpmReference rpm, FsSettings settings) { + return new Results(); + } + @Override public AnglePreparationResult prepareAngleReference(RpmReference rpm) { + return new AnglePreparationResult(); + } + @Override public Results analyzeOt(VibrationSignal vibration, AngleReference reference, OtSettings settings) { + return new Results(); + } + @Override public SpectrumSelection selectFsSpectrum(Results results, int axis, double target) { + return new SpectrumSelection(); + } + @Override public SpectrumSelection selectOtSpectrum(Results results, int axis, double target) { + return new SpectrumSelection(); + } + }; var bindings = new DashboardAlgorithmBindings(algorithms, Map.of(OrderTrackingAlgorithmService.class, order)); assertSame(order, bindings.providerContext(Map.of()).requireAlgorithmService(OrderTrackingAlgorithmService.class)); assertSame(order, bindings.pipelineCapabilities().get(OrderTrackingAlgorithmService.class));