Changeset 471 for library/bdm/estim

Timestamp:

08/05/09 00:01:58 (15 years ago)

Author:

mido

Message:

1) ad UserInfo?: UI::get a UI::build predelany tak, ze vraci fals / NULL v pripade neexistence pozadovaneho Settingu, pridana enumericky typ UI::SettingPresence?, predelany stavajici UI implementace, dodelana UI dokumentace
2) dokoncena konfigurace ASTYLERU, brzy bude aplikovan
3) doxygen nastaven tak, ze vytvari soubor doxy_warnings.txt

Location:

library/bdm/estim

Files:

• arx.cpp (modified) (3 diffs)
• arx.h (modified) (1 diff)
• kalman.cpp (modified) (3 diffs)

library/bdm/estim/arx.cpp

@@ -196 +196 @@
 void ARX::from_setting( const Setting &set ) 
 {       
-        RV *yrv = UI::build<RV>(set,"y");
-        RV *rrv = UI::build<RV>(set,"rgr");
+        RV *yrv = UI::build<RV>(set,"y", UI::compulsory);
+        RV *rrv = UI::build<RV>(set,"rgr", UI::compulsory);
         int ylen = yrv->_dsize();
         int rgrlen = rrv->_dsize();
@@ -204 +204 @@
         mat V0;
         vec dV0;
-        try {
-                UI::get( dV0, set, "dV0" );
-        } catch(...){
+        if( !UI::get( dV0, set, "dV0" ) )
                 dV0=concat ( 1e-3*ones ( ylen ), 1e-5*ones ( rgrlen ) );
-        }
         V0=diag ( dV0 );
         
         double nu0;
-        if ( !set.lookupValue( "nu0", nu0 ) ) 
+        if ( !UI::get( nu0, set, "nu0") ) 
                 nu0 = rgrlen+ylen+2;
 
         double frg;
-        if ( !set.lookupValue( "frg", frg ) ) 
+        if ( !UI::get( frg, set, "frg") ) 
                 frg = 1.0;
 
@@ -230 +227 @@
 }
 
-/*void ARX::to_setting( Setting &set ) const
-{       
-        Transport::to_setting( set );
-
-        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
-        kilometers_setting = kilometers;
-
-        UI::save( passengers, set, "passengers" );
-}*/
-
-
-}
+}

library/bdm/estim/arx.h

@@ -142 +142 @@
         void from_setting( const Setting &set );
 
-        // TODO dodelat void to_setting( Setting &set ) const;
 };
 

library/bdm/estim/kalman.cpp

@@ -251 +251 @@
 
 void EKFCh::from_setting( const Setting &set ) 
-{       
-        diffbifn* IM = UI::build<diffbifn>(set, "IM");
-        diffbifn* OM = UI::build<diffbifn>(set, "OM");
+{               
+        diffbifn* IM = UI::build<diffbifn>(set, "IM", UI::compulsory);
+        diffbifn* OM = UI::build<diffbifn>(set, "OM", UI::compulsory);
         
         //statistics
         int dim=IM->dimension();
         vec mu0;
-        if(set.exists("mu0"))
-                UI::get( mu0, set, "mu0");
-        else
+        if(!UI::get( mu0, set, "mu0"))
                 mu0=zeros(dim);
 
         mat P0;
-        if(set.exists("dP0"))
-        {
-                vec dP0;
-                UI::get( dP0, set, "dP0");
+        vec dP0;
+        if(UI::get( dP0, set, "dP0"))
                 P0=diag(dP0);
-        }
-        else if ( set.exists( "P0" ) )
-                UI::get(P0, set, "P0");
-        else
+        else if ( !UI::get(P0, set, "P0") )
                 P0=eye(dim);
         
@@ -278 +271 @@
         
         //parameters
-        vec dQ, dR;
-        UI::get( dQ, set, "dQ");
-        UI::get( dR, set, "dR");
+        vec dQ, dR;     
+        UI::get( dQ, set, "dQ", UI::compulsory);
+        UI::get( dR, set, "dR", UI::compulsory);
         set_parameters(IM, OM, diag(dQ), diag(dR));
 
         //connect
-        RV* drv = UI::build<RV>(set, "drv");
+        RV* drv = UI::build<RV>(set, "drv", UI::compulsory);
         set_drv(*drv);
-        RV* rv = UI::build<RV>(set, "rv");
+        RV* rv = UI::build<RV>(set, "rv", UI::compulsory);
         set_rv(*rv);
         
+        string options;
+        if( UI::get( options, set, "options" ) )
+                set_options(options);   
+}
+
+void MultiModel::from_setting( const Setting &set ) 
+{       
+        Array<EKFCh*> A;
+        UI::get( A, set, "models", UI::compulsory);
+        
+        set_parameters(A);
+        set_drv(A(0)->_drv());
+        //set_rv(A(0)->_rv());
+
         string options;
         if(set.lookupValue( "options", options ))
@@ -294 +301 @@
 }
 
-/*void EKFCh::to_setting( Setting &set ) const
-{       
-        Transport::to_setting( set );
-
-        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
-        kilometers_setting = kilometers;
-
-        UI::save( passengers, set, "passengers" );
-}*/
-
-void MultiModel::from_setting( const Setting &set ) 
-{       
-        Array<EKFCh*> A;
-        UI::get( A, set, "models");
-        
-        set_parameters(A);
-        set_drv(A(0)->_drv());
-        //set_rv(A(0)->_rv());
-
-        string options;
-        if(set.lookupValue( "options", options ))
-                set_options(options);   
-}
-
-/*void MultiModel::to_setting( Setting &set ) const
-{       
-        Transport::to_setting( set );
-
-        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
-        kilometers_setting = kilometers;
-
-        UI::save( passengers, set, "passengers" );
-}*/
-
-
-}
+}