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

Timestamp:

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

Author:

vbarta

Message:

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

Files:

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

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);
 };