various settings output

diyabc · Jul 8, 2020 · 71f9508 · 71f9508
1 parent 8bafa9b
commit 71f9508
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/EstimParam.cpp b/src/EstimParam.cpp
@@ -68,6 +68,7 @@ EstimParamResults EstimParam_fun(Reftable<MatrixType> &myread,
     auto nparam = myread.params_names.size();
 
     nref = myread.nrec;
+    ntest = std::min(nref,ntest);
 
     VectorXd y(nref);
     switch(op) {
@@ -156,8 +157,11 @@ EstimParamResults EstimParam_fun(Reftable<MatrixType> &myread,
     }
 
     if (!quiet) {
-        const std::string& settings_filename = outfile + "_settings.txt";
+        const std::string& settings_filename = outfile + ".settings";
         std::ofstream settings_file;
+        settings_file.open(settings_filename, std::ios::out);
+
+        settings_file << "Parameter estimation analyses proceeded using: " << std::endl;
         settings_file << "- " << "Parameter name: " << parameter_of_interest << std::endl;
         settings_file << "- " << "Scenario " << chosenscen << std::endl;
         settings_file << "- " << myread.nrec << " simulated datasets" << std::endl;
@@ -168,6 +172,7 @@ EstimParamResults EstimParam_fun(Reftable<MatrixType> &myread,
             settings_file << "- " << data_extended.cols() << " axes of summary statistics PLS linear combination" << std::endl;
         }
         settings_file << "- " << noisecols << " noise variables" << std::endl;
+        settings_file << "- " << ntest << " out-of-band samples used as test" << std::endl;
         settings_file.close();
     }
 

diff --git a/src/ModelChoice.cpp b/src/ModelChoice.cpp
@@ -53,10 +53,11 @@ ModelChoiceResults ModelChoice_fun(Reftable<MatrixType> &myread,
     MatrixXd data_extended(n,0);
 
     if (!quiet) {
-        const std::string& settings_filename = outfile + "_settings.txt";
+        const std::string& settings_filename = outfile + ".settings";
         std::ofstream settings_file;
         settings_file.open(settings_filename, std::ios::out);
 
+        settings_file << "Model choice analyses proceeded using: " << std::endl;
         settings_file << "- " << myread.nrec << " simulated datasets" << std::endl;
         settings_file << "- " << ntree << " trees" << std::endl;
         settings_file << "- " << "Minimum node size of " << (minnodesize == 0 ? 1 : minnodesize) << std::endl;