[Genabel-commits] r1190 - in branches/ProbABEL-pacox/v.0.3.0/ProbABEL: src tests/test_cox_ngpreds2

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

Author: lckarssen
Date: 2013-04-11 08:44:54 +0200 (Thu, 11 Apr 2013)
New Revision: 1190

Modified:
   branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/eigen_mematrix.cpp
   branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp
   branches/ProbABEL-pacox/v.0.3.0/ProbABEL/tests/test_cox_ngpreds2/run_models_in_R_palinear.R
Log:
Fix compiler warning about unsigned int comparison in ProbABEL-pacox branch

Modified: branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/eigen_mematrix.cpp
===================================================================
--- branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/eigen_mematrix.cpp	2013-04-09 15:37:06 UTC (rev 1189)
+++ branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/eigen_mematrix.cpp	2013-04-11 06:44:54 UTC (rev 1190)
@@ -273,7 +273,8 @@
     {
         std:: cout << "nr=" << i << ":\t";
         for (int j = 0; j < ncol; j++)
-            cout << data.data()[i * ncol + j] << "\t";
+//            cout << data.data()[i * ncol + j] << "\t";
+            printf("%f\t", data.data()[i * ncol + j]);
         std::cout << "\n";
     }
 }

Modified: branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp
===================================================================
--- branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp	2013-04-09 15:37:06 UTC (rev 1189)
+++ branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp	2013-04-11 06:44:54 UTC (rev 1190)
@@ -159,7 +159,7 @@
                 infile >> tmpstr;
             }
 
-            for (int j = 0; j < (nsnps * ngpreds); j++)
+            for (unsigned int j = 0; j < (nsnps * ngpreds); j++)
             {
                 if (infile.good())
                 {
@@ -185,7 +185,7 @@
         {
             for (int j = 0; j < skipd; j++)
                 infile >> tmpstr;
-            for (int j = 0; j < (nsnps * ngpreds); j++)
+            for (unsigned int j = 0; j < (nsnps * ngpreds); j++)
                 infile >> tmpstr;
         }
     }

Modified: branches/ProbABEL-pacox/v.0.3.0/ProbABEL/tests/test_cox_ngpreds2/run_models_in_R_palinear.R
===================================================================
--- branches/ProbABEL-pacox/v.0.3.0/ProbABEL/tests/test_cox_ngpreds2/run_models_in_R_palinear.R	2013-04-09 15:37:06 UTC (rev 1189)
+++ branches/ProbABEL-pacox/v.0.3.0/ProbABEL/tests/test_cox_ngpreds2/run_models_in_R_palinear.R	2013-04-11 06:44:54 UTC (rev 1190)
@@ -6,7 +6,7 @@
 pheno <- read.table("../../examples/height.txt", head=TRUE, string=FALSE)
 
 # load genetic DOSE data
-dose <- read.table("../../examples/test.mldose.2", head=FALSE, string=FALSE)
+dose <- read.table("../../examples/test.mldose", head=FALSE, string=FALSE)
 # remove "1->" from the names of dose-IDs
 idNames <- dose[, 1]
 idNames <- sub("[0-9]+->", "", idNames)