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

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

Author: lckarssen
Date: 2012-10-04 00:24:14 +0200 (Thu, 04 Oct 2012)
New Revision: 969

Modified:
   pkg/ProbABEL/src/main.cpp
   pkg/ProbABEL/src/reg1.h
Log:
ProbABEL: Commented a few unused variables. ProbABEL now compiles without errors or warnings (even when using g++'s -Wall switch). Hurray!!



Modified: pkg/ProbABEL/src/main.cpp
===================================================================
--- pkg/ProbABEL/src/main.cpp	2012-10-03 22:07:30 UTC (rev 968)
+++ pkg/ProbABEL/src/main.cpp	2012-10-03 22:24:14 UTC (rev 969)
@@ -360,7 +360,7 @@
        gendata gtd (genfilename,nsnps,ngpreds,phd.nids_all,phd.nids,phd.allmeasured,skipd,phd.idnames);
     **/
     // estimate null model
-    double null_loglik=0.;
+    // double null_loglik=0.; // I noticed this is no longer used, LCK 20121004
 #if COXPH
     coxph_data nrgd(phd,gtd,-1);
 #else
@@ -379,7 +379,7 @@
     coxph_reg nrd(nrgd);
     nrd.estimate(nrgd,0,MAXITER,EPS,CHOLTOL,0, interaction, ngpreds, 1);
 #endif
-    null_loglik = nrd.loglik;
+    //null_loglik = nrd.loglik; // I noticed this is no longer used, LCK 20121004
 
     std::cout << " estimated null model ..." << flush;
 

Modified: pkg/ProbABEL/src/reg1.h
===================================================================
--- pkg/ProbABEL/src/reg1.h	2012-10-03 22:07:30 UTC (rev 968)
+++ pkg/ProbABEL/src/reg1.h	2012-10-03 22:24:14 UTC (rev 969)
@@ -729,7 +729,8 @@
 	  if (X.ncol==4) fprintf(stdout,"X[4] %f\n",tX.get(3,0));
 	*/
 
-	double N;
+	// We don't seem to use this N in this function 20121004 - LCK
+	//double N;
 
 	niter=0;
 	double delta=1.;
@@ -754,7 +755,8 @@
 	    mematrix<double> tmp = productMatrDiag(tX,W);
 	    if (verbose) {printf("tXW:\n");tmp.print();}
 	    mematrix<double> tXWX = tmp*(X);
-	    N = tXWX.get(0,0);
+	    // We don't seem to use this N in this function 20121004 - LCK
+	    // N = tXWX.get(0,0);
 
 	    if (verbose) {printf("tXWX:\n");tXWX.print();}
 	    //printf("tXWX:\n");tXWX.print();