Bioconductor Code: Browse

Browse code

Correct the parsing in mtx files

This patch makes sure that MatrixElement is handling all of the
string parsing in the input data files. Previously, MtxParser was
doing this separetly and passing a float value. This by-passed the
error checking in MatrixElement and caused some errors to be
missed.

Tom Sherman authored on 22/07/2019 20:46:20
Showing 2 changed files

src/file_parser/MatrixElement.cpp index 32eccbeec..89a979862 100644
src/file_parser/MtxParser.cpp index d98009e6b..04c94ac4c 100755

src/file_parser/MatrixElement.cpp

History View file @ 2ac581010

@@ -11,11 +11,6 @@ static bool containsNumber(const std::string &s)
                          return !s.empty() && s.find_first_not_of("0123456789.-") == std::string::npos;
+                     }
                     -MatrixElement::MatrixElement(unsigned r, unsigned c, float v) // NOLINT
                     -    :
                     -row(r), col(c), value(v)
                     -{}
+                    -
                      MatrixElement::MatrixElement(unsigned r, unsigned c, const std::string &s) // NOLINT
+                         :
                      row(r), col(c), value(0.f)

src/file_parser/MtxParser.cpp

History View file @ 2ac581010

@@ -54,7 +54,7 @@ MatrixElement MtxParser::getNext()
+                     {
                          unsigned row = 0;
                          unsigned col = 0;
                     -    float val = 0.f;
                     +    std::string val;
                          mFile >> row;
                          mFile >> col;
                          mFile >> val;