Changeset 735

Timestamp:

11/24/09 00:08:40 (14 years ago)

Author:

smidl

Message:

Initial implementation of mixef.init() -- does not work due to missing to_setting

Files:

• applications/bdmtoolbox/mex/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/mex/mixef_init.cpp (added)
• applications/bdmtoolbox/tutorial/userguide/mixef_basic.m (added)
• library/bdm/base/user_info.cpp (modified) (1 diff)
• library/bdm/estim/mixtures.cpp (modified) (2 diffs)
• library/bdm/estim/mixtures.h (modified) (2 diffs)
• library/bdm/stat/exp_family.h (modified) (1 diff)

applications/bdmtoolbox/mex/CMakeLists.txt

@@ -22 +22 @@
 MEX(epdf_sample_mat)
 MEX(lqg_redesign)
+MEX(mixef_init)

library/bdm/base/user_info.cpp

@@ -310 +310 @@
                 from_setting ( matrix, link.result );
 
-                if ( matrix.cols() != 1 && matrix.rows() != 1 )
+                if ( matrix.cols() != 1 && matrix.rows() != 1 && matrix.cols()!=0)
                         throw UISettingException ( "UIException: the vector length is invalid, it seems to be rather a matrix.", link.result );
 

library/bdm/estim/mixtures.cpp

@@ -5 +5 @@
 
 
-void MixEF::init ( BMEF* Com0, const mat &Data, int c ) {
+void MixEF::init ( BMEF* Com0, const mat &Data, const int c ) {
         //prepare sizes
         Coms.set_size ( c );
@@ -38 +38 @@
         delete est;
         build_est();
-
 }
 

library/bdm/estim/mixtures.h

@@ -99 +99 @@
         //! \param Data Data on which the initialization will be done
         //! \param c Initial number of components, default=5
-        void init ( BMEF* Com0, const mat &Data, int c = 5 );
+        void init ( BMEF* Com0, const mat &Data, const int c = 5 );
         //Destructor
         ~MixEF() {
@@ -130 +130 @@
                 method = M;
         }
+        
+        void to_setting(Setting &set) const{
+                UI::save(Coms,set,"Coms");
+                Setting &wei=set.add("weights",Setting::TypeGroup);
+                weights.to_setting(wei);
+        }
 };
 

library/bdm/stat/exp_family.h

@@ -507 +507 @@
                         if (evalll) {last_lognc = est.lognc();}
                 }
+                void to_setting(Setting &set) const{
+                        BMEF::to_setting(set);
+                        Setting& prior= set.add("prior", Setting::TypeGroup);
+                        est.to_setting(prior);
+                }
 };