Changeset 280 for bdm/stat

Timestamp:

02/24/09 14:12:46 (15 years ago)

Author:

smidl

Message:

progress...

Location:

bdm/stat

Files:

• libBM.cpp (modified) (2 diffs)
• libDS_ui.h (modified) (1 diff)
• libEF.h (modified) (6 diffs)
• loggers.h (modified) (1 diff)

bdm/stat/libBM.cpp

@@ -16 +16 @@
         //Refer
         int id;
-        RVmap::const_iterator iter = RV_MAP.find ( name );
+        RVmap::const_iterator iter = RV_MAP.begin();
+        iter=RV_MAP.find ( name );
         if ( iter == RV_MAP.end() ) {
                 id=RV_MAP.size() +1;
+                //debug
+/*              {
+                        cout << endl;
+                        RVmap::const_iterator iter = RV_MAP.begin();
+                        for(RVmap::const_iterator iter=RV_MAP.begin(); iter!=RV_MAP.end(); iter++){
+                                cout << "key: " << iter->first << " val: " << iter->second <<endl;
+                        }
+                }*/
+                
                 RV_MAP.insert ( make_pair ( name,id ) ); //add new rv
                 if ( id>=RV_NAMES.length() ) {
@@ -128 +138 @@
         int pos = 0;
         for ( i = 0;i < len;i++ ) {
-                idlist.set_subvector ( pos, pos + size ( ids ( i ) ) - 1, ids ( i ) );
-                tmlist.set_subvector ( pos, pos + size ( ids ( i ) ) - 1, times ( i ) );
-                pos += size ( ids ( i ) );
+                idlist.set_subvector ( pos, pos + size ( i ) - 1, ids ( i ) );
+                tmlist.set_subvector ( pos, pos + size ( i ) - 1, times ( i ) );
+                pos += size ( i );
         }
         return str ( idlist, tmlist );

bdm/stat/libDS_ui.h

@@ -85 +85 @@
         IM = { type = "mpdf"; //<-- valid offspring! e.g. "mlnorm"
                 rv = { //description of x_t 
-                        names=("name1",...);
+                        names=["name1",...];
                         sizes=[2,1]; // optional default=[1,1...];
                         times=[0,0]; // optional default=[0,0...];

bdm/stat/libEF.h

@@ -116 +116 @@
         //!@{
 
-        enorm ( ):eEF ( ), mu ( ),R ( ) {};
+        enorm ( ) :eEF ( ), mu ( ),R ( ) {};
         enorm ( const vec &mu,const sq_T &R ) {set_parameters ( mu,R );}
         void set_parameters ( const vec &mu,const sq_T &R );
@@ -366 +366 @@
         //!@{
         eigamma ( ) :eEF ( ), eg(),alpha ( eg._alpha() ), beta ( eg._beta() ) {};
-        eigamma ( const vec &a, const vec &b ):eEF ( ), eg(),alpha ( eg._alpha() ), beta ( eg._beta() ) {eg.set_parameters ( a,b );};
+        eigamma ( const vec &a, const vec &b ) :eEF ( ), eg(),alpha ( eg._alpha() ), beta ( eg._beta() ) {eg.set_parameters ( a,b );};
         void set_parameters ( const vec &a, const vec &b ) {eg.set_parameters ( a,b );};
         //!@}
@@ -476 +476 @@
         template<class sq_M>
         friend std::ostream &operator<< ( std::ostream &os,  mlnorm<sq_M> &ml );
+};
+
+//! Mpdf with general function for mean value
+template<class sq_T>
+class mgnorm : public mEF {
+protected:
+        //! Internal epdf that arise by conditioning on \c rvc
+        enorm<sq_T> epdf;
+        vec &mu;
+        fnc* g;
+public:
+        //!default constructor
+        mgnorm() :mu ( epdf._mu() ) {ep=&epdf;}
+        //!set mean function
+        void set_parameters ( fnc* g0, const sq_T &R0 ) {g=g0; epdf.set_parameters ( zeros ( g->_dimy() ), R0 );}
+        void condition ( const vec &cond ) {mu=g->eval ( cond );};
 };
 
@@ -663 +679 @@
         Array<vec> samples;
 public:
-        //! \name Constructors 
-        //!@{
-        eEmp ( ) :epdf ( ),w (  ),samples ( ) {};
-        eEmp (const eEmp &e ): epdf(e), w(e.w), samples(e.samples) {};
-        //!@}
-        
+        //! \name Constructors
+        //!@{
+        eEmp ( ) :epdf ( ),w ( ),samples ( ) {};
+        eEmp ( const eEmp &e ) : epdf ( e ), w ( e.w ), samples ( e.samples ) {};
+        //!@}
+
         //! Set samples and weights
         void set_parameters ( const vec &w0, const epdf* pdf0 );
@@ -817 +833 @@
 template<class sq_T>
 epdf* enorm<sq_T>::marginal ( const RV &rvn ) const {
-        it_assert_debug(isnamed(), "rv description is not assigned");
+        it_assert_debug ( isnamed(), "rv description is not assigned" );
         ivec irvn = rvn.dataind ( rv );
 
         sq_T Rn ( R,irvn ); //select rows and columns of R
-        
+
         enorm<sq_T>* tmp = new enorm<sq_T>;
         tmp->set_rv ( rvn );
@@ -856 +872 @@
 
         mlnorm<sq_T>* tmp=new mlnorm<sq_T> ( );
-        tmp->set_rv(rvn); tmp->set_rvc(rvc);
+        tmp->set_rv ( rvn ); tmp->set_rvc ( rvc );
         tmp->set_parameters ( A,mu1-A*mu2,R_n );
         return tmp;

bdm/stat/loggers.h

@@ -48 +48 @@
         void logit ( int id, const vec &v ) {
                 it_assert_debug(id<vectors.length(),"Logger was not initialized, run init().");
-                if(id>0){ vectors ( id ).set_row ( ind,v );}
+                if(id>=0){ vectors ( id ).set_row ( ind,v );}
         }
         //! Save values into an itfile named after \c fname.