Changeset 3874 in Sophya for trunk/SophyaLib

Timestamp:

Sep 7, 2010, 7:48:49 PM (15 years ago)

Author:

ansari

Message:

Ajout gestion lignes commentaires ds les fichiers input de SLinInterp1D, Reza 07/09/2010

Location:

trunk/SophyaLib/NTools

Files:

• slininterp.cc (modified) (4 diffs)
• slininterp.h (modified) (1 diff)

trunk/SophyaLib/NTools/slininterp.cc

@@ -175 +175 @@
 
 
-/* --Methode-- */
-size_t SLinInterp1D::ReadYFromFile(string const& filename, double xmin, double xmax)
+/*!
+  \brief Read  Y values from the file \b filename
+
+  Read Y values ( one/line) for regularly spaced X's from file \b filename and call 
+  DefinePoints(xmin, xmax, yreg). Return the number of Y values read.
+  \param filename : input file name 
+  \param xmin,xamx : X range limits 
+  \param clm : comment character, lines starting with \b clm are ignored 
+*/
+size_t SLinInterp1D::ReadYFromFile(string const& filename, double xmin, double xmax, char clm)
 {
   ifstream inputFile;
@@ -192 +200 @@
   size_t cnt=0;
   double cola;
+  string eline;
   while(!inputFile.eof())  { 
     inputFile.clear(); 
+    if (inputFile.peek() == (int)clm)  {  // skip comment lines 
+      getline(inputFile, eline);
+      continue;
+    }
     inputFile >> cola; 
     if ( (!inputFile.good()) || inputFile.eof())   break;
+    inputFile.ignore(1024,'\n');  // make sure we go to the next line
     //cout << cola<< "    "<<colb<<endl;
     ysv.push_back(cola);
@@ -206 +220 @@
 }
 
-/* --Methode-- */
-size_t SLinInterp1D::ReadXYFromFile(string const& filename, double xmin, double xmax, size_t npt)
+/*!
+  \brief Read pairs of  ( X Y ) values from file \b filename 
+
+  Read pairs of (X Y) values, one pair / line from the specified file and call DefinePoints(xs, ys ...).
+  One pair of space or tab separated numbers on each line. Return the number of Y values read.
+  \param filename : input file name 
+  \param xmin,xamx : X range limits. use the X limits from the file if xmax<xmin
+  \param npt : number of points for regularly spaced interpolation points
+  \param clm : comment character, lines starting with \b clm are ignored 
+*/
+size_t SLinInterp1D::ReadXYFromFile(string const& filename, double xmin, double xmax, size_t npt, char clm)
 {
   ifstream inputFile;
@@ -223 +246 @@
   size_t cnt=0;
   double cola, colb;
+  string eline;
   while(!inputFile.eof())  {  
     inputFile.clear();
+    if (inputFile.peek() == (int)clm)  {  // skip comment lines 
+      getline(inputFile, eline);
+      continue;
+    }
     inputFile >> cola >> colb; 
     if ( (!inputFile.good()) || inputFile.eof())   break;
-    // cout << " DEBUG - cnt=" << cnt << " x=" << cola << "  y= "<<colb<<endl;
+    inputFile.ignore(1024,'\n');  // make sure we go to the next line
+    //    cout << " DEBUG-GCount " << inputFile.gcount() << endl;
+    //    cout << " DEBUG - cnt=" << cnt << " x=" << cola << "  y= "<<colb<<endl;
     xsv.push_back(cola);
     ysv.push_back(colb);

trunk/SophyaLib/NTools/slininterp.h

@@ -55 +55 @@
   void DefinePoints(vector<double>& xs, vector<double>& ys, double xmin=1., double xmax=-1., size_t npt=0); 
 
-  //! Read  Y's  ( one  / line) for regularly spaced X's from file and call DefinePoints(xmin, xmax, yreg)
-  size_t ReadYFromFile(string const& filename, double xmin, double xmax);
-  //! Read pairs of X Y ( one pair / line) from file and call DefinePoints(xs, ys ...)
-  size_t ReadXYFromFile(string const& filename, double xmin=1., double xmax=-1., size_t npt=0);
+  // Read  Y's (one/line) for regularly spaced X's from file and call DefinePoints(xmin, xmax, yreg)
+  size_t ReadYFromFile(string const& filename, double xmin, double xmax, char clm='#');
+  // Read pairs of X Y (one pair/line) from file and call DefinePoints(xs, ys ...)
+  size_t ReadXYFromFile(string const& filename, double xmin=1., double xmax=-1., size_t npt=0, char clm='#');
   
   vector<double>& GetVX()  { return xs_; }