Changeset 2891 in Sophya

Timestamp:

Jan 9, 2006, 6:35:53 PM (20 years ago)

Author:

ansari

Message:

Corrections AddRow() au lieu de AddLine ds swppfdtable.h .cc - Reza 9/01/2006

Location:

trunk/SophyaLib/HiStats

Files:

• basedtable.cc (modified) (1 diff)
• swppfdtable.cc (modified) (4 diffs)
• swppfdtable.h (modified) (1 diff)

trunk/SophyaLib/HiStats/basedtable.cc

@@ -306 +306 @@
 //! Adds a row (or line) to the table with input data as DataTableRow object
 /*! 
-  The internal MuTyV array of the object contains the date and the 
+  The internal MuTyV array of the object contains the data and the 
   MuTyV class conversion operators are used to match against each 
   cell data type.

trunk/SophyaLib/HiStats/swppfdtable.cc

@@ -42 +42 @@
    dt.AddDoubleColumn("X0X0pX1X1_d");
    // Fill the table
-   MuTyV x[5];
+   r_8 x[5];
    for(int i=0; i<63; i++) {
      x[0] = (i%9)-4.;  x[1] = (i/9)-3.;  x[2] = x[0]*x[0]+x[1]*x[1];
-     dt.AddLine(x);
+     dt.AddRow(x);
    }
    // Printing table info
@@ -346 +346 @@
 }
 
-//! Adds a line (or row to the table) with r_8* input data.
+//! Adds a row (or line to the table) with r_8* input data.
 /*! 
   The min/max values for each column is updated, in addition 
-  to the actions performed by the base class AddLine()
-*/
-sa_size_t SwPPFDataTable::AddLine(const r_8* data)
+  to the actions performed by the base class AddRow()
+*/
+sa_size_t SwPPFDataTable::AddRow(const r_8* data)
 {
   // On est oblige de calculer les min-max lors du remplissage
@@ -361 +361 @@
     mMinMaxNEnt[k]++;
   }
-  return BaseDataTable::AddLine(data);
-}
-
-//! Adds a line (or row to the table) with input data as an array of MuTyV
+  return BaseDataTable::AddRow(data);
+}
+
+//! Adds a row (or line to the table) with input data as an array of MuTyV
 /*! 
   The min/max values for each column is updated, in addition 
   to the actions performed by the base class AddLine()
 */
-sa_size_t SwPPFDataTable::AddLine(const MuTyV * data)
+sa_size_t SwPPFDataTable::AddRow(const MuTyV * data)
 {
   // On est oblige de calculer les min-max lors du remplissage
@@ -379 +379 @@
     mMinMaxNEnt[k]++;
   }
-  return BaseDataTable::AddLine(data);
-}
-
+  return BaseDataTable::AddRow(data);
+}
+

trunk/SophyaLib/HiStats/swppfdtable.h

@@ -26 +26 @@
   virtual sa_size_t AddColumn(FieldType ft, string const & cnom);
 
-  // Filling data structures (adding lines)
-  virtual sa_size_t AddLine(const r_8* data);
-  virtual sa_size_t AddLine(const MuTyV * data);
+  // Filling data structures (adding lines/rows)
+  virtual sa_size_t AddRow(const r_8* data);
+  virtual sa_size_t AddRow(const MuTyV * data);
 
+  //! Equal (copy) operator - Copies the data and the structure if necessary from \b a   
+  inline  SwPPFDataTable& operator = (BaseDataTable const& a) 
+  { CopyMerge(a, true) ; return *this ; } 
   //! Equal (copy) operator - Copies the structure and shares the data \b a   
-  inline SwPPFDataTable& operator = (SwPPFDataTable const& a) 
+  inline SwPPFDataTable&  operator = (SwPPFDataTable const& a) 
   { Clear(); Share(a); return *this ; }