Changeset 286 for bdm/stat/libBM.h

Timestamp:

03/05/09 14:03:35 (15 years ago)

Author:

smidl

Message:

make mpdm work again

Files:

• bdm/stat/libBM.h (modified) (5 diffs)

bdm/stat/libBM.h

@@ -261 +261 @@
         //! Lower and upper bounds of \c percentage % quantile, returns mean-2*sigma as default
         virtual void qbounds ( vec &lb, vec &ub, double percentage=0.95 ) const {
-                vec mea=mean(); vec std=sqrt(variance()); 
+                vec mea=mean(); vec std=sqrt ( variance() );
                 lb = mea-2*std; ub=mea+2*std;
         };
@@ -401 +401 @@
                 it_assert_debug ( v2v_up.length() ==downsize,"rv is not fully in rv_up" );
         }
+        //! set connection using indeces
+        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" );
+        }
         //! Get val for myself from val of "Up"
         vec pushdown ( const vec &val_up ) {
@@ -425 +433 @@
 
 public:
+        datalink_m2e() {};
         //! Constructor
-        datalink_m2e ( const RV &rv,  const RV &rvc, const RV &rv_up ) :
-                        datalink ( rv,rv_up ), condsize ( rvc._dsize() ) {
+        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 );
@@ -454 +464 @@
 public:
         //! Constructor
-        datalink_m2m ( const RV &rv, const RV &rvc, const RV &rv_up, const RV &rvc_up ) :
-                        datalink_m2e ( rv, rvc, rv_up ) {
+        datalink_m2m() {};
+        void set_connection ( const RV &rv, const RV &rvc, const RV &rv_up, const RV &rvc_up ) {
+                datalink_m2e::set_connection ( rv, rvc, rv_up );
                 //establish c2c connection
                 rvc.dataind ( rvc_up, c2c_lo, c2c_up );
@@ -714 +725 @@
                 if ( opt_L_bounds ) {
                         vec ub,lb;
-                        posterior().qbounds(lb,ub);
+                        posterior().qbounds ( lb,ub );
                         L->logit ( LIDs ( 1 ), lb );
                         L->logit ( LIDs ( 2 ), ub );