Changeset 487 for library/bdm/base/bdmbase.cpp

Timestamp:

08/08/09 13:42:18 (15 years ago)

Author:

smidl

Message:

1st step of mpdf redesign - BROKEN compile

Files:

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

library/bdm/base/bdmbase.cpp

@@ -140 +140 @@
 }
 
-vec mpdf::samplecond ( const vec &cond ) {
-        condition ( cond );
-        vec temp = shep->sample();
+template<class EPDF>
+vec mpdf_internal<EPDF>::samplecond ( const vec &cond ) {
+        condition ( cond );
+        vec temp = iepdf.sample();
         return temp;
 }
 
-mat mpdf::samplecond_m ( const vec &cond, int N ) {
-        condition ( cond );
-        mat temp ( shep->dimension(), N );
-        vec smp ( shep->dimension() );
+template<class EPDF>
+mat mpdf_internal<EPDF>::samplecond_m ( const vec &cond, int N ) {
+        condition ( cond );
+        mat temp ( dimension(), N );
+        vec smp ( dimension() );
         for ( int i = 0; i < N; i++ ) {
-                smp = shep->sample();
+                smp = iepdf.sample();
                 temp.set_col ( i, smp );
         }
@@ -158 +160 @@
 }
 
-double mpdf::evallogcond ( const vec &dt, const vec &cond ) {
+template<class EPDF>
+double mpdf_internal<EPDF>::evallogcond ( const vec &dt, const vec &cond ) {
         double tmp;
         condition ( cond );
-        tmp = shep->evallog ( dt );
+        tmp = iepdf.evallog ( dt );
         // it_assert_debug(std::isfinite(tmp), "Infinite value");
         return tmp;
 }
 
-vec mpdf::evallogcond_m ( const mat &Dt, const vec &cond ) {
-        condition ( cond );
-        return shep->evallog_m ( Dt );
-}
-
-vec mpdf::evallogcond_m ( const Array<vec> &Dt, const vec &cond ) {
-        condition ( cond );
-        return shep->evallog_m ( Dt );
+template<class EPDF>
+vec mpdf_internal<EPDF>::evallogcond_m ( const mat &Dt, const vec &cond ) {
+        condition ( cond );
+        return iepdf.evallog_m ( Dt );
+}
+
+template<class EPDF>
+                vec mpdf_internal<EPDF>::evallogcond_m ( const Array<vec> &Dt, const vec &cond ) {
+        condition ( cond );
+        return iepdf.evallog_m ( Dt );
 }
 
@@ -313 +318 @@
 void mepdf::from_setting ( const Setting &set ) {
         shared_ptr<epdf> e ( UI::build<epdf> ( set, "epdf", UI::compulsory ) );
-        set_ep ( e );
+        ipdf = e;
 }