Changeset 796

Timestamp:

01/29/10 19:56:45 (15 years ago)

Author:

smidl

Message:

UI changes for MixEF_init

Files:

• applications/bdmtoolbox/mex/epdf_mean.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/epdf_variance.cpp (modified) (1 diff)
• library/bdm/estim/arx.cpp (modified) (1 diff)
• library/bdm/estim/arx.h (modified) (2 diffs)
• library/bdm/mex/mex_parser.h (modified) (1 diff)
• library/bdm/stat/exp_family.h (modified) (2 diffs)

applications/bdmtoolbox/mex/epdf_mean.cpp

@@ -28 +28 @@
         shared_ptr<epdf> ep=UI::build<epdf>(Cfg);
         
-        
-        if ( n_output<1 ) mexErrMsgTxt ( "No output - nothing to do!" );
-        output[0] = mxCreateDoubleMatrix(ep->dimension(), 1, mxREAL);
-        vec2mxArray(ep->mean(), output[0]);
+        if (ep){        
+                //if ( n_output<1 ) mexErrMsgTxt ( "No output - nothing to do!" );
+                output[0] = mxCreateDoubleMatrix(ep->dimension(), 1, mxREAL);
+                vec2mxArray(ep->mean(), output[0]);
+        } else { 
+                mexErrMsgTxt ( "Given object is not epdf" );
+        }
 }
 #endif

applications/bdmtoolbox/mex/epdf_variance.cpp

@@ -27 +27 @@
 
         shared_ptr<epdf> ep=UI::build<epdf>(Cfg);
+
+        if (ep) {
+                output[0] = mxCreateDoubleMatrix(ep->dimension(), 1, mxREAL);
+                vec2mxArray(ep->variance(), output[0]);
+        } else { 
+                mexErrMsgTxt ( "Given object is not epdf" );
+        }
         
-        
-        if ( n_output<1 ) mexErrMsgTxt ( "No output - nothing to do!" );
-        output[0] = mxCreateDoubleMatrix(ep->dimension(), 1, mxREAL);
-        vec2mxArray(ep->variance(), output[0]);
 }
 #endif

library/bdm/estim/arx.cpp

@@ -256 +256 @@
         }
 
-        double frg;
-        if ( !UI::get ( frg, set, "frg" ) )
-                frg = 1.0;
-
-        set_parameters ( frg );
+        // frg handled by BMEF
 
         //name results (for logging)

library/bdm/estim/arx.h

@@ -59 +59 @@
         ARX* _copy() const;
 
-        void set_parameters ( double frg0 ) {
+        void set_frg ( double frg0 ) {
                 frg = frg0;
         }
@@ -159 +159 @@
         void to_setting ( Setting &set ) const
         {                       
-                BMEF::to_setting( set );
-                // TODO DOPLNIT ANALOGICKY KE STAVAJICIMU FROM_SETTING 
+                BMEF::to_setting( set ); // takes care of rv, yrv, rvc
+                int constant = have_constant ? 1 : 0;
+                UI::save(constant, set, "constant");
+                UI::save(&est, set, "prior");
+                UI::save(&alter_est, set, "alternative");
+                
+                
         } 
 };

library/bdm/mex/mex_parser.h

@@ -55 +55 @@
                 //treat empty matrices independently
                 mat val;
-                if ( mxGetM ( value ) > 0 ) {
+                if ( mxGetM ( value ) > 0 && mxGetN(value)>0) {
                         val = mxArray2mat ( value );
                 }

library/bdm/stat/exp_family.h

@@ -106 +106 @@
         {                       
                 BM::to_setting( set );
+                UI::save(frg, set, "frg");
                 // TODO DOPLNIT? ALE MOMENTALNE CHYBI FROM_SETTING PRO INSPIRACI
         } 
+        void from_setting( const Setting &set) {
+                BM::from_setting(set);
+                if ( !UI::get ( frg, set, "frg" ) )
+                        frg = 1.0;
+        
+        }
 };
 
@@ -313 +320 @@
         void to_setting ( Setting& set ) const {
                 epdf::to_setting ( set );
-                string s ( "egiw" );
-                UI::save ( s, set, "class" );
                 UI::save ( dimx, set, "dimx" );
                 UI::save ( V.to_mat(), set, "V" );