Fix nl2wrapper: Allow --compSpeed=2

Summary: Fixes github issue #61 Test Plan: Execute with --compSpeed=2 Differential Revision: https://dev.openmha.org/D722
HoerTech-gGmbH · Aug 8, 2023 · 3144f4c · 3144f4c
1 parent 07760e0
commit 3144f4c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/README_NALNL2.md b/README_NALNL2.md
@@ -29,7 +29,7 @@ needs to be purchased from the National Acoustic Laboratories independently.
 ### Windows:
   1) Install closed-source MHA or openMHA as documented
   2) Download and install
-     http://mha.hoertech.de/fitting/nalnl2wrapper-2021.06-installer.exe
+     http://mha.hoertech.de/fitting/nalnl2wrapper-2023.08-installer.exe
   3) Store a licensed copy of NAL-NL2.dll in directory 
      C:\Program Files\nalnl2wrapper\bin
 

diff --git a/mha/tools/fitting/NAL-NL2/nalnl2wrapper.cpp b/mha/tools/fitting/NAL-NL2/nalnl2wrapper.cpp
@@ -28,15 +28,15 @@ int main(int argc, char* argv[])
 
     for(const auto lvl : fitmodel.level){
         for( int i = 0; i < 19; i++ ){
-                    data[i] = -99;
-                }
+            data[i] = -99;
+        }
         RealEarInsertionGain_NL2(data, client.ac.data(), client.bc.data(), lvl, fitmodel.limiting, fitmodel.channels, fitmodel.direction, fitmodel.mic, client.acOther.data(), fitmodel.bilateral);
 
 
         // output to console
-                for( int i = 0; i < 19; i++ ){
-                    std::cout << data[i] << " ";
-                }
+        for( int i = 0; i < 19; i++ ){
+            std::cout << data[i] << " ";
+        }
         std::cout << "\n";
     }
     return 0;

diff --git a/mha/tools/fitting/NAL-NL2/packaging/deb/version b/mha/tools/fitting/NAL-NL2/packaging/deb/version
@@ -1 +1 @@
-1.0
+2023.08
diff --git a/mha/tools/fitting/NAL-NL2/packaging/exe/nalnl2wrapper.nsi b/mha/tools/fitting/NAL-NL2/packaging/exe/nalnl2wrapper.nsi
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME nalnl2wrapper
-!define PRODUCT_VERSION 2021.06
+!define PRODUCT_VERSION 2023.08
 !define PRODUCT_PUBLISHER HoerTech
 BrandingText "A command line wrapper for the NAL NL2 fitting rule"
 RequestExecutionLevel admin

diff --git a/mha/tools/fitting/NAL-NL2/parser.cpp b/mha/tools/fitting/NAL-NL2/parser.cpp
@@ -82,7 +82,7 @@ std::pair<Client,Fitmodel> parser(int argc, char **argv) {
       case 'i': // --compSpeed=...
         {
           auto arg=parseSingle<int>(optarg,option_index);
-          if(arg!=0 and arg!=1)
+          if(arg<=0 and arg>=2)
             throw std::invalid_argument("Invalid compSpeed: Expected: 0, 1, or 2. Got: "+std::to_string(arg));
           fitmodel.compSpeed=arg;
         }