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

Timestamp:

06/22/09 13:17:49 (15 years ago)

Author:

smidl

Message:

merging works for merger_mx

Files:

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

library/bdm/base/bdmbase.h

@@ -268 +268 @@
   //! Compute log-probability of multiple values argument \c val
   virtual vec evallog_m(const mat &Val) const {
-    vec x(Val.cols());
-    for (int i = 0; i < Val.cols(); i++) {x(i) = evallog(Val.get_col(i)) ;}
-    return x;
+          vec x(Val.cols());
+          for (int i = 0; i < Val.cols(); i++) {x(i) = evallog(Val.get_col(i)) ;}
+          return x;
+  }
+  //! Compute log-probability of multiple values argument \c val
+  virtual vec evallog_m(const Array<vec> &Avec) const {
+          vec x(Avec.size());
+          for (int i = 0; i < Avec.size(); i++) {x(i) = evallog(Avec(i)) ;}
+          return x;
   }
   //! Return conditional density on the given RV, the remaining rvs will be in conditioning
@@ -311 +317 @@
   //! Size of the random variable
   int dimension() const {return dim;}
-  //!@}
+  //! Load from structure with elements:
+  //!  \code
+  //! { rv = {class="RV", names=(...),}; // RV describing meaning of random variable
+  //!   // elements of offsprings
+  //! }
+  //! \endcode
+  //!@}
+  void from_setting(const Setting &set){
+          if (set.exists("rv")){
+                  RV* r = UI::build<RV>(set,"rv");
+                  set_rv(*r); 
+                  delete r;
+          }
+  }
 
 };
@@ -368 +387 @@
   //! Matrix version of evallogcond
   virtual vec evallogcond_m(const mat &Dt, const vec &cond) {this->condition(cond); return ep->evallog_m(Dt);};
+  //! Array<vec> version of evallogcond
+  virtual vec evallogcond_m(const Array<vec> &Dt, const vec &cond) {this->condition(cond); return ep->evallog_m(Dt);};
 
   //! \name Access to attributes
@@ -378 +399 @@
   epdf& _epdf() {return *ep;}
   epdf* _e() {return ep;}
+  //! Load from structure with elements:
+  //!  \code
+  //! { rv = {class="RV", names=(...),}; // RV describing meaning of random variable
+  //!   rvc= {class="RV", names=(...),}; // RV describing meaning of random variable in condition
+  //!   // elements of offsprings
+  //! }
+  //! \endcode
+  //!@}
+  void from_setting(const Setting &set){
+          if (set.exists("rv")){
+                  RV* r = UI::build<RV>(set,"rv");
+                  set_rv(*r); 
+                  delete r;
+          }
+          if (set.exists("rvc")){
+                  RV* r = UI::build<RV>(set,"rvc");
+                  set_rvc(*r); 
+                  delete r;
+          }
+  }
   //!@}
 
@@ -570 +611 @@
 public:
         //!Default constructor
+        mepdf(){};
         mepdf ( epdf* em, bool owning_ep0=false ) :mpdf ( ) {ep= em ;owning_ep=owning_ep0;dimc=0;};
         mepdf (const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*>( em );};
         void condition ( const vec &cond ) {}
         ~mepdf(){if (owning_ep) delete ep;}
-};
+  //! Load from structure with elements:
+  //!  \code
+  //! { class = "mepdf",         
+  //!   epdfs = {class="epdfs",...}
+  //! }
+  //! \endcode
+  //!@}
+        void from_setting(const Setting &set){
+                epdf* e = UI::build<epdf>(set,"epdf");
+                ep=     e; 
+                owning_ep=true;
+        }
+};
+UIREGISTER(mepdf);
 
 //!\brief Chain rule of pdfs - abstract part common for mprod and merger.