Changeset 569 for applications

Timestamp:

08/20/09 00:54:47 (15 years ago)

Author:

smidl

Message:

new object discrete_support, merger adapted to accept this input as well

Location:

applications/bdmtoolbox

Files:

• mex/merger.cpp (modified) (1 diff)
• tutorial/merging/merge_grid.m (modified) (3 diffs)

applications/bdmtoolbox/mex/merger.cpp

@@ -93 +93 @@
         }
         catch (UIException &e) {
-                shared_ptr<epdf> g0 = UI::build<epdf> (Cfg, "Support");
-                Merger->set_support (*g0, 100);
+                shared_ptr<discrete_support> DisSup = UI::build<discrete_support> (Cfg, "Support");
+                Merger->set_support (*DisSup);
         }
 // COMPUTE RESULTS

applications/bdmtoolbox/tutorial/merging/merge_grid.m

@@ -48 +48 @@
 
 % 2D support
-type=0;
+type=1;
 if type==0
     support2.class='rectangular_support';
@@ -54 +54 @@
     support2.gridsizes=[10,10];
 else
-    support2=struct('pdf',...
-            struct('class','enorm<ldmat>','mu',[1,2],'R',[2 0; 0 2]));
-    support2.nsamples=[100];
+    support2.class='discrete_support';
+    support2.epdf= struct('class','enorm<ldmat>','mu',[1,2],'R',[2 0; 0 2]);
+    support2.npoints=[100];
 end    
 
@@ -63 +63 @@
 
 if type==0
-    X=zeros(support2.nbins(1));
-    Y=zeros(support2.nbins(1));
-    Z=zeros(support2.nbins(1));
+    X=zeros(support2.gridsizes(1));
+    Y=zeros(support2.gridsizes(1));
+    Z=zeros(support2.gridsizes(1));
 
     X(:)=vy2.support(1,:);