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

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

Author: maartenk
Date: 2014-04-15 22:38:49 +0200 (Tue, 15 Apr 2014)
New Revision: 1690

Modified:
   pkg/ProbABEL/src/coxph_data.cpp
   pkg/ProbABEL/src/data.cpp
Log:
-added missing include to coxph_data.cpp
-removed non functional code from data.cpp


Modified: pkg/ProbABEL/src/coxph_data.cpp
===================================================================
--- pkg/ProbABEL/src/coxph_data.cpp	2014-04-14 20:19:03 UTC (rev 1689)
+++ pkg/ProbABEL/src/coxph_data.cpp	2014-04-15 20:38:49 UTC (rev 1690)
@@ -28,6 +28,7 @@
 
 #include "coxph_data.h"
 #include <iostream>
+#include <algorithm>
 #include <cmath>
 extern "C" {
 #include "survproto.h"

Modified: pkg/ProbABEL/src/data.cpp
===================================================================
--- pkg/ProbABEL/src/data.cpp	2014-04-14 20:19:03 UTC (rev 1689)
+++ pkg/ProbABEL/src/data.cpp	2014-04-15 20:38:49 UTC (rev 1690)
@@ -47,45 +47,7 @@
 #endif
 #include "utilities.h"
 
-//TODO(unknown) This function is not used. Remove in near future
-//unsigned int Nmeasured(char * fname, int nphenocols, int npeople)
-//{
-//// first pass -- find unmeasured people
-//    std::ifstream infile(fname);
-//    if (!infile)
-//    {
-//        std::cerr << "Nmeasured: cannot open file " << fname << endl;
-//    }
-//    char tmp[100];
-//
-//    for (int i = 0; i < nphenocols; i++)
-//    {
-//        infile >> tmp;
-//    }
-//
-//    unsigned short int * allmeasured = new unsigned short int[npeople];
-//    int nids = 0;
-//    for (int i = 0; i < npeople; i++)
-//    {
-//        allmeasured[i] = 1;
-//        infile >> tmp;
-//        for (int j = 1; j < nphenocols; j++)
-//        {
-//            infile >> tmp;
-//            if (tmp[0] == 'N' || tmp[0] == 'n')
-//                allmeasured[i] = 0;
-//        }
-//        if (allmeasured[i] == 1)
-//            nids++;
-//    }
-//    infile.close();
-//
-//    delete[] allmeasured;
-//
-//    return (nids);
-//}
 
-
 /**
  * Read SNP information from an mlinfo file generated by the
  * imputation software.