[Genabel-commits] r1273 - pkg/ProbABEL/src

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

Author: lckarssen
Date: 2013-07-22 23:50:17 +0200 (Mon, 22 Jul 2013)
New Revision: 1273

Modified:
   pkg/ProbABEL/src/coxph_data.h
   pkg/ProbABEL/src/main.cpp
Log:
Remove default value of 0 for the nullmodel option of the estimate function of ProbABEL's Cox regression as this can cause confusion about the actual parameters that are passed. Actually, when estimating the null model in main.cpp lines 443, 444 nullmodel=0 was used. This had no effect on the output because for a long time we have not been using the null model likelihood. 


Modified: pkg/ProbABEL/src/coxph_data.h
===================================================================
--- pkg/ProbABEL/src/coxph_data.h	2013-07-21 18:27:53 UTC (rev 1272)
+++ pkg/ProbABEL/src/coxph_data.h	2013-07-22 21:50:17 UTC (rev 1273)
@@ -62,8 +62,8 @@
 
     coxph_reg(coxph_data &cdatain);
     void estimate(coxph_data &cdatain, int verbose, int maxiter, double eps,
-            double tol_chol, int model, int interaction, int ngpreds,
-            bool iscox, int nullmodel = 0);
+                  double tol_chol, int model, int interaction, int ngpreds,
+                  bool iscox, int nullmodel);
 };
 
 #endif /* COXPH_DATA_H_ */

Modified: pkg/ProbABEL/src/main.cpp
===================================================================
--- pkg/ProbABEL/src/main.cpp	2013-07-21 18:27:53 UTC (rev 1272)
+++ pkg/ProbABEL/src/main.cpp	2013-07-22 21:50:17 UTC (rev 1273)
@@ -441,7 +441,7 @@
 #elif COXPH
     coxph_reg nrd = coxph_reg(nrgd);
     nrd.estimate(nrgd, 0, MAXITER, EPS, CHOLTOL, 0,
-                 input_var.getInteraction(), input_var.getNgpreds(), 1);
+                 input_var.getInteraction(), input_var.getNgpreds(), true, 1);
 #endif
 
     std::cout << " estimated null model ...";