Changeset 569

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

Files:

• applications/bdmtoolbox/mex/merger.cpp (modified) (1 diff)
• applications/bdmtoolbox/tutorial/merging/merge_grid.m (modified) (3 diffs)
• library/bdm/stat/discrete.h (modified) (3 diffs)
• library/bdm/stat/exp_family.h (modified) (1 diff)
• library/bdm/stat/merger.h (modified) (1 diff)

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,:);

library/bdm/stat/discrete.h

@@ -23 +23 @@
 
         //! Rectangular support
-        //! Support ponits are located inbetween ranges! For example:
+        //! Support points are located inbetween ranges! For example:
         //! For ranges=[0,1] and gridsizes=[1] the support point is 0.5
         class rectangular_support: public root {
@@ -89 +89 @@
                                 return ind;
                         } 
-                        //! set the first corner to actvec
+                        //! set the first vector to corner and store result in actvec
                         const vec& first_vec(){
                                 for ( int j = 0; j < dim; j++ ) {
@@ -146 +146 @@
         UIREGISTER(rectangular_support);
         
+        //! Discrete support with stored support points 
+        class discrete_support: public root{
+                protected:
+                        //! storage of support points
+                        Array<vec> Spoints;
+                        //! index in iterators
+                        int idx;
+                public:
+                        //! Default constructor
+                        discrete_support() : Spoints(0), idx(0){}
+                        //! Access function
+                        int points() const {return Spoints.length();}
+                        //! set the first vector to corner and store result in actvec
+                        const vec& first_vec(){bdm_assert_debug(Spoints.length()>0,"Empty support");idx=0; return Spoints(idx);}
+                        //! set next vector after calling first_vec()
+                        const vec& next_vec(){bdm_assert_debug(Spoints.length()>idx-1,"Out of support points"); return Spoints(++idx);}
+                        
+                        /*!
+                        \code
+                          class = "discrete_support";
+                          points = ( [1,2..], [2,2..], ...); // list of points
+                           === OR ===
+                          epdf = {class="epdf_offspring",...}; // epdf rfom which to sample
+                          npoints = 100;                     // number of samples
+                        \endcode
+                        */
+                        void from_setting (const Setting &set) {
+                                UI::get (Spoints, set, "points", UI::compulsory);
+                                if (points()<1){
+                                        int npoints;
+                                        shared_ptr<epdf> ep= UI::build<epdf>(set, "epdf", UI::compulsory);
+                                        if (!UI::get(npoints,set,"npoints",UI::optional)){npoints=100;}
+                                        
+                                        //sample
+                                        Spoints.set_size(npoints);
+                                        for(int i=0; i<points(); i++){Spoints(i)=ep->sample();}
+                                }
+                        }
+                        //! access function
+                        Array<vec> & _Spoints() {return Spoints;}
+        };
+        UIREGISTER(discrete_support);
+        
         class grid_fnc: public fnc{
                 protected:

library/bdm/stat/exp_family.h

@@ -1145 +1145 @@
                 //! Set sample
                 void set_parameters (int n0, bool copy = true) {n = n0; w.set_size (n0, copy);samples.set_size (n0, copy);};
+                //! Set samples
+                void set_parameters (const Array<vec> &Av) {
+                        bdm_assert_debug(Av.size()>0,"Empty samples"); 
+                        n = Av.size(); 
+                        epdf::set_parameters(Av(0).length());
+                        w=1/n*ones(n);
+                        samples=Av;
+                };
                 //! Potentially dangerous, use with care.
                 vec& _w()  {return w;};

library/bdm/stat/merger.h

@@ -143 +143 @@
                         samples ( j ) = Sup.next_vec();
                 }
+        }
+        //! Set support points from dicrete grid
+        void set_support ( discrete_support &Sup) {
+                Npoints = Sup.points();
+                eSmp.set_parameters(Sup._Spoints());
         }
         //! set debug file