Changeset 1192 for library/bdm/base

Timestamp:

09/17/10 14:35:13 (14 years ago)

Author:

smidl

Message:

fixes ob ProdBM

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (1 diff)
• bdmbase.h (modified) (2 diffs)

library/bdm/base/bdmbase.cpp

@@ -210 +210 @@
     rv.dataind ( rv_up, v2v_down, v2v_up );
     downsize = v2v_down.length();
-    upsize = v2v_up.length();
+    upsize = rv_up._dsize();//v2v_up.length();
 }
 

library/bdm/base/bdmbase.h

@@ -1036 +1036 @@
     };
     void connect(const RV &vecrv, const RV & vec1) {
-        bdm_assert(vecrv._dsize()==length(),"Description of this vector, "+ vecrv.to_string() +" does not math it length: " + num2str(length()));
+
+                bdm_assert(vecrv._dsize()==length(),"Description of this vector, "+ vecrv.to_string() +" does not math it length: " + num2str(length()));
         dl.set_connection(vecrv,vec1);
+                vecfromlen=vec1._dsize();
         bdm_assert(dl._downsize()==length(), "Rv of this vector, "+vecrv.to_string() +" was not found in given rv: "+vec1.to_string());
     };
+        void push_to(vec &v_up){
+                dl.pushup(*this,v_up);
+        }
+        datalink_part& _dl() {return dl;}
 };
 
@@ -1325 +1331 @@
         
         //! Sample from predictor(cond). Implemented as sampling the joint density \f$ f(y_t, \theta_t) \f$ and discarding the sample of \f$ \theta_t \f$.
-        virtual vec samplepred(const vec &cond=empty_vec) const NOT_IMPLEMENTED(empty_vec);
+        virtual vec samplepred(const vec &cond=empty_vec) NOT_IMPLEMENTED(empty_vec);
 
     //! Matrix version of logpred