diff --git a/src/drone-software/src/acoustic/build/demo_offline.exe b/src/drone-software/src/acoustic/build/demo_offline.exe index 2ff704c..a44f22f 100644 Binary files a/src/drone-software/src/acoustic/build/demo_offline.exe and b/src/drone-software/src/acoustic/build/demo_offline.exe differ diff --git a/src/drone-software/src/acoustic/build/extract_mel_cpp.exe b/src/drone-software/src/acoustic/build/extract_mel_cpp.exe index 6077e2b..ca4c44d 100644 Binary files a/src/drone-software/src/acoustic/build/extract_mel_cpp.exe and b/src/drone-software/src/acoustic/build/extract_mel_cpp.exe differ diff --git a/src/drone-software/src/acoustic/build/test_classifier_cpp.exe b/src/drone-software/src/acoustic/build/test_classifier_cpp.exe index 46a1f6f..52b0466 100644 Binary files a/src/drone-software/src/acoustic/build/test_classifier_cpp.exe and b/src/drone-software/src/acoustic/build/test_classifier_cpp.exe differ diff --git a/src/drone-software/src/acoustic/build/test_core_lib.exe b/src/drone-software/src/acoustic/build/test_core_lib.exe index 93ffc73..2c1a88d 100644 Binary files a/src/drone-software/src/acoustic/build/test_core_lib.exe and b/src/drone-software/src/acoustic/build/test_core_lib.exe differ diff --git a/src/drone-software/src/acoustic/run_demo.bat b/src/drone-software/src/acoustic/run_demo.bat index 9ddc65a..e4f987a 100644 --- a/src/drone-software/src/acoustic/run_demo.bat +++ b/src/drone-software/src/acoustic/run_demo.bat @@ -8,7 +8,7 @@ echo ========================================== set BUILD_DIR=%~dp0build set MODEL=models\gunshot_classifier.onnx -set VAL_DIR=dataset\val +set VAL_DIR=dataset\binary\val REM --- Ensure executables exist --- if not exist "%BUILD_DIR%\test_core_lib.exe" ( diff --git a/src/drone-software/src/acoustic/src/core/gunshot_classifier.cpp b/src/drone-software/src/acoustic/src/core/gunshot_classifier.cpp index 67e1e15..a1eae42 100644 --- a/src/drone-software/src/acoustic/src/core/gunshot_classifier.cpp +++ b/src/drone-software/src/acoustic/src/core/gunshot_classifier.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include diff --git a/src/drone-software/src/acoustic/tests/demo_offline.cpp b/src/drone-software/src/acoustic/tests/demo_offline.cpp index 1e40dff..f1ff187 100644 --- a/src/drone-software/src/acoustic/tests/demo_offline.cpp +++ b/src/drone-software/src/acoustic/tests/demo_offline.cpp @@ -27,6 +27,9 @@ struct Prediction { void print_usage(const char* prog) { std::cerr << "Usage: " << prog << " [--model ] [--label_map ] [--threshold ]" << std::endl; + std::cerr << " --model ONNX model path (default: models/gunshot_classifier.onnx)" << std::endl; + std::cerr << " --label_map Label map file (default: models/label_map.json)" << std::endl; + std::cerr << " --threshold Detection threshold (default: 0.5)" << std::endl; } bool ends_with(const std::string& s, const std::string& suffix) { @@ -181,9 +184,9 @@ void print_report(const std::vector& results) { } int main(int argc, char** argv) { - if (argc < 2) { + if (argc < 2 || std::strcmp(argv[1], "--help") == 0 || std::strcmp(argv[1], "-h") == 0) { print_usage(argv[0]); - return 1; + return argc < 2 ? 1 : 0; } std::string target = argv[1];