[Genabel-commits] r1095 - branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src

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

Author: lckarssen
Date: 2013-02-11 08:49:02 +0100 (Mon, 11 Feb 2013)
New Revision: 1095

Modified:
   branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp
Log:
Three very small improvements in gendata.ccp:
      - Fix spacing in an error message
      - Add filename to another error message
      - Fix name of a function (in commented code)


Modified: branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp
===================================================================
--- branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp	2013-02-10 21:59:46 UTC (rev 1094)
+++ branches/ProbABEL-pacox/v.0.3.0/ProbABEL/src/gendata.cpp	2013-02-11 07:49:02 UTC (rev 1095)
@@ -37,7 +37,7 @@
                 data[j++] = tmpdata[i];
             }
         }
-        // std::cout << j << " " << DAG->get_nobservations() << " "
+        // std::cout << j << " " << DAG->getNumObservations() << " "
         //           << nids << "\n";
     }
     else
@@ -147,7 +147,7 @@
                 if (tmpid != idnames[k])
                 {
                     cerr << "phenotype file and dose or probability file "
-                         << "did not match at line " << i + 2 << "(" << tmpid
+                         << "did not match at line " << i + 2 << " (" << tmpid
                          << " != " << idnames[k] << ")" << endl;
                     infile.close();
                     exit(1);
@@ -173,7 +173,7 @@
                 }
                 else
                 {
-                    std::cerr << "cannot read dose-file: "
+                    std::cerr << "cannot read dose-file: " << fname
                               << "check skipd and ngpreds parameters\n";
                     infile.close();
                     exit(1);