Changeset 545

Timestamp:

08/18/09 09:38:41 (15 years ago)

Author:

vbarta

Message:

moved some datalink method bodies to bdmbase.cpp; more datalink tests

Location:

library

Files:

• bdm/base/bdmbase.cpp (modified) (1 diff)
• bdm/base/bdmbase.h (modified) (3 diffs)
• tests/datalink_test.cpp (modified) (3 diffs)

library/bdm/base/bdmbase.cpp

@@ -189 +189 @@
 }
 
+void datalink::set_connection (const RV &rv, const RV &rv_up) {
+        downsize = rv._dsize();
+        upsize = rv_up._dsize();
+        v2v_up = rv.dataind (rv_up);
+
+        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
+}
+
+void datalink::set_connection (int ds, int us, const ivec &upind) {
+        downsize = ds;
+        upsize = us;
+        v2v_up = upind;
+
+        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
+}
+
+void datalink_m2e::set_connection (const RV &rv, const RV &rvc, const RV &rv_up) {
+        datalink::set_connection (rv, rv_up);
+        condsize = rvc._dsize();
+        //establish v2c connection
+        rvc.dataind (rv_up, v2c_lo, v2c_up);
+}
+
+vec datalink_m2e::get_cond (const vec &val_up) {
+        vec tmp (condsize);
+        set_subvector (tmp, v2c_lo, val_up (v2c_up));
+        return tmp;
+}
+
+void datalink_m2e::pushup_cond (vec &val_up, const vec &val, const vec &cond) {
+        it_assert_debug (downsize == val.length(), "Wrong val");
+        it_assert_debug (upsize == val_up.length(), "Wrong val_up");
+        set_subvector (val_up, v2v_up, val);
+        set_subvector (val_up, v2c_up, cond);
+}
+
 std::ostream &operator<< ( std::ostream &os, const RV &rv ) {
         int id;

library/bdm/base/bdmbase.h

@@ -557 +557 @@
                 //! Constructor
                 datalink() : downsize (0), upsize (0) { }
-                //! Conevnience constructor
+
+                //! Convenience constructor
                 datalink (const RV &rv, const RV &rv_up) {
                         set_connection (rv, rv_up);
@@ -563 +564 @@
 
                 //! 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);
-
-                        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
-                }
+                void set_connection (const RV &rv, const RV &rv_up);
 
                 //! set connection using indices
-                void set_connection (int ds, int us, const ivec &upind) {
-                        downsize = ds;
-                        upsize = us;
-                        v2v_up = upind;
-
-                        it_assert_debug (v2v_up.length() == downsize, "rv is not fully in rv_up");
-                }
+                void set_connection (int ds, int us, const ivec &upind);
 
                 //! Get val for myself from val of "Up"
@@ -610 +599 @@
                 //! Constructor
                 datalink_m2e() : condsize (0) { }
+
                 //! Set connection between vectors
-                void set_connection (const RV &rv, const RV &rvc, const RV &rv_up) {
-                        datalink::set_connection (rv, rv_up);
-                        condsize = rvc._dsize();
-                        //establish v2c connection
-                        rvc.dataind (rv_up, v2c_lo, v2c_up);
-                }
+                void set_connection (const RV &rv, const RV &rvc, const RV &rv_up);
 
                 //!Construct condition
-                vec get_cond (const vec &val_up) {
-                        vec tmp (condsize);
-                        set_subvector (tmp, v2c_lo, val_up (v2c_up));
-                        return tmp;
-                }
+                vec get_cond (const vec &val_up);
+
                 //! Copy corresponding values to Up.condition
-                void pushup_cond (vec &val_up, const vec &val, const vec &cond) {
-                        it_assert_debug (downsize == val.length(), "Wrong val");
-                        it_assert_debug (upsize == val_up.length(), "Wrong val_up");
-                        set_subvector (val_up, v2v_up, val);
-                        set_subvector (val_up, v2c_up, cond);
-                }
+                void pushup_cond (vec &val_up, const vec &val, const vec &cond);
 };
 

library/tests/datalink_test.cpp

@@ -1 +1 @@
 #include "../bdm/stat/exp_family.h"
+#include "mat_checks.h"
 #include "UnitTest++.h"
 
@@ -26 +27 @@
                 CHECK_EQUAL ( exp_f[i], filtered ( i ) );
         }
+
+        datalink unnamed;
+        unnamed.set_connection ( 1, 2, ivec ( "0" ) );
+        filtered = unnamed.pushdown ( vec ( "37 42" ) );
+        CHECK_EQUAL ( vec ( "37" ), filtered );
 }
 
@@ -48 +54 @@
         CHECK_EQUAL ( 1, cond.size() );
         CHECK_EQUAL ( 66, cond ( 0 ) );
+
+        vec big ( 4 );
+        dl.pushup_cond ( big, vec ( "2 3 5" ), vec ( "7" ) );
+        CHECK_EQUAL ( vec ( "2 3 5 7" ), big );
 }