Fix runtime error from set_multinomial_weights.

admb-project · Sep 27, 2023 · ce9f4c8 · ce9f4c8
1 parent 464cfa4
commit ce9f4c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/examples/GNUmakefile b/examples/GNUmakefile
@@ -380,7 +380,7 @@ binomial_w2:
 ifeq ($(CMDSHELL),cmd)
 	pushd admb-re\\weights && $(ADMB_HOME)\\admb $(OPTIONS) $@ && $(PROG) $@ $(ADMB_RUN_ARGS) && popd
 else
-	-cd admb-re/weights && $(ADMB_HOME)/admb$(EXT) $(OPTIONS) $@ && $(PROG) ./$@ $(ADMB_RUN_ARGS)
+	cd admb-re/weights && $(ADMB_HOME)/admb$(EXT) $(OPTIONS) $@ && $(PROG) ./$@ $(ADMB_RUN_ARGS)
 endif
 
 autodif: bigmin hemholtz io_examp newt

diff --git a/src/df1b2-separable/f1b2fnl2.cpp b/src/df1b2-separable/f1b2fnl2.cpp
@@ -81,7 +81,7 @@ void laplace_approximation_calculator::do_separable_stuff(void)
     switch(hesstype)
     {
     case 2:
-      ++separable_calls_counter;
+      if (!pmin->multinomial_weights) ++separable_calls_counter;
       if (saddlepointflag==2)
       {
         do_separable_stuff_x_u_block_diagonal(ff);

diff --git a/src/nh99/xmodelm3.cpp b/src/nh99/xmodelm3.cpp
@@ -547,7 +547,7 @@ void tracing_message(int traceflag,const char *s);
   }
   void function_minimizer::set_multinomial_weights(dvector& d)
   {
-    multinomial_weights=new dvector(d);
+    multinomial_weights = new dvector(d);
   }
 
 function_minimizer::function_minimizer(long int sz):
@@ -557,7 +557,7 @@ function_minimizer::function_minimizer(long int sz):
   ffbest(0)
   {
     lapprox=0;
-    multinomial_weights=0;
+    multinomial_weights = nullptr;
     //cout << lapprox << endl;
     maxfn  = 1000;
     iprint = 1;
@@ -635,7 +635,7 @@ function_minimizer::~function_minimizer()
   if (multinomial_weights)
   {
     delete multinomial_weights;
-    multinomial_weights = 0;
+    multinomial_weights = nullptr;
   }
   if (lapprox)
   {