Changeset 896 for library/bdm/stat

Timestamp:

04/09/10 09:31:37 (14 years ago)

Author:

mido

Message:

cleanup of MemDS and its descendants
bdmtoolbox/CMakeLists.txt slightly changed to avoid unnecessary MEX condition
"indeces" replaced by "indices"

Location:

library/bdm/stat

Files:

• discrete.cpp (modified) (1 diff)
• discrete.h (modified) (2 diffs)
• emix.h (modified) (1 diff)
• exp_family.h (modified) (1 diff)

library/bdm/stat/discrete.cpp

@@ -41 +41 @@
         for ( int j = 0; j < dim; j++ ) {
                 ind += dim_skips * ( inds ( j ) ); // add shift in linear index caused by this dimension
-                dim_skips *= gridsizes ( j );  // indeces in the next dimension are repeated with period gridsizes(j) times greater that in this dimesion
+                dim_skips *= gridsizes ( j );  // indices in the next dimension are repeated with period gridsizes(j) times greater that in this dimesion
         }
         return ind;

library/bdm/stat/discrete.h

@@ -36 +36 @@
         //! active vector for first_vec and next_vec
         vec actvec;
-        //! indeces of active vector
+        //! indices of active vector
         vec actvec_ind;
         //! length of steps in each dimension
@@ -51 +51 @@
         void initialize();
 
-        //! return vector at position given by vector of indeces
+        //! return vector at position given by vector of indices
         vec get_vec ( const ivec &inds );
 
-        //! convert dimension indeces into linear index, the indexing is in the same way as in \c next_vec()
+        //! convert dimension indices into linear index, the indexing is in the same way as in \c next_vec()
         long linear_index ( const ivec inds );
 

library/bdm/stat/emix.h

@@ -275 +275 @@
 class eprod_base: public epdf {
 protected:
-        //! Array of indeces
+        //! Array of indices
         Array<datalink*> dls;
         //! interface for a factor

library/bdm/stat/exp_family.h

@@ -294 +294 @@
                 }
                 void marginal (const RV &rvm, estudent<sq_T> &marg) const {
-                        ivec ind = rvm.findself_ids(rv); // indeces of rvm in rv
+                        ivec ind = rvm.findself_ids(rv); // indices of rvm in rv
                         marg._mu() = mu(ind);
                         marg._H() = sq_T(H,ind);