Changeset 896 for library/bdm/base/bdmbase.h

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"

Files:

• library/bdm/base/bdmbase.h (modified) (6 diffs)

library/bdm/base/bdmbase.h

@@ -594 +594 @@
         //!@}
         void from_setting ( const Setting &set ) {
+                root::from_setting( set );
                 shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::optional );
                 if ( r ) {
@@ -740 +741 @@
 class datalink_part : public datalink {
 protected:
-        //! indeces of values in vector downsize
+        //! indices of values in vector downsize
         ivec v2v_down;
 public:
@@ -760 +761 @@
         //! rv of the history
         RV Hrv;
-        //! h2v : indeces in down
+        //! h2v : indices in down
         ivec h2v_down;
-        //! h2v : indeces in history
+        //! h2v : indices in history
         ivec h2v_hist;
-        //! v2h: indeces of up too be pushed to h
+        //! v2h: indices of up too be pushed to h
         ivec v2h_up;
 public:
@@ -932 +933 @@
         virtual void getdata ( vec &dt ) const = 0;
 
-        //! Returns data records at indeces. Default is inefficent.
-        virtual void getdata ( vec &dt, const ivec &indeces ) {
+        //! Returns data records at indices. Default is inefficent.
+        virtual void getdata ( vec &dt, const ivec &indices ) {
                 vec tmp(dtsize);
                 getdata(tmp);
-                dt = tmp(indeces);
+                dt = tmp(indices);
         };
 
@@ -942 +943 @@
         virtual void write ( const vec &ut ) NOT_IMPLEMENTED_VOID;
 
-        //! Accepts action variables at specific indeces
-        virtual void write ( const vec &ut, const ivec &indeces ) NOT_IMPLEMENTED_VOID;
+        //! Accepts action variables at specific indices
+        virtual void write ( const vec &ut, const ivec &indices ) NOT_IMPLEMENTED_VOID;
 
         //! Moves from \f$ t \f$ to \f$ t+1 \f$, i.e. perfroms the actions and reads response of the system.
@@ -960 +961 @@
                 return Urv;
         }
+
         //! set random variables
         virtual void set_drv ( const  RV &drv, const RV &urv) {