Changeset 3033 in Sophya

Timestamp:

Jul 17, 2006, 6:06:38 PM (19 years ago)

Author:

ansari

Message:

Quelques corrections/ajout ds methode NObjMgrAdapter::GetInfoString() pour TArray/TMatrix et NTuple/DataTable , Reza 17/7/2006

Location:

trunk/SophyaPI/PIext

Files:

• nomhistadapter.cc (modified) (2 diffs)
• nomhistadapter.h (modified) (2 diffs)
• nomtarradapter.cc (modified) (1 diff)
• nomtmatvecadapter.cc (modified) (1 diff)

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -557 +557 @@
 
 /* --Methode-- */
+string NOMAdapter_NTuple::GetInfoString(vector<string>& opts)
+{
+if (opts.size() == 0) return NObjMgrAdapter::GetInfoString(opts); 
+char buff[128];
+if (opts[0] == "sizes") {
+  sprintf(buff, "%ld %ld", mNt->NEntry(), mNt->NVar());
+  return string(buff);   
+}
+else if ((opts[0] == "nlines") || (opts[0] == "nentry") || (opts[0] == "nrows")) {
+  sprintf(buff, "%ld", mNt->NEntry());
+  return string(buff);   
+}
+else if ((opts[0] == "nvar") || (opts[0] == "ncols")) {
+  sprintf(buff, "%ld", mNt->NVar());
+  return string(buff);   
+}
+else return NObjMgrAdapter::GetInfoString(opts);
+}
+
+/* --Methode-- */
 void NOMAdapter_NTuple::Print(ostream& os, int lev)
 {
 mNt->Show(os);
-if (lev > 0) os << mNt->Info();
+if (lev > 2) os << mNt->Info();
+if (lev > 0) mNt->Print(0, 10*lev);
 }
 
@@ -706 +727 @@
 
 /* --Methode-- */
+string NOMAdapter_DataTable::GetInfoString(vector<string>& opts)
+{
+if (opts.size() == 0) return NObjMgrAdapter::GetInfoString(opts); 
+char buff[128];
+if (opts[0] == "sizes") {
+  sprintf(buff, "%ld %ld", mDT->NEntry(), mDT->NVar());
+  return string(buff);   
+}
+else if ((opts[0] == "nlines") || (opts[0] == "nentry") || (opts[0] == "nrows")) {
+  sprintf(buff, "%ld", mDT->NEntry());
+  return string(buff);   
+}
+else if ((opts[0] == "nvar") || (opts[0] == "ncols")) {
+  sprintf(buff, "%ld", mDT->NVar());
+  return string(buff);   
+}
+else return NObjMgrAdapter::GetInfoString(opts);
+}
+
+/* --Methode-- */
 void NOMAdapter_DataTable::Print(ostream& os, int lev)
 {

trunk/SophyaPI/PIext/nomhistadapter.h

@@ -134 +134 @@
   virtual void                  SavePPF(POutPersist& s, string const & nom);
 
+  virtual string                GetInfoString(vector<string>& opts);
   virtual void                  Print(ostream& os, int lev=0);
   virtual NTupleInterface*      GetNTupleInterface(bool& adel);
@@ -182 +183 @@
   virtual void                  SavePPF(POutPersist& s, string const & nom);
 
+  virtual string                GetInfoString(vector<string>& opts);
   virtual void                  Print(ostream& os, int lev=0);
   virtual NTupleInterface*      GetNTupleInterface(bool& adel);

trunk/SophyaPI/PIext/nomtarradapter.cc

@@ -78 +78 @@
     }
     if (opts[0] == "sizes") {
-      for(int_4 kd=0; kd<mArr->Rank(); kd++) 
-        sprintf(buff,"%ld ", (long)mArr->Size(kd));
-      return string(buff);      
+      string rs;
+      for(int_4 kd=0; kd<mArr->Rank(); kd++) {
+        sprintf(buff, "%ld ", (long)mArr->Size(kd)); 
+        rs += buff;
+      }
+      return rs;      
     }
     else if ((opts[0] == "size") || (opts[0] == "nelts")) {

trunk/SophyaPI/PIext/nomtmatvecadapter.cc

@@ -89 +89 @@
       char buff[32];
       sprintf(buff, "%ld", (long)mMtx->Size()); 
+      return string(buff);
+    }
+    else if ((opts[0] == "nrow") || (opts[0] == "nrows")) {
+      char buff[32];
+      sprintf(buff, "%ld", (long)mMtx->NRows()); 
+      return string(buff);
+    }
+    else if ((opts[0] == "ncol") || (opts[0] == "ncols")) {
+      char buff[32];
+      sprintf(buff, "%ld", (long)mMtx->NCols()); 
       return string(buff);
     }