From 65c29cd8900361dac0cdf3a2aaff0075d74810ac Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Fri, 12 Sep 2008 15:17:44 +0000
Subject: [PATCH] moved isNumber to miscmaths
---
miscmaths.cc | 22 ++++++++++------------
miscmaths.h | 2 +-
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/miscmaths.cc b/miscmaths.cc
index e83d17d..6f303fa 100644
--- a/miscmaths.cc
+++ b/miscmaths.cc
@@ -56,17 +56,15 @@ namespace MISCMATHS {
}
}
-
// General string/IO functions
-
- bool isnum(const string& str)
+ bool isNumber( const string& input)
{
- // assumes that initial whitespace has been removed
- if (isdigit(str[0])) return true;
- if ( (str[0]=='-') || (str[0]=='+') || (str[0]=='.') ) return true;
- return false;
- }
-
+ char *pend;
+ strtod(input.c_str(),&pend);
+ if (*pend!='\0') return false;
+ return true;
+ }
+
string skip_alpha(ifstream& fs)
{
string cline;
@@ -77,7 +75,7 @@ namespace MISCMATHS {
istringstream ss(cline.c_str());
string cc="";
ss >> cc;
- if (isnum(cc)) {
+ if (isNumber(cc)) {
if (!fs.eof()) { fs.seekg(curpos); } else { fs.clear(); fs.seekg(0,ios::beg); }
return cline;
}
@@ -124,7 +122,7 @@ namespace MISCMATHS {
for (int c=1; c<=ncols; c++) {
if (!fs.eof()) {
fs >> ss;
- while ( !isnum(ss) && !fs.eof() ) {
+ while ( !isNumber(ss) && !fs.eof() ) {
fs >> ss;
}
mat(r,c) = atof(ss.c_str());
@@ -177,7 +175,7 @@ namespace MISCMATHS {
istringstream ss(cline.c_str());
string cc="";
ss >> cc;
- if (!isnum(cc)) break; // stop processing when non-numeric line found
+ if (!isNumber(cc)) break; // stop processing when non-numeric line found
rcount++; // add new row to matrix
} while (!fs.eof());
diff --git a/miscmaths.h b/miscmaths.h
index 234dbba..d3e44ec 100644
--- a/miscmaths.h
+++ b/miscmaths.h
@@ -49,7 +49,7 @@ namespace MISCMATHS {
#endif
string size(const Matrix& mat);
- bool isnum(const string& str);
+ bool isNumber(const string& str);
ReturnMatrix read_ascii_matrix(const string& filename, int nrows, int ncols);
ReturnMatrix read_ascii_matrix(int nrows, int ncols, const string& filename);
ReturnMatrix read_ascii_matrix(const string& filename);
--
GitLab