For Issue #221, set default of -iprint to 20 from 10.

admb-project · Mar 1, 2022 · 581d46c · 581d46c
1 parent 67362cb
commit 581d46c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/src/df1b2-separable/df1b2lp8.cpp b/src/df1b2-separable/df1b2lp8.cpp
@@ -223,7 +223,7 @@ void laplace_approximation_calculator::generate_antithetical_rvs()
   fmmt1 fmc(nvar,5);
   //fmm fmc(nvar,5);
   fmc.noprintx=1;
-  fmc.iprint=10;
+  fmc.iprint = defaults::iprint;
   fmc.maxfn=2500;
   fmc.crit=1.e-6;
 

diff --git a/src/df1b2-separable/tpl2rem.lex b/src/df1b2-separable/tpl2rem.lex
@@ -4697,27 +4697,27 @@ TOP_OF_MAIN_SECTION {
       if (!random_effects_flag)
       {
         fprintf(ftopmain,"    model_parameters mp(arrmblsize,argc,argv,ad_dll);\n"
-          "    mp.iprint=10;\n");
+          "    mp.iprint = defaults::iprint;\n");
       }
       else
       {
         fprintf(ftopmain,"    df1b2variable::noallocate=1;\n");
         fprintf(ftopmain,"    df1b2_parameters mp(arrmblsize,argc,argv,ad_dll);\n"
-          "    mp.iprint=10;\n");
+          "    mp.iprint = defaults::iprint;\n");
       }
 
     }
     else
     {
       if (!random_effects_flag)
       {
-       fprintf(ftopmain,"    model_parameters mp(arrmblsize,argc,argv);\n"
-         "    mp.iprint=10;\n");
+        fprintf(ftopmain,"    model_parameters mp(arrmblsize,argc,argv);\n"
+         "    mp.iprint = defaults::iprint;\n");
       }
       else
       {
-       fprintf(ftopmain,"    df1b2_parameters mp(arrmblsize,argc,argv);\n"
-         "    mp.iprint=10;\n");
+        fprintf(ftopmain,"    df1b2_parameters mp(arrmblsize,argc,argv);\n"
+         "    mp.iprint = defaults::iprint;\n");
       }
     }
 

diff --git a/src/linad99/fvar.hpp b/src/linad99/fvar.hpp
@@ -9402,5 +9402,9 @@ std::ostream& get_output_stream();
 
 dvariable dtweedie(const double y, dvariable& mu, dvariable& phi, dvariable& p, const bool use_log);
 
+namespace defaults
+{
+  const int iprint = 20;
+};
 
 #endif//#ifndef FVAR_HPP
diff --git a/src/nh99/mod_pmin.cpp b/src/nh99/mod_pmin.cpp
@@ -68,23 +68,19 @@ dmatrix trans(const dvector& x)
   {
     int on1 = 0;
     int nopt = 0;
+    iprint = defaults::iprint;
     if ( (on1=option_match(ad_comm::argc,ad_comm::argv,"-iprint",nopt))>-1)
     {
       if (!nopt)
       {
         cerr << "Usage -iprint option needs integer  -- ignored" << endl;
-        iprint = 10;
       }
       else
       {
         int jj=atoi(ad_comm::argv[on1+1]);
         iprint = jj;
       }
     }
-    else
-    {
-      iprint = 10;
-    }
 
     dvector siglevel("{.90,.95,.975}");
     int num_pp=likeprof_params::likeprofptr[0]->get_stepnumber();

diff --git a/src/nh99/model7.cpp b/src/nh99/model7.cpp
@@ -208,7 +208,7 @@ ad_comm::ad_comm(int _argc,char * _argv[])
       ad_printf( " -crit N1,N2,... set gradient magnitude convergence "
       "criterion to N\n");
       ad_printf( " -iprint N       print out function minimizer report "
-      "every N iterations\n");
+      "every N iterations (default %i).\n", defaults::iprint);
       ad_printf( " -maxfn N1,N2,.. set maximum number opf function eval's "
       "to N\n");
       ad_printf( " -rs             if function minimizer can't make "

diff --git a/src/nh99/randeff.cpp b/src/nh99/randeff.cpp
@@ -37,7 +37,7 @@ dvariable function_minimizer::random_effects_maximization(const dvar_vector& _x)
   //double crit=1.e-3;
   int maxfn=400;
   int maxiter=50;
-  int iprint=-10;
+  int iprint = -defaults::iprint;
 
   dvar_vector& x = (dvar_vector&)(_x);
 

diff --git a/src/nh99/tpl2cpp.lex b/src/nh99/tpl2cpp.lex
@@ -4394,14 +4394,14 @@ TOP_OF_MAIN_SECTION {
       fprintf(ftopmain,"    gradient_structure::set_YES_SAVE_VARIABLES_VALUES();\n"
         "    if (!arrmblsize) arrmblsize=15000000;\n"
         "    model_parameters mp(arrmblsize,argc,argv,ad_dll);\n"
-        "    mp.iprint=10;\n");
+        "    mp.iprint = defaults::iprint;\n");
     }
     else
     {
       fprintf(ftopmain,"    gradient_structure::set_YES_SAVE_VARIABLES_VALUES();\n"
         "    if (!arrmblsize) arrmblsize=15000000;\n"
         "    model_parameters mp(arrmblsize,argc,argv);\n"
-        "    mp.iprint=10;\n");
+        "    mp.iprint = defaults::iprint;\n");
     }
 
     fprintf(ftopmain,"    mp.preliminary_calculations();\n");