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

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

Author: lckarssen
Date: 2012-04-25 12:00:55 +0200 (Wed, 25 Apr 2012)
New Revision: 896

Modified:
   pkg/ProbABEL/src/data.h
Log:
ProbABEL's data.h: fixed two bugs and removed two unused variables

Modified: pkg/ProbABEL/src/data.h
===================================================================
--- pkg/ProbABEL/src/data.h	2012-04-25 09:44:15 UTC (rev 895)
+++ pkg/ProbABEL/src/data.h	2012-04-25 10:00:55 UTC (rev 896)
@@ -30,9 +30,6 @@
 
 unsigned int Nmeasured(char * fname, int nphenocols, int npeople)
 {
-    int ncov = nphenocols - 2;
-    int nids_all = npeople;
-
     // first pass -- find unmeasured people
     std::ifstream infile(fname);
     if (!infile)
@@ -258,7 +255,6 @@
 	    infile >> tmp;
 	}
 
-	int k =0;
 	int m =0;
 	for (int i = 0; i<npeople; i++)
 	    if (allmeasured[i]==1)
@@ -674,7 +670,7 @@
 	    //			X.put(1.,i,0);
 	    stime[i] = (phed.Y).get(i,0);
 	    sstat[i] = int((phed.Y).get(i,1));
-	    if (sstat[i] != 1 & sstat[i]!=0)
+	    if (sstat[i] != 1 && sstat[i]!=0)
 	    {
 		std::cerr << "coxph_data: status not 0/1 (right order: id, fuptime, status ...)"
 			  << endl;
@@ -729,7 +725,7 @@
 		    }
 	    if (passed != 1)
 	    {
-	    std:cerr << "cannot recover element " << i << endl;
+		std::cerr << "cannot recover element " << i << endl;
 		exit(1);
 	    }
 	}