Changeset 424 for library

Timestamp:

07/22/09 10:07:52 (16 years ago)

Author:

vbarta

Message:

moved datalink tests to testsuite, added default initialization to datalink classes

Location:

library

Files:

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

library/bdm/base/bdmbase.h

@@ -461 +461 @@
   //! Remember how long val should be
   int downsize;
+
   //! Remember how long val of "Up" should be
   int upsize;
-  //! val-to-val link, indeces of the upper val
+
+  //! val-to-val link, indices of the upper val
   ivec v2v_up;
+
 public:
   //! Constructor
-  datalink() {};
-  datalink(const RV &rv, const RV &rv_up) {set_connection(rv, rv_up);};
+  datalink():downsize(0), upsize(0) { }
+  datalink(const RV &rv, const RV &rv_up) { set_connection(rv, rv_up); }
+
   //! set connection, rv must be fully present in rv_up
   void set_connection(const RV &rv, const RV &rv_up) {
     downsize = rv._dsize();
     upsize = rv_up._dsize();
-    v2v_up = (rv.dataind(rv_up));
+    v2v_up = rv.dataind(rv_up);
 
     it_assert_debug(v2v_up.length() == downsize, "rv is not fully in rv_up");
   }
-  //! set connection using indeces
+
+  //! set connection using indices
   void set_connection(int ds, int us, const ivec &upind) {
     downsize = ds;
@@ -485 +490 @@
     it_assert_debug(v2v_up.length() == downsize, "rv is not fully in rv_up");
   }
+
   //! Get val for myself from val of "Up"
   vec pushdown(const vec &val_up) {
@@ -490 +496 @@
     return get_vec(val_up, v2v_up);
   }
+
   //! Fill val of "Up" by my pieces
   void pushup(vec &val_up, const vec &val) {
@@ -498 +505 @@
 };
 
-//! data link between
+//! Data link with a condition.
 class datalink_m2e: public datalink
 {
@@ -504 +511 @@
   //! Remember how long cond should be
   int condsize;
-  //!upper_val-to-local_cond link, indeces of the upper val
+
+  //!upper_val-to-local_cond link, indices of the upper val
   ivec v2c_up;
-  //!upper_val-to-local_cond link, ideces of the local cond
+
+  //!upper_val-to-local_cond link, indices of the local cond
   ivec v2c_lo;
 
 public:
-  datalink_m2e() {};
   //! Constructor
-  void set_connection(const RV &rv,  const RV &rvc, const RV &rv_up) {
+  datalink_m2e():condsize(0) { }
+
+  void set_connection(const RV &rv, const RV &rvc, const RV &rv_up) {
     datalink::set_connection(rv, rv_up);
-    condsize =  rvc._dsize();
+    condsize = rvc._dsize();
     //establish v2c connection
     rvc.dataind(rv_up, v2c_lo, v2c_up);
   }
+
   //!Construct condition
   vec get_cond(const vec &val_up) {
@@ -524 +535 @@
     return tmp;
   }
+
   void pushup_cond(vec &val_up, const vec &val, const vec &cond) {
     it_assert_debug(downsize == val.length(), "Wrong val");
@@ -531 +543 @@
   }
 };
+
 //!DataLink is a connection between mpdf and its superordinate (Up)
 //! This class links
@@ -536 +549 @@
 {
 protected:
-  //!cond-to-cond link, indeces of the upper cond
+  //!cond-to-cond link, indices of the upper cond
   ivec c2c_up;
-  //!cond-to-cond link, indeces of the local cond
+  //!cond-to-cond link, indices of the local cond
   ivec c2c_lo;
+
 public:
   //! Constructor
@@ -549 +563 @@
     it_assert_debug(c2c_lo.length() + v2c_lo.length() == condsize, "cond is not fully given");
   }
+
   //! Get cond for myself from val and cond of "Up"
   vec get_cond(const vec &val_up, const vec &cond_up) {

library/tests/CMakeLists.txt

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

library/tests/datalink_test.cpp

@@ +1 @@
+#define BDMLIB // not an ideal way to prevent double registration of UI factories...
 #include "../bdm/stat/exp_family.h"
+#include "UnitTest++.h"
+
 using namespace bdm;
 
-int main() {
-        RV a = RV ( "{a }","2" );
-        RV b = RV ( "{b }" );
-        RV c = RV ( "{c }" );
+TEST(test_datalink) {
+    // RV names are global, and a, b and c are already taken by a
+    // different test...
+    RV a = RV("{dla }", "2");
+    RV b = RV("{dlb }");
+    RV c = RV("{dlc }");
 
-        datalink_m2m dl;dl.set_connection ( a,concat(b,c),concat(a,b), c );
+    RV ab = a;
+    ab.add(b);
 
-        vec val ( "1 1.5 2" );
-        vec cond ( "3" );
+    RV abc = ab;
+    abc.add(c);
 
-        cout << "val: " << val  << endl;
-        cout << "cond: " << cond  << endl;
+    datalink dl(ab, abc);
+    vec total("0 37 42 66");
+    vec filtered = dl.pushdown(total);
+    int exp_f[] = { 0, 37, 42 };
+    int exp_sz = sizeof(exp_f) / sizeof(exp_f[0]);
+    CHECK_EQUAL(exp_sz, filtered.size());
+    for (int i = 0; i < exp_sz; ++i) {
+        CHECK_EQUAL(exp_f[i], filtered(i));
+    }
+}
 
-        cout << "lo val: " << dl.pushdown ( val ) <<endl;
-        cout << "lo cond: " << dl.get_cond ( val,cond ) <<endl;
+TEST(test_datalink_m2e) {
+    RV a = RV("{dla }", "2");
+    RV b = RV("{dlb }");
+    RV c = RV("{dlc }");
 
-        //getchar();
-        return 0;
+    RV ab = a;
+    ab.add(b);
 
+    RV ba = a;
+    ba.add(b);
+
+    RV abc = ab;
+    abc.add(c);
+
+    datalink_m2e dl;
+    dl.set_connection(ba, c, abc);
+    vec total("0 37 42 66");
+    vec cond = dl.get_cond(total);
+    CHECK_EQUAL(1, cond.size());
+    CHECK_EQUAL(66, cond(0));
 }
+
+TEST(test_datalink_m2m) {
+    RV a = RV("{dla }", "2");
+    RV b = RV("{dlb }");
+    RV c = RV("{dlc }");
+
+    datalink_m2m dl;
+    dl.set_connection(a, concat(b, c), concat(a, b), c);
+
+    vec val("1 1.5 2");
+    vec cond("3");
+
+    vec p = dl.pushdown(val);
+    double exp_p[] = { 1.0, 1.5 };
+    int exp_sz = sizeof(exp_p) / sizeof(exp_p[0]);
+    CHECK_EQUAL(exp_sz, p.size());
+    for (int i = 0; i < exp_sz; ++i) {
+        CHECK_EQUAL(exp_p[i], p(i));
+    }
+
+    vec dlcond = dl.get_cond(val, cond);
+    int exp_c[] = { 2, 3 };
+    exp_sz = sizeof(exp_c) / sizeof(exp_c[0]);
+    CHECK_EQUAL(exp_sz, dlcond.size());
+    for (int i = 0; i < exp_sz; ++i) {
+        CHECK_EQUAL(exp_c[i], dlcond(i));
+    }
+}