Changeset 761

Timestamp:

01/06/10 22:30:00 (14 years ago)

Author:

smidl

Message:

changes to dist identific example + wrapper for variance

Files:

• applications/bdmtoolbox/mex/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/mex/epdf_variance.cpp (added)
• applications/bdmtoolbox/mex/merger.cpp (modified) (1 diff)
• applications/bdmtoolbox/tutorial/mpdm/dist_estim_example.m (modified) (6 diffs)
• library/bdm/stat/exp_family.cpp (modified) (1 diff)
• library/bdm/stat/merger.h (modified) (1 diff)

applications/bdmtoolbox/mex/CMakeLists.txt

@@ -20 +20 @@
 
 MEX(epdf_mean)
+MEX(epdf_variance)
 MEX(epdf_sample_mat)
 MEX(lqg_redesign)

applications/bdmtoolbox/mex/merger.cpp

@@ -75 +75 @@
 // COMPUTE RESULTS
         Merger->set_sources ( Sources );
+        Merger->validate();
         Merger->merge();
 

applications/bdmtoolbox/tutorial/mpdm/dist_estim_example.m

@@ -16 +16 @@
 fz.rvc   = RVtimes([u,u], [0, -1]);
 fz.A     = [1.8, -0.9];
-fz.const = -0.2;
+fz.const = 0.2;
 fz.R     = 1e-2;
 
@@ -35 +35 @@
 A1.rgr = RVtimes([z,z],[0,-1]) ; % correct structure is {y,y}
 A1.options ='logfull,logll';
+A1.rv_param = RV({'a','b','c','r'});
 A1.frg = 0.95;
 A1.constant = 1;
@@ -40 +41 @@
 A2=A1;
 A2.rv  = z;
+A2.rv_param = RV({'a','b','c','r'});
 A2.rgr = RVtimes([u,u],[0,-1]) ; % correct structure is {y,y}
 
@@ -52 +54 @@
 Merger.stop_niter=10;
 Merger.effss_coef=0.9;
+%Merger.dbg_file = 'm.it';
+
+M2.class = 'merger_base';
+M2.method='lognormal';
+M2.beta=1.2;
 
 support.class='discrete_support';
-support.epdf= struct('class','enorm<ldmat>','mu',[1,1,1,1,0.1],'R',eye(5));
-support.npoints=[100];
+support.epdf= struct('class','enorm<ldmat>','mu',[2,-1,0,0.1],'R',eye(4));
+support.npoints=[300];
 
+support2.class='rectangular_support';
+support2.ranges= {[0,5],[-2,2],[-2,2],[0.001,3]};
+support2.gridsizes = [10,10,10,10];
 
 
@@ -69 +79 @@
 A1_mean = zeros(4,ndat);
 A2_mean = zeros(4,ndat);
-MG_mean = zeros(5,ndat);
+MG_mean = zeros(4,ndat);
 
 for t=1:ndat
     f1=Set.Est0_apost{t};
-    f1.rv = RV({'a','b','c','r'});
     f2=Set.Est1_apost{t};
-    f2.rv = RV({'a','b','d','r'});
-    
+    if t>5
+%        support.epdf = f1;
+    end
+
     [res,ftilde] = merger({f1,f2},support,Merger);
-    
+
     A1_mean(:,t) = epdf_mean(f1);
     A2_mean(:,t) = epdf_mean(f2);
@@ -100 +111 @@
 
 figure(2)
-subplot(2,2,1);
-plot(A1_mean');
-subplot(2,2,2);
-plot(A2_mean');
-subplot(2,2,3);
+plot(A1_mean',':');
+hold on;
+plot(A2_mean','--');
 plot(MG_mean');

library/bdm/stat/exp_family.cpp

@@ -96 +96 @@
 
 double egiw::evallog_nn ( const vec &val ) const {
+        bdm_assert_debug(val.length()==nPsi+dimx,"Incorrect cond in egiw::evallog_nn" );
+        
         int vend = val.length() - 1;
 

library/bdm/stat/merger.h

@@ -221 +221 @@
         void set_sources ( const Array<shared_ptr<pdf> > &S ) {
                 merger_base::set_sources ( S );
-                Nsources = S.length();
+                //Nsources = S.length();
         }