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

Timestamp:

07/20/09 12:41:12 (15 years ago)

Author:

vbarta

Message:

RV partial cleanup: more arguments passed by reference, less inline functions, tests integrated into the testsuite

Files:

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

library/bdm/base/bdmbase.h

@@ -32 +32 @@
 extern Array<string> RV_NAMES;
 
-//! Structure of RV (used internally), i.e. expanded RVs - TODO tak proc je ve verejnem prostoru jmen? upravit
+//! Structure of RV, i.e. RVs expanded into a flat list of IDs, used for debugging.
 class str
 {
@@ -98 +98 @@
 private:
   //! auxiliary function used in constructor
-  void init(Array<std::string> in_names, ivec in_sizes, ivec in_times);
-  int init(const  string &name, int size);
+  void init(const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times);
+  int init(const string &name, int size);
 public:
   //! \name Constructors
@@ -105 +105 @@
 
   //! Full constructor
-  RV(Array<std::string> in_names, ivec in_sizes, ivec in_times) {init(in_names, in_sizes, in_times);};
+  RV(const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times) { init(in_names, in_sizes, in_times); }
+
   //! Constructor with times=0
-  RV(Array<std::string> in_names, ivec in_sizes) {init(in_names, in_sizes, zeros_i(in_names.length()));};
+  RV(const Array<std::string> &in_names, const ivec &in_sizes) { init(in_names, in_sizes, zeros_i(in_names.length())); }
+
   //! Constructor with sizes=1, times=0
-  RV(Array<std::string> in_names) {init(in_names, ones_i(in_names.length()), zeros_i(in_names.length()));}
+  RV(const Array<std::string> &in_names) { init(in_names, ones_i(in_names.length()), zeros_i(in_names.length())); }
+
   //! Constructor of empty RV
-  RV() : dsize(0), len(0), ids(0), times(0) {};
+  RV() : dsize(0), len(0), ids(0), times(0) {}
   //! Constructor of a single RV with given id
   RV(string name, int sz, int tm = 0);
@@ -119 +122 @@
   //!@{
 
-  //! Printing output e.g. for debugging.
+  //! State output, e.g. for debugging.
   friend std::ostream &operator<< (std::ostream &os, const RV &rv);
-  int _dsize() const {return dsize;} ;
+
+  int _dsize() const { return dsize; }
+
   //! Recount size of the corresponding data vector
   int countsize() const;
   ivec cumsizes() const;
-  int length() const {return len;} ;
-  int id(int at) const {return ids(at);};
-  int size(int at) const {return RV_SIZES(ids(at));};
-  int time(int at) const {return times(at);};
-  std::string name(int at) const {return RV_NAMES(ids(at));};
-  void set_time(int at, int time0) {times(at) = time0;};
+  int length() const {return len;}
+  int id(int at) const {return ids(at);}
+  int size(int at) const { return RV_SIZES(ids(at)); }
+  int time(int at) const { return times(at); }
+  std::string name(int at) const { return RV_NAMES(ids(at)); }
+  void set_time(int at, int time0) { times(at) = time0; }
   //!@}
 
@@ -146 +151 @@
   //! Subtract  another variable from the current one
   RV subt(const RV &rv2) const;
-  //! Select only variables at indeces ind
+  //! Select only variables at indices ind
   RV subselect(const ivec &ind) const;
-  //! Select only variables at indeces ind
-  RV operator()(const ivec &ind) const {return subselect(ind);};
+
+  //! Select only variables at indices ind
+  RV operator()(const ivec &ind) const { return subselect(ind); }
+
   //! Select from data vector starting at di1 to di2
-  RV operator()(int di1, int di2) const {
-    ivec sz = cumsizes();
-    int i1 = 0;
-    while (sz(i1) < di1) i1++;
-    int i2 = i1;
-    while (sz(i2) < di2) i2++;
-    return subselect(linspace(i1, i2));
-  };
-  //! Shift \c time shifted by delta.
+  RV operator()(int di1, int di2) const;
+
+  //! Shift \c time by delta.
   void t(int delta);
   //!@}
@@ -168 +169 @@
   //! generate \c str from rv, by expanding sizes TODO to_string..
   str tostr() const;
-  //! when this rv is a part of bigger rv, this function returns indeces of self in the data vector of the bigger crv.
+  //! when this rv is a part of bigger rv, this function returns indices of self in the data vector of the bigger crv.
   //! Then, data can be copied via: data_of_this = cdata(ind);
   ivec dataind(const RV &crv) const;
-  //! generate mutual indeces when copying data betwenn self and crv.
+  //! generate mutual indices when copying data between self and crv.
   //! Data are copied via: data_of_this(selfi) = data_of_rv2(rv2i)
   void dataind(const RV &rv2, ivec &selfi, ivec &rv2i) const;
   //! Minimum time-offset
-  int mint() const {return min(times);};
+  int mint() const {return min(times);}
   //!@}