Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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);
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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.
Comment thread
mingtaojin marked this conversation as resolved.
Resolved
*
* <p>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.</p>
*/
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.
*
* <p>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.
*
* <p>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);
Comment thread
mingtaojin marked this conversation as resolved.
Resolved
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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<String> 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<String> actual = Set.of(Arrays.stream(AlgorithmLibJNIBridge.class.getDeclaredMethods())
Comment thread
mingtaojin marked this conversation as resolved.
Resolved
Comment thread
mingtaojin marked this conversation as resolved.
Resolved
Comment thread
mingtaojin marked this conversation as resolved.
Resolved
Comment thread
mingtaojin marked this conversation as resolved.
Resolved
.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<Arguments> 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}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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<String, String> messages) {
collector.acquire("datafreq", 2)[1] = 1D;
collector.acquire("datafft", 2)[0] = 3D;
Expand All @@ -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,
Expand Down
Loading
Loading