Changeset 2289 in Sophya

Timestamp:

Dec 5, 2002, 3:27:27 PM (23 years ago)

Author:

cmv

Message:

option separateur et comment line dans mtxfrascii rz 5/12/02

File:

• trunk/SophyaPI/PIext/basexecut.cc (modified) (5 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -779 +779 @@
 else if ((kw == "mtxfrascii") || (kw == "vecfrascii") ) {
   if(tokens.size() < 2) { 
-    cout<<"Usage: mtxfrascii/vecfrascii mtx/vec_name file_name "<<endl;
+    cout<<"Usage: mtxfrascii/vecfrascii mtx/vec_name file_name [CommLine Separator]"<<endl;
     return(0);
     }
@@ -792 +792 @@
   ifstream is(tokens[1].c_str());
   sa_size_t nr, nc;
+  char clm = '#';
+  string sep = " \t";
+  if (tokens.size()>2) clm = tokens[2][0];
+  if (tokens.size()>3) sep = tokens[3];
   if (kw == "mtxfrascii") {
-    mtx.ReadASCII(is, nr, nc);
+    mtx.ReadASCII(is, nr, nc, clm, sep.c_str());
     mObjMgr->AddObj(mtx, tokens[0]);    
     cout << "mtxfrascii: TMatrix<r_8> " << tokens[0] << " read from file " 
@@ -799 +803 @@
   }
   else {
-    vec.ReadASCII(is, nr, nc);
+    vec.ReadASCII(is, nr, nc, clm, sep.c_str());
     mObjMgr->AddObj(vec, tokens[0]);    
     cout << "vecfrascii: TVector<r_8> " << tokens[0] << " read from file " 
@@ -1257 +1261 @@
 kw = "mtxfrascii";
 usage = "Reads a matrix from an ASCII file (TMatrix<r_8>)";
-usage += "\n Usage: mtxfrascii mtx_name file_name";
+usage += "\n Usage: mtxfrascii mtx_name file_name [CommChar Separator]";
 usage += "\n  Related commands: arrtoascii vecfrascii ntfrascii ";
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
@@ -1263 +1267 @@
 usage = "Reads a vector from an ASCII file (TVector<r_8>)";
 usage += "\n Usage: vecfrascii vec_name file_name";
-usage += "\n  Related commands: arrtoascii mtxfrascii ntfrascii ";
+usage += "\n  Related commands: arrtoascii mtxfrascii ntfrascii [CommChar Separator]";
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
 kw = "arrtoascii";