sync of some files with Annotationi.cpp

include/hdhC.h

@@ -145,14 +145,15 @@ T clearLeastBits( T v, size_t shft=2);
         op: "<"  --> x + e < y \n
         op: ">"  --> x > y + e
 */
+/*
 bool
-compare(double x, double y,
-           std::string op="eq", double epsilon=NUMERICAL_TOLERANCE);
+compare(double x, std::string op, double y,
+           double epsilon=NUMERICAL_TOLERANCE);
+*/
 
 /*! epsilon is 10^-DECS of the smaller value of the magnitude of x and y*/
 bool
-compare(double x, double y,
-           std::string op="eq", int DECS=10);
+compare(double x, char op, double y, int DECS=10);
 
 //! Convert time
 /*! Time given in a certain unit is converted to a target unit.

include/readline.h

@@ -91,11 +91,11 @@ class ReadLine
 
 //! Get i-th item from line.
   std::string
-    getItem( size_t i);
+    getItem(size_t i) { return split[i]; }
 
 //! Get a vector filled with the line items.
   std::vector<std::string>
-    getItems( void );
+    getItems(void) { return split.getItems(); }
 
 //! Get range of items filled into a vector.
 /*! By default, range starts at index 'beg' to the end of the line.*/

src/InFile.cpp

@@ -575,10 +575,11 @@ InFile::init(void)
       std::string table="*";
       std::string level="L1";
       std::string task="";
+      std::vector<std::string> freq;
       std::vector<std::string> value;
-       std::vector<size_t> xRecord_01;
+      std::vector<size_t> xRecord_01;
 
-     	notes->push_front(key , "*", level, table, task, "", value,
+     	notes->push_front(key , "*", freq, level, table, task, "", value,
 	                         xRecord_01, xRecord_01);
       notes->inq(key);
 

src/NcAPI.cpp

@@ -2190,11 +2190,8 @@ NcAPI::getAttString(std::string attName, std::string varName)
   getAttValues(vs, attName, varName);
   if( vs.size() )
     return vs[0];
-  else
-  {
-    std::string s;
-    return s;
-  }
+
+  return "";
 }
 
 std::string

src/ReadLine.cpp

@@ -149,18 +149,6 @@ ReadLine::findLine( std::string &rline, std::string &str, int opos )
   return is;
 }
 
-std::string
-ReadLine::getItem( size_t index)
-{
-   return split[index] ;
-}
-
-std::vector<std::string>
-ReadLine::getItems( void)
-{
-   return split.getItems() ;
-}
-
 std::vector<std::string>
 ReadLine::getItems( size_t beg, size_t end )
 {

src/hdhC.cpp

@@ -215,7 +215,8 @@ T clearLeastBits( T v, size_t shft)
   return v;
 }
 
-bool compare(double x, double y, char op, double epsilon)
+/*
+bool compare(double x, char op, double y, double epsilon)
 {
   // compare x and y within uncertainty ranges e
   // modes: op: '=' --> x == y
@@ -251,9 +252,10 @@ bool compare(double x, double y, char op, double epsilon)
 
   return false;
 }
+*/
 
 bool
-compare(double x, double y, char op, int decimals)
+compare(double x, char op, double y, int decimals)
 {
   // fabs( (x + x*10^-decimals) op (y + y*10^-decimals )
 
@@ -737,7 +739,7 @@ void envelope( std::vector<double> &x, std::vector<double> &y,
 template<typename T>
 bool equal(T x1, T x2, double epsilon)
 {
-  // Is (x1-x2) == 0 under the constraint of comuter inaccuracies?
+  // Is (x1-x2) == 0 under the constraint of computer inaccuracies?
   // Get the magnitude and compare values to an adjusted epsilon.
 
   // return: true if fabs(x1-x2) < magnitude*epsilon