Changeset 422

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

Location:

library

Files:

• bdm/base/bdmbase.cpp (modified) (2 diffs)
• bdm/base/bdmbase.h (modified) (6 diffs)
• tests/CMakeLists.txt (modified) (2 diffs)
• tests/rv_test.cpp (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -55 +55 @@
 }
 
-void RV::init ( Array<std::string> in_names, ivec in_sizes,ivec in_times ) {
+void RV::init(const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times)
+{
         len = in_names.length();
         it_assert_debug ( in_names.length() ==in_times.length(), "check \"times\" " );
@@ -106 +107 @@
         ret.dsize=ret.countsize();
         return ret;
+}
+
+RV 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));
 }
 

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);}
   //!@}
 

library/tests/CMakeLists.txt

@@ -11 +11 @@
 
 # BASIC EXECS
-EXEC(rv_test)
 EXEC(datalink_test)
 EXEC(loggers_test)
@@ -42 +41 @@
 
 # using UnitTest++
-add_executable(testsuite testsuite.cpp test_user_info.cpp test_shared_ptr.cpp)
+add_executable(testsuite rv_test.cpp testsuite.cpp test_user_info.cpp test_shared_ptr.cpp)
 target_link_libraries(testsuite bdm itpp unittest)
 

library/tests/rv_test.cpp

@@ -1 @@
-
+#include <string>
+#include <sstream>
 #include "../bdm/base/bdmbase.h"
 #include "../bdm/math/square_mat.h"
 #include "../bdm/math/chmat.h"
+#include "UnitTest++.h"
 
 using namespace bdm;
 
-//These lines are needed for use of cout and endl
-using std::cout;
-using std::endl;
+TEST(test_rv)
+{
+    RV a = RV("{a }", "3");
+    CHECK_EQUAL(1, a.length());
+    CHECK_EQUAL(3, a.size(0));
+    CHECK_EQUAL(std::string("a"), a.name(0));
 
-int main()
-{
-        RV a = RV ( "{a }","3");
-        RV b = RV ( "{b }","2");
-        RV c = RV ( "{c }");
-        RV ef = RV ("{e f }");
+    RV b = RV("{b }", "2");
+    CHECK_EQUAL(0, b.mint());
+
+    RV c = RV("{c }");
+    CHECK_EQUAL(1, c.length());
+    CHECK_EQUAL(1, c.size(0));
+
+    RV trv = RV("{e f }", "1 2", "3 4");
+    CHECK_EQUAL(2, trv.length());
+    CHECK_EQUAL(3, trv.mint());
+
+    // add a and b
+    RV ab = a;
+    bool added = ab.add(b);
+    CHECK(added);
+    CHECK_EQUAL(2, ab.length());
+    CHECK_EQUAL(3, ab.size(0));
+    CHECK_EQUAL(std::string("a"), ab.name(0));
+    CHECK_EQUAL(2, ab.size(1));
+    CHECK_EQUAL(std::string("b"), ab.name(1));
+
+    std::stringstream abss;
+    abss << ab;
+    CHECK_EQUAL(std::string("1(3)=a_{0}; 2(2)=b_{0}; "), abss.str());
+
+    // concat a, b and c
+    RV abc = concat(ab, c);
+    CHECK_EQUAL(3, abc.length());
+    std::stringstream abcss;
+    abcss << abc;
+    CHECK_EQUAL(std::string("1(3)=a_{0}; 2(2)=b_{0}; 3(1)=c_{0}; "), abcss.str());
+
+    // structure of a, b, c
+    str s = abc.tostr();
+    int exp_ids[] = { 1, 1, 1, 2, 2, 3 };
+    int exp_sz = sizeof(exp_ids) / sizeof(exp_ids[0]);
+    CHECK_EQUAL(exp_sz, s.ids.size());
+    CHECK_EQUAL(exp_sz, s.times.size());
+    for (int i = 0; i < exp_sz; ++i) {
+        CHECK_EQUAL(exp_ids[i], s.ids(i));
+        CHECK_EQUAL(0, s.times(i));
+    }
+
+    RV slice = abc(1, 2);
+    CHECK_EQUAL(1, slice.length());
+    CHECK_EQUAL(3, slice.size(0));
+    CHECK_EQUAL(std::string("a"), slice.name(0));
+
+    // find a in abc
+    ivec f = a.findself(abc);
+    CHECK_EQUAL(1, f.length());
+    CHECK_EQUAL(0, f(0));
+
+    // find abc in a
+    f = abc.findself(a);
+    int exp_indices[] = { 0, -1, -1 };
+    CHECK_EQUAL(3, f.length());
+    for (unsigned i = 0;
+         i < sizeof(exp_indices) / sizeof(exp_indices[0]);
+         ++i) {
+        CHECK_EQUAL(exp_indices[i], f(i));
+    }
+
+    // subtract b from abc
+    RV ac = abc.subt(b);
+    std::stringstream acss;
+    acss << ac;
+    CHECK_EQUAL(std::string("1(3)=a_{0}; 3(1)=c_{0}; "), acss.str());
+
+    // data index of ac in abc
+    ivec di = ac.dataind(abc);
+    int exp_di[] = { 0, 1, 2, 5 };
+    exp_sz = sizeof(exp_di) / sizeof(exp_di[0]);
+    CHECK_EQUAL(exp_sz, di.size());
+    for (int i = 0; i < exp_sz; ++i) {
+        CHECK_EQUAL(exp_di[i], di(i));
+    }
+
+    // Copy indices between ba and ab
+    RV ba = b;
+    ba.add(a);
         
-        cout << "Add a and b"<<endl;
-        RV ab = a;
-        ab.add(b);
-        cout << ab <<endl;
-        
-        cout << "Concat a,b and c "<<endl;
-        RV abc = concat(ab,c);
-        cout << abc <<endl;
-        cout << "Structure of a,b,c "<<endl;
-        str s =abc.tostr();
-        cout << s.ids <<endl;
-        cout << s.times <<endl;
-                
-        cout << "Find a in abc "<<endl;
-        cout << a.findself(abc)<<endl;
-        cout << "Find abc in a "<<endl;
-        cout << abc.findself(a)<<endl;
-        
-        cout << "Subtract b from abc"<<endl;
-        RV ac = abc.subt(b);
-        cout << ac <<endl;
-        
-        cout << "Data index of ac in abc"<<endl;
-        cout << ac.dataind(abc) <<endl;
-        
-        cout<< "copy indeces between ba and ab" << endl;
-        RV ba = b;
-        ba.add(a);
-        
-        ivec ai;
-        ivec bi;
-        ba.dataind(ac,ai,bi);
-        cout << "ba(" << ai <<")=ac(" << bi <<")"<<endl;
-        
-        //Exit program:
-        
-        //getchar();
-        return 0;
+    ivec ai;
+    ivec bi;
+    ba.dataind(ac, ai, bi);
 
+    int exp_ai[] = { 2, 3, 4 };
+    exp_sz = sizeof(exp_ai) / sizeof(exp_ai[0]);
+    CHECK_EQUAL(exp_sz, ai.size());
+    for (unsigned i = 0;
+         i < sizeof(exp_ai) / sizeof(exp_ai[0]);
+         ++i) {
+        CHECK_EQUAL(exp_ai[i], ai(i));
+    }
+
+    int exp_bi[] = { 0, 1, 2 };
+    exp_sz = sizeof(exp_bi) / sizeof(exp_bi[0]);
+    CHECK_EQUAL(exp_sz, bi.size());
+    for (unsigned i = 0;
+         i < sizeof(exp_bi) / sizeof(exp_bi[0]);
+         ++i) {
+        CHECK_EQUAL(exp_bi[i], bi(i));
+    }
 }