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

Timestamp:

07/31/09 13:06:49 (15 years ago)

Author:

vbarta

Message:

mpdf (& its dependencies) reformat: now using shared_ptr, moved virtual method bodies to .cpp

Files:

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

library/bdm/base/bdmbase.h

@@ -18 +18 @@
 #include "../itpp_ext.h"
 #include "../bdmroot.h"
+#include "../shared_ptr.h"
 #include "user_info.h"
-
 
 using namespace libconfig;
@@ -350 +350 @@
   //! random variable in condition
   RV rvc;
+
+private:
   //! pointer to internal epdf
-  epdf* ep;
+  shared_ptr<epdf> shep;
+
 public:
   //! \name Constructors
   //! @{
 
-  mpdf() : dimc(0), rvc() {};
-  //! copy constructor does not set pointer \c ep - has to be done in offsprings!
-  mpdf(const mpdf &m) : dimc(m.dimc), rvc(m.rvc) {};
-  //!@}
-
-  //! \name Matematical operations
-  //!@{
-
-  //! Returns a sample from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
-  virtual vec samplecond(const vec &cond) {
-    this->condition(cond);
-    vec temp = ep->sample();
-    return temp;
-  };
-  //! Returns \param N samples from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
-  virtual mat samplecond_m(const vec &cond, int N) {
-    this->condition(cond);
-    mat temp(ep->dimension(), N);
-    vec smp(ep->dimension());
-    for (int i = 0; i < N; i++) {smp = ep->sample() ; temp.set_col(i, smp);}
-    return temp;
-  };
-  //! Update \c ep so that it represents this mpdf conditioned on \c rvc = cond
-  virtual void condition(const vec &cond) {it_error("Not implemented");};
+    mpdf():dimc(0), rvc() { }
+
+    mpdf(const mpdf &m):dimc(m.dimc), rvc(m.rvc), shep(m.shep) { }
+    //!@}
+
+    //! \name Matematical operations
+    //!@{
+
+    //! Returns a sample from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
+    virtual vec samplecond(const vec &cond);
+
+    //! Returns \param N samples from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
+    virtual mat samplecond_m(const vec &cond, int N);
+
+    //! Update \c ep so that it represents this mpdf conditioned on \c rvc = cond
+    virtual void condition(const vec &cond) {it_error("Not implemented");};
 
   //! Shortcut for conditioning and evaluation of the internal epdf. In some cases,  this operation can be implemented efficiently.
-  virtual double evallogcond(const vec &dt, const vec &cond) {
-    double tmp;
-    this->condition(cond);
-    tmp = ep->evallog(dt);
- //   it_assert_debug(std::isfinite(tmp), "Infinite value");
-    return tmp;
-  };
-
-  //! 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
-  //! @{
-
-  RV _rv() {return ep->_rv();}
-  RV _rvc() {it_assert_debug(isnamed(), ""); return rvc;}
-  int dimension() {return ep->dimension();}
-  int dimensionc() {return dimc;}
-  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;
-          }
-  }
-  //!@}
-
-  //! \name Connection to other objects
-  //!@{
-  void set_rvc(const RV &rvc0) {rvc = rvc0;}
-  void set_rv(const RV &rv0) {ep->set_rv(rv0);}
-  bool isnamed() {return (ep->isnamed()) && (dimc == rvc._dsize());}
-  //!@}
+    virtual double evallogcond(const vec &dt, const vec &cond);
+
+    //! Matrix version of evallogcond
+    virtual vec evallogcond_m(const mat &Dt, const vec &cond);
+
+    //! Array<vec> version of evallogcond
+    virtual vec evallogcond_m(const Array<vec> &Dt, const vec &cond);
+
+    //! \name Access to attributes
+    //! @{
+
+    RV _rv() { return shep->_rv(); }
+    RV _rvc() { it_assert_debug(isnamed(), ""); return rvc; }
+    int dimension() { return shep->dimension(); }
+    int dimensionc() { return dimc; }
+
+    epdf *e() { return shep.get(); }
+
+    void set_ep(shared_ptr<epdf> ep) { shep = 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);
+    //!@}
+
+    //! \name Connection to other objects
+    //!@{
+    void set_rvc(const RV &rvc0) { rvc = rvc0; }
+    void set_rv(const RV &rv0) { shep->set_rv(rv0); }
+    bool isnamed() { return (shep->isnamed()) && (dimc == rvc._dsize()); }
+    //!@}
 };
 
@@ -628 +610 @@
 */
 class mepdf : public mpdf {
-        bool owning_ep; // flag trigers deleting ep by destructor
 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 );};
+        mepdf() { }
+
+        mepdf(shared_ptr<epdf> em) :mpdf ( ) { set_ep(em); dimc=0; }
+
         void condition ( const vec &cond ) {}
-        ~mepdf(){if (owning_ep) delete ep;}
+
   //! Load from structure with elements:
   //!  \code
@@ -644 +626 @@
   //!@}
         void from_setting(const Setting &set){
-                epdf* e = UI::build<epdf>(set,"epdf");
-                ep=     e; 
-                owning_ep=true;
+                epdf *e = UI::build<epdf>(set, "epdf");
+                set_ep(e);
         }
 };