[Genabel-commits] r1021 - branches/ProbABEL-refactoring/ProbABEL/src

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2012-11-13 21:58:55 +0100 (Tue, 13 Nov 2012)
New Revision: 1021

Modified:
   branches/ProbABEL-refactoring/ProbABEL/src/main.cpp
Log:
Ported changes from trunk r909 to ProbABEL-refactoring. 

Repeating the commit message of r909:

- src/main.cpp: Added flush commands when printing out the status messages. This may slow down I/O to the screen slightly, but in general that is nothing compared to load and run times. However, it actually makes the status messages usefull since now we know that (in case of a problem) the program actually stopped at the last message.




Modified: branches/ProbABEL-refactoring/ProbABEL/src/main.cpp
===================================================================
--- branches/ProbABEL-refactoring/ProbABEL/src/main.cpp	2012-11-13 10:18:24 UTC (rev 1020)
+++ branches/ProbABEL-refactoring/ProbABEL/src/main.cpp	2012-11-13 20:58:55 UTC (rev 1021)
@@ -125,7 +125,7 @@
     // invvarmatrix = inv.get_matrix();
     //double par = 1.; //var(phd.Y)*phd.nids/(phd.nids-phd.ncov-1);
     invvarmatrix.set_matrix(inv.get_matrix());    // = invvarmatrix * par;
-    std::cout << " loaded InvSigma ...";
+    std::cout << " loaded InvSigma ..." << std::flush;
 }
 
 void create_start_of_header(std::vector<std::ofstream*>& outfile,
@@ -280,13 +280,13 @@
      #endif
      */
 
-    std::cout << "Reading data ...";
+    std::cout << "Reading data ..." << std::flush;
     if (input_var.getInverseFilename() != NULL)
     {
         loadInvSigma(input_var, phd, invvarmatrix);
         //	matrix.print();
     }
-    std::cout.flush();
+
     gendata gtd;
     if (!input_var.getIsFvf())
         //use the non non filevector input format
@@ -299,7 +299,7 @@
                 input_var.getNgpreds(), phd.nids_all, phd.nids, phd.allmeasured,
                 phd.idnames);
 
-    std::cout << " loaded genotypic data ...";
+    std::cout << " loaded genotypic data ..." << std::flush;
     /**
      if (input_var.getIsFvf())
      gendata gtd (str_genfilename,nsnps,input_var.getNgpreds(),phd.nids_all,phd.allmeasured,phd.idnames);
@@ -315,7 +315,7 @@
     regdata nrgd = regdata(phd, gtd, -1, input_var.isIsInteractionExcluded());
 #endif
 
-    std::cout << " loaded null data ...";
+    std::cout << " loaded null data ..." << std::flush;
 #if LOGISTIC
     logistic_reg nrd = logistic_reg(nrgd);
     nrd.estimate(nrgd, 0, MAXITER, EPS, CHOLTOL, 0, input_var.getInteraction(), input_var.getNgpreds(), invvarmatrix, input_var.getRobust(), 1);
@@ -343,8 +343,7 @@
 
     std::cout << " formed regression object ...";
 
-    std::cout << " done\n";
-    std::cout.flush();
+    std::cout << " done\n" << std::flush;
 
     //________________________________________________________________
     //Maksim, 9 Jan, 2009