Changeset 377 for bdm/stat/libDS.cpp

Timestamp:

06/15/09 18:27:16 (15 years ago)

Author:

mido

Message:

1) globalni prejmenovani Setting &root na Setting &set
2) smazani par zastaralych adresaru
3) oprava warningu v doc\local
4) prejmenovani SettingsResolver? na SettingResolver? a drobne vylepseni funkcnosti
5) odstranena duplikace kodu v user_info.cpp

Files:

• bdm/stat/libDS.cpp (modified) (5 diffs)

bdm/stat/libDS.cpp

@@ -1 +1 @@
 
 #include "libDS.h"
-//#include "..\user_info.h"
 
 using namespace bdm;
@@ -55 +54 @@
 }
 
-void ArxDS::from_setting( const Setting &root ) 
+void ArxDS::from_setting( const Setting &set ) 
 {       
-        RV *yrv = UI::build<RV>( root, "y" );
-        RV *urv = UI::build<RV>( root, "u" );
-        RV *rrv = UI::build<RV>( root, "rgr" ); 
+        RV *yrv = UI::build<RV>( set, "y" );
+        RV *urv = UI::build<RV>( set, "u" );
+        RV *rrv = UI::build<RV>( set, "rgr" ); 
                                 
         mat Th;
-        UI::get( Th, root, "theta" );
+        UI::get( Th, set, "theta" );
 
         vec mu0;
-        if( root.exists( "offset" ))
-                UI::get( mu0, root, "offset" );
+        if( set.exists( "offset" ))
+                UI::get( mu0, set, "offset" );
         else
                 mu0= zeros( yrv->_dsize() );
 
         mat sqR;
-        UI::get( sqR, root, "r" );
+        UI::get( sqR, set, "r" );
         set_parameters(Th,mu0,sqR);
         set_drv(*yrv,*urv,*rrv);
 
-        if(root.exists("opt"))
-                set_options(root["opt"]);
+        if(set.exists("opt"))
+                set_options(set["opt"]);
 }
 
-/*void ArxDS::to_setting( Setting &root ) const
+/*void ArxDS::to_setting( Setting &set ) const
 {       
-        Transport::to_setting( root );
+        Transport::to_setting( set );
 
-        Setting &kilometers_setting = root.add("kilometers", Setting::TypeInt );
+        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
         kilometers_setting = kilometers;
 
-        UI::save( passengers, root, "passengers" );
+        UI::save( passengers, set, "passengers" );
 }*/
 
@@ -124 +123 @@
 }
 
-void ITppFileDS::from_setting( const Setting &root ) 
+void ITppFileDS::from_setting( const Setting &set ) 
 {       
-        RV* rvtmp = UI::build<RV>(root, "rv" );
+        RV* rvtmp = UI::build<RV>(set, "rv" );
 
-        it_file it ( root["filename"] );
-        it << Name ( root["varname"] ); 
+        it_file it ( set["filename"] );
+        it << Name ( set["varname"] ); 
         it >> Data;
         time = 0;
@@ -137 +136 @@
 }
 
-/*void ITppFileDS::to_setting( Setting &root ) const
+/*void ITppFileDS::to_setting( Setting &set ) const
 {       
-        Transport::to_setting( root );
+        Transport::to_setting( set );
 
-        Setting &kilometers_setting = root.add("kilometers", Setting::TypeInt );
+        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
         kilometers_setting = kilometers;
 
-        UI::save( passengers, root, "passengers" );
+        UI::save( passengers, set, "passengers" );
 }*/
 
-void stateDS::from_setting( const Setting &root ) 
+void stateDS::from_setting( const Setting &set ) 
 {       
-        IM = UI::build<mpdf>(root, "IM");
-        OM = UI::build<mpdf>(root, "OM");
+        IM = UI::build<mpdf>(set, "IM");
+        OM = UI::build<mpdf>(set, "OM");
 
         dt.set_length( OM->dimension() );
@@ -156 +155 @@
         ut.set_length(0);
         
-        RV* rvtmp = UI::build<RV>(root["IM"], "rvu");                   
+        RV* rvtmp = UI::build<RV>(set["IM"], "rvu");                    
         //set_drv(rvtmp);
 }
 
-/*void stateDS::to_setting( Setting &root ) const
+/*void stateDS::to_setting( Setting &set ) const
 {       
-        Transport::to_setting( root );
+        Transport::to_setting( set );
 
-        Setting &kilometers_setting = root.add("kilometers", Setting::TypeInt );
+        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
         kilometers_setting = kilometers;
 
-        UI::save( passengers, root, "passengers" );
+        UI::save( passengers, set, "passengers" );
 }*/