add mvtnorm and fix compiler directive logic

NIEHS · Nov 12, 2024 · 6ba4782 · 6ba4782
1 parent d6c484a
commit 6ba4782
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -75,7 +75,8 @@ URL: https://github.com/NIEHS/ToxicR
 LazyData: true
 Imports: Rcpp (>= 1.0.0), ggplot2 (>= 3.3.2), shiny (>= 1.5.0), coda
         (>= 0.19-4), scales (>= 1.1.1), forcats, ggridges (>= 0.5.3),
-        doBy (>= 4.6.11), multcomp (>= 1.4), dplyr (>= 1.0.7), remotes
+        doBy (>= 4.6.11), multcomp (>= 1.4), dplyr (>= 1.0.7), remotes,
+        mvtnorm
 LinkingTo: Rcpp, RcppEigen, RcppGSL
 RoxygenNote: 7.3.2
 Encoding: UTF-8

diff --git a/src/include/cBMDstatmod.h b/src/include/cBMDstatmod.h
@@ -379,10 +379,10 @@ optimizationResult cfindMAX_W_EQUALITY(cBMDModel<LL, PR> *M,
       result = opt.optimize(x, minf);
       good_opt = true;
     #if defined(_WIN32) || defined(__APPLE__)
-    } catch (nlopt::roundoff_limited2 &exc) {
+    } catch (nlopt::roundoff_limited &exc) {
       good_opt = false;
     #else 
-    } catch (nlopt::roundoff_limited &exc) {
+    } catch (nlopt::roundoff_limited2 &exc) {
       good_opt = false;
     #endif
     } catch (nlopt::forced_stop &exc) {