Changeset 746

Timestamp:

11/30/09 11:04:21 (14 years ago)

Author:

mido

Message:

mixef_init fills some data into mixef_init.out,
however, there are still some TODOs in this commit,
it is necessary to fill a few more bodies of the to_setting() method

Files:

• applications/bdmtoolbox/mex/mixef_init.cpp (modified) (1 diff)
• library/bdm/base/bdmbase.cpp (modified) (2 diffs)
• library/bdm/base/bdmbase.h (modified) (3 diffs)
• library/bdm/estim/arx.h (modified) (1 diff)
• library/bdm/estim/mixtures.h (modified) (2 diffs)
• library/bdm/stat/exp_family.h (modified) (3 diffs)

applications/bdmtoolbox/mex/mixef_init.cpp

@@ -55 +55 @@
         output[0]=tmp;
 #else
-        Config Out;
-        mix.to_setting(Out.getRoot());
-        Out.writeFile("mixef_init.out");
+        UIFile out;
+        UI::save ( &mix, out, "test" );
+        out.save ( "mixef_init.out" );
 #endif
 }

library/bdm/base/bdmbase.cpp

@@ -190 +190 @@
 
 void pdf::from_setting ( const Setting &set ) {
+        root::from_setting( set );
         shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::optional );
         if ( r ) {
@@ -199 +200 @@
                 set_rvc ( *r );
         }
+}
+
+void pdf::to_setting ( Setting &set ) const {   
+        root::to_setting( set );
+        UI::save( &rv, set, "rv" );
+        UI::save( &rvc, set, "rvc" );
 }
 

library/bdm/base/bdmbase.h

@@ -479 +479 @@
         //!@}
         void from_setting ( const Setting &set );
+
+        void to_setting ( Setting &set ) const;
         //!@}
 
@@ -603 +605 @@
                         set_rv ( *r );
                 }
+        }
+
+        void to_setting ( Setting &set ) const {
+                // TODO we do not want to store rvc.. 
+                // therfore, pdf::to_setting( set ) is omitted
+                UI::save( &rv, set, "rv" );
         }
 
@@ -1156 +1164 @@
         }
 
+        void to_setting ( Setting &set ) const {
+                root::to_setting( set );
+                UI::save( &yrv, set, "yrv" );
+                UI::save( &rvc, set, "rvc" );           
+                UI::save( &posterior()._rv(), set, "rv" );
+
+                /* TODO ROZBEHAT UI::save( &opt, set, "options" );                      
+        ... kod set_options vypada takto:
+        if ( opt.find ( "logfull" ) != string::npos ) {
+                const_cast<epdf&> ( posterior() ).set_log_level ( 10 ) ;
+        } else {
+                if ( opt.find ( "logbounds" ) != string::npos ) {
+                        const_cast<epdf&> ( posterior() ).set_log_level ( 2 ) ;
+                } else {
+                        const_cast<epdf&> ( posterior() ).set_log_level ( 1 ) ;
+                }
+                if ( opt.find ( "logll" ) != string::npos ) {
+                        log_level = 1;
+                }
+        } */    
+        }
+
 };
 //! array of pointers to epdf

library/bdm/estim/arx.h

@@ -154 +154 @@
                 prior.set_parameters ( prior._dimx(), ldmat ( dV0 ) );
         }
+
+        void to_setting ( Setting &set ) const
+        {                       
+                BMEF::to_setting( set );
+                // TODO DOPLNIT ANALOGICKY KE STAVAJICIMU FROM_SETTING 
+        } 
 };
-
 UIREGISTER ( ARX );
 SHAREDPTR ( ARX );

library/bdm/estim/mixtures.h

@@ -120 +120 @@
                 return *est;
         }
+
         emix* epredictor() const;
         //! Flatten the density as if it was not estimated from the data
@@ -134 +135 @@
 
         void to_setting ( Setting &set ) const {
+                BMEF::to_setting( set );
                 UI::save ( Coms, set, "Coms" );
-                Setting &wei = set.add ( "weights", Setting::TypeGroup );
-                weights.to_setting ( wei );
+                UI::save ( &weights, set, "weights" );
         }
 };
+UIREGISTER ( MixEF );
 
 }

library/bdm/stat/exp_family.h

@@ -110 +110 @@
                 return NULL;
         }
+
+        void to_setting ( Setting &set ) const
+        {                       
+                BM::to_setting( set );
+                // TODO DOPLNIT? CHYBI FROM_SETTING PRO INSPIRACI
+        } 
 };
 
@@ -415 +421 @@
                 dim = beta.length();
         }
+
+        void to_setting ( Setting &set ) const
+        {                       
+                eEF::to_setting( set );
+                UI::save( beta, set, "beta" );
+        } 
 };
 UIREGISTER ( eDirich );
@@ -523 +535 @@
                 }
         }
+
         void to_setting ( Setting &set ) const {
                 BMEF::to_setting ( set );
-                Setting& prior = set.add ( "prior", Setting::TypeGroup );
-                est.to_setting ( prior );
-        }
-};
+                UI::save( &est, set, "prior" );
+        }
+};
+UIREGISTER( multiBM );
 
 /*!