Changeset 924

Timestamp:

05/05/10 20:51:26 (14 years ago)

Author:

smidl

Message:

correction in MemDS and mgnorm

Files:

• applications/bdmtoolbox/tutorial/userguide/frg_estim.m (modified) (3 diffs)
• library/bdm/base/datasources.cpp (modified) (1 diff)
• library/bdm/base/datasources.h (modified) (1 diff)
• library/bdm/stat/exp_family.h (modified) (1 diff)

applications/bdmtoolbox/tutorial/userguide/frg_estim.m

@@ -11 +11 @@
 A1.rv = y;
 A1.rgr = RVtimes([y,u],[-3,-1]) ; 
-A1.log_level = 'logbounds,logevidence';
+A1.log_level = 'logbounds';
 A1.frg = 0.98;
 A1.name = 'A1';
@@ -35 +35 @@
 E.prior.class = 'eDirich';         % prior on non-linear part
 E.prior.beta  = [2 1]; % 
-E.log_level = 'logbounds,logevidence';
+E.log_level = 'logbounds';
 E.name = 'MPF';
 
@@ -42 +42 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % plot results
-ndat = size(M.DS_u,1);
+ndat = size(M.DS_dt_u,1);
 
 figure(1);
 subplot(2,2,1);
-plotestimates(true_theta, M.MPF_apost_mean_theta, M.MPF_apost_lb_theta, M.MPF_apost_ub_theta);
+plotestimates(true_theta, M.MPF_apost_mean_theta, M.MPF_apost_lbound_theta, M.MPF_apost_ubound_theta);
 title(' Regression parameters \theta')
 set(gca,'YLim',[-1.5,1]);
 
 subplot(2,2,2);
-plotestimates(true_R, M.MPF_apost_mean_r,M.MPF_apost_lb_r,M.MPF_apost_ub_r);
+plotestimates(true_R, M.MPF_apost_mean_r,M.MPF_apost_lbound_r,M.MPF_apost_ubound_r);
 title('Variance parameters r')
 
 subplot(2,2,3);
-plotestimates(1, M.MPF_apost_mean_phi(:,1),M.MPF_apost_lb_phi(:,1),M.MPF_apost_ub_phi(:,1));
+plotestimates(1, M.MPF_apost_mean_phi(:,1),M.MPF_apost_lbound_phi(:,1),M.MPF_apost_ubound_phi(:,1));
 title('Forgetting factor')
 

library/bdm/base/datasources.cpp

@@ -44 +44 @@
         // DS::validate() has to be called after the dtsize attribute is set to proper value
         DS::validate();
+        log_level[logut]=0;
 }
 

library/bdm/base/datasources.h

@@ -53 +53 @@
         void set_drv ( const RV &drv, const RV &urv )
         {
+                if (urv._dsize()>0){
                 bdm_error ( "MemDS::urv is not supported" );
+                } else {
+                        DS::set_drv(drv,urv);
+                }
+                        
         }
 
         void write ( const vec &ut ) {
-                bdm_error ( "MemDS::write is not supported" );
+                if (ut.size()>0){
+                        bdm_error ( "MemDS::write is not supported" );
+                }
         }
 
         void write ( const vec &ut, const ivec &indices ) {
-                bdm_error ( "MemDS::write is not supported" );
+                if (ut.size()>0){
+                        bdm_error ( "MemDS::write is not supported" );
+                }
         }
 

library/bdm/stat/exp_family.h

@@ -1071 +1071 @@
 
                 set_parameters ( g, R );
-                validate();
+                //validate();
         }
         void validate() {
-                bdm_assert ( g->dimension() == this->dimension(), "incompatible function" );
+                this->iepdf.validate();
+                bdm_assert ( g->dimension() == this->iepdf.dimension(), "incompatible function" );
                 this->dim = g->dimension();
                 this->dimc = g->dimensionc();