Changeset 622 for applications/bdmtoolbox

Timestamp:

09/16/09 22:52:57 (15 years ago)

Author:

smidl

Message:

astyle

Location:

applications/bdmtoolbox

Files:

• mex/estimator.cpp (modified) (5 diffs)
• mex/merger.cpp (modified) (2 diffs)
• mex/mxstruct2config.cpp (modified) (1 diff)
• mex/simulator.cpp (modified) (6 diffs)
• tutorial/arx_mex_test.cfg (modified) (3 diffs)
• tutorial/arx_test.cfg (modified) (3 diffs)

applications/bdmtoolbox/mex/estimator.cpp

@@ -9 +9 @@
         {rank="same"; "Data Source"; "Bayesian Model"}
         "Data Source" -> "Bayesian Model" [label="data"];
-        "Bayesian Model" -> "Result Logger" [label="estimated\n statistics"]; 
+        "Bayesian Model" -> "Result Logger" [label="estimated\n statistics"];
         "Data Source" -> "Result Logger" [label="Simulated\n data"];
 }
 \enddot
 
-Here, 
+Here,
 \li Data Source is an object (class DS) providing sequential data, \f$ [d_1, d_2, \ldots d_t] \f$.
 \li Bayesian Model is an object (class BM) performing Bayesian filtering,
@@ -65 +65 @@
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
         // Check the number of inputs and output arguments
-        if(n_input<2) mexErrMsgTxt("Usage:\n"  
-                "result=estimator(system, estimators, experiment, logger)\n"
-                "  system     = struct('class','datasource',...);  % Estimated system\n"
-                "  estimators = {struct('class','estimator',...),  % Estimators\n"
-                "                struct('class','estimator',...),...} \n"
-                "  === optional ==="
-                "  experiment = struct('ndat',10);                 % number of data in experiment, full length of finite datasources, 10 otherwise \n"
-                "  logger     = struct('class','mexlogger');       % How to store results, default=mexlog, i.e. matlab structure\n\n"
-                "see documentation of classes datasource, BM, and mexlogger and their offsprings in BDM.");
-        
+        if ( n_input<2 ) mexErrMsgTxt ( "Usage:\n"
+                                                "result=estimator(system, estimators, experiment, logger)\n"
+                                                "  system     = struct('class','datasource',...);  % Estimated system\n"
+                                                "  estimators = {struct('class','estimator',...),  % Estimators\n"
+                                                "                struct('class','estimator',...),...} \n"
+                                                "  === optional ==="
+                                                "  experiment = struct('ndat',10);                 % number of data in experiment, full length of finite datasources, 10 otherwise \n"
+                                                "  logger     = struct('class','mexlogger');       % How to store results, default=mexlog, i.e. matlab structure\n\n"
+                                                "see documentation of classes datasource, BM, and mexlogger and their offsprings in BDM." );
+
         RV::clear_all();
-        //CONFIG 
+        //CONFIG
         UImxArray Cfg;
-        try{
-        Cfg.addGroup(input[0],"system");
-        Cfg.addList(input[1],"estimators");
-        if (n_input>2){
-                Cfg.addGroup(input[2],"experiment");
-        }
-        if (n_input>3){
-                Cfg.addGroup(input[3],"logger");
-        }/*else{
+        try {
+                Cfg.addGroup ( input[0],"system" );
+                Cfg.addList ( input[1],"estimators" );
+                if ( n_input>2 ) {
+                        Cfg.addGroup ( input[2],"experiment" );
+                }
+                if ( n_input>3 ) {
+                        Cfg.addGroup ( input[3],"logger" );
+                }/*else{
                 // define logger as mexlog
                 Setting &S=Cfg.getRoot();
@@ -97 +97 @@
                 S["logger"]["maxlen"]=maxlen;
         }*/
-        } catch(SettingException e){it_error("error: "+string(e.getPath()));}
+        } catch ( SettingException e ) {
+                it_error ( "error: "+string ( e.getPath() ) );
+        }
 
         //DBG
-        Cfg.writeFile("estimator.cfg");
+        Cfg.writeFile ( "estimator.cfg" );
 
 #else
@@ -112 +114 @@
         UIFile Cfg ( fname );
 #endif
-        
-        shared_ptr<DS> Ds = UI::build<DS>( Cfg, "system" );
-        Array<shared_ptr<BM> > Es;      UI::get(Es,Cfg, "estimators" );
+
+        shared_ptr<DS> Ds = UI::build<DS> ( Cfg, "system" );
+        Array<shared_ptr<BM> > Es;
+        UI::get ( Es,Cfg, "estimators" );
         long Ndat=10;
-        if (Cfg.exists("experiment")) {
-                if (Cfg.lookupValue ( "experiment.ndat",Ndat )) {
-                        bdm_assert(Ndat<=Ds->max_length(), "Data source has less data then required");
+        if ( Cfg.exists ( "experiment" ) ) {
+                if ( Cfg.lookupValue ( "experiment.ndat",Ndat ) ) {
+                        bdm_assert ( Ndat<=Ds->max_length(), "Data source has less data then required" );
                 };
         } else {
-                if (Ds->max_length() < inf) {
+                if ( Ds->max_length() < inf ) {
                         Ndat=Ds->max_length();
-                };// else Ndat=10;
+                }
+                ;// else Ndat=10;
         }
-        shared_ptr<logger> L = UI::build<logger>( Cfg, "logger",UI::optional);
-        if (!L) {
-                #ifdef MEX
+        shared_ptr<logger> L = UI::build<logger> ( Cfg, "logger",UI::optional );
+        if ( !L ) {
+#ifdef MEX
                 //mex logger has only from_setting constructor - we  have to fill it...
-                L=new mexlog(Ndat);
-                #else
+                L=new mexlog ( Ndat );
+#else
                 L=new stdlog();
-                #endif
+#endif
         }
-        
+
         Ds->log_add ( *L );
         string Ename;
         Setting &S=Cfg;
-        for (int i=0; i<Es.length(); i++){
-                try{
-                        UI::get(Ename, S["estimators"][i], "name");
-                } catch (UIException e){
-                        Ename="Est"+num2str(i);
+        for ( int i=0; i<Es.length(); i++ ) {
+                try {
+                        UI::get ( Ename, S["estimators"][i], "name" );
+                } catch ( UIException e ) {
+                        Ename="Est"+num2str ( i );
                 }
-                
-                Es(i)->log_add(*L,Ename); // estimate
+
+                Es ( i )->log_add ( *L,Ename ); // estimate
         }
-                L->init();
+        L->init();
 
         vec dt=zeros ( Ds->_drv()._dsize() );   //data variable
-        Array<datalink*> Dls(Es.length()); 
-        for (int i=0; i<Es.length(); i++){
-                Dls(i)=new datalink( Es(i)->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
+        Array<datalink*> Dls ( Es.length() );
+        for ( int i=0; i<Es.length(); i++ ) {
+                Dls ( i ) =new datalink ( Es ( i )->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
         }
-        
+
         for ( int tK=0;tK<Ndat;tK++ ) {
                 Ds->getdata ( dt );                                     // read data
                 Ds->logit ( *L );
-                
-                for (int i=0; i<Es.length(); i++){
-                        Es(i)->bayes ( Dls(i)->pushdown ( dt ) );               // update estimates
-                        Es(i)->logit (*L);
+
+                for ( int i=0; i<Es.length(); i++ ) {
+                        Es ( i )->bayes ( Dls ( i )->pushdown ( dt ) );         // update estimates
+                        Es ( i )->logit ( *L );
                 }
                 L->step();
@@ -171 +175 @@
 
 #ifdef MEX
-        mexlog* mL=dynamic_cast<mexlog*>(L.get());
+        mexlog* mL=dynamic_cast<mexlog*> ( L.get() );
 
-        if (mL) { // user wants output!!
+        if ( mL ) { // user wants output!!
                 if ( n_output<1 ) mexErrMsgTxt ( "Wrong number of output variables!" );
                 output[0] = mL->toCell();

applications/bdmtoolbox/mex/merger.cpp

@@ -29 +29 @@
 
 #ifdef MEX
-void mexFunction (int n_output, mxArray *output[], int n_input, const mxArray *input[])
-{
+void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
         // Check the number of inputs and output arguments
-        if (n_input != 3) mexErrMsgTxt ("Usage:\n"
-                                            "result=merger(sources, support, merger)\n"
-                                            "  sources= { struct('class','epdf'),... };  % cell of pdfs (epdfs or mpdfs) to be merged,\n"
-                                            "  support= struct(\n"
-                                            "           grid    = {[dim1_start,dim1_end], [dim2_start, dim2_end]...}  %support boundary \n"
-                                            "           nbins   = [bins_in_dim1, bins_in_dim2,...]                    %fixed \n"
-                                            "         === OR ==\n"
-                                            "           pdf     = struct('class','epdf'); % pdf to draw samples from\n"
-                                            "           nsamples= 100;                    % number of samples\n"
-                                            "           );\n"
-                                            "        If all elements are present,  (grid,nbins) is used;\n"
-                                            "  merger = struct('class','merger_*');       % object to be used for merging,\n\n"
-                                            "see documentation of classes epdf, mpdf, merger_base and their offsprings in BDM.");
+        if ( n_input != 3 ) mexErrMsgTxt ( "Usage:\n"
+                                                   "result=merger(sources, support, merger)\n"
+                                                   "  sources= { struct('class','epdf'),... };  % cell of pdfs (epdfs or mpdfs) to be merged,\n"
+                                                   "  support= struct(\n"
+                                                   "           grid    = {[dim1_start,dim1_end], [dim2_start, dim2_end]...}  %support boundary \n"
+                                                   "           nbins   = [bins_in_dim1, bins_in_dim2,...]                    %fixed \n"
+                                                   "         === OR ==\n"
+                                                   "           pdf     = struct('class','epdf'); % pdf to draw samples from\n"
+                                                   "           nsamples= 100;                    % number of samples\n"
+                                                   "           );\n"
+                                                   "        If all elements are present,  (grid,nbins) is used;\n"
+                                                   "  merger = struct('class','merger_*');       % object to be used for merging,\n\n"
+                                                   "see documentation of classes epdf, mpdf, merger_base and their offsprings in BDM." );
         RV::clear_all();
         // LOAD CONFIG
         UImxArray Cfg;
-        Cfg.addList (input[0], "Sources");
-        Cfg.addGroup (input[1], "Support");
-        Cfg.addGroup (input[2], "Merger");
+        Cfg.addList ( input[0], "Sources" );
+        Cfg.addGroup ( input[1], "Support" );
+        Cfg.addGroup ( input[2], "Merger" );
 
         //DBG
-        Cfg.writeFile ("merger.cfg");
+        Cfg.writeFile ( "merger.cfg" );
 #else
 int main() {
-        UIFile Cfg ("merger.cfg");
+        UIFile Cfg ( "merger.cfg" );
 #endif
         // Sources
         Array<shared_ptr<mpdf> > Sources;
         //abuse Mer to store sources
-        Setting& _Sources = Cfg.lookup ("Sources");
+        Setting& _Sources = Cfg.lookup ( "Sources" );
         int Slen = _Sources.getLength();
-        Sources.set_size (Slen);
-        for (int i = 0; i < Slen; i++) {
+        Sources.set_size ( Slen );
+        for ( int i = 0; i < Slen; i++ ) {
                 try {
-                        shared_ptr<mpdf> mtmp = UI::build<mpdf> (_Sources, i);
-                        Sources (i) = mtmp;
-                } catch (UIException) {
+                        shared_ptr<mpdf> mtmp = UI::build<mpdf> ( _Sources, i );
+                        Sources ( i ) = mtmp;
+                } catch ( UIException ) {
                         // it is not mpdf - see if it is epdf
                         try {
-                                shared_ptr<epdf> etmp = UI::build<epdf> (_Sources, i);
-                                if (etmp) {
-                                        Sources (i) = new mepdf (etmp); // hopefully OK
+                                shared_ptr<epdf> etmp = UI::build<epdf> ( _Sources, i );
+                                if ( etmp ) {
+                                        Sources ( i ) = new mepdf ( etmp ); // hopefully OK
                                 }
-                        } catch (UIException &e) {
-                                it_error ("No mpdfs or epdfs found! " + string (e.what()));
-                        } catch (std::exception e) {
-                                it_error ("Error in UI at " + _Sources[i].getPath());
+                        } catch ( UIException &e ) {
+                                it_error ( "No mpdfs or epdfs found! " + string ( e.what() ) );
+                        } catch ( std::exception e ) {
+                                it_error ( "Error in UI at " + _Sources[i].getPath() );
                         }
-                } catch (std::exception &e) {
-                        it_error ("Error in UI at " + _Sources[i].getPath());
+                } catch ( std::exception &e ) {
+                        it_error ( "Error in UI at " + _Sources[i].getPath() );
                 }
         }
 
-        shared_ptr<merger_base> Merger = UI::build<merger_base> (Cfg, "Merger");
+        shared_ptr<merger_base> Merger = UI::build<merger_base> ( Cfg, "Merger" );
 
         // Support
         try {
-                shared_ptr<rectangular_support> RecSup = UI::build<rectangular_support> (Cfg, "Support");
-                Merger->set_support(*RecSup);
-        }
-        catch (UIException &e) {
-                shared_ptr<discrete_support> DisSup = UI::build<discrete_support> (Cfg, "Support");
-                Merger->set_support (*DisSup);
+                shared_ptr<rectangular_support> RecSup = UI::build<rectangular_support> ( Cfg, "Support" );
+                Merger->set_support ( *RecSup );
+        } catch ( UIException &e ) {
+                shared_ptr<discrete_support> DisSup = UI::build<discrete_support> ( Cfg, "Support" );
+                Merger->set_support ( *DisSup );
         }
 // COMPUTE RESULTS
-        Merger->set_sources (Sources); 
+        Merger->set_sources ( Sources );
         Merger->merge();
 
 // save results
-        Array<vec> source_vals (Sources.length());
-        for (int i = 0;i < Sources.length();i++) {
+        Array<vec> source_vals ( Sources.length() );
+        for ( int i = 0;i < Sources.length();i++ ) {
                 datalink_m2e dl;
-                dl.set_connection (Sources (i)->_rv(), Sources (i)->_rvc(), Merger->_rv());
+                dl.set_connection ( Sources ( i )->_rv(), Sources ( i )->_rvc(), Merger->_rv() );
 
-                vec ll (Merger->_Smp()._samples().length());
-                for (int j = 0; j < Merger->_Smp()._samples().length(); j++) {
-                        vec dt = dl.pushdown (Merger->_Smp()._samples() (j));
-                        vec dtc = dl.get_cond (Merger->_Smp()._samples() (j));
-                        ll (j) = Sources (i)->evallogcond (dt, dtc);
+                vec ll ( Merger->_Smp()._samples().length() );
+                for ( int j = 0; j < Merger->_Smp()._samples().length(); j++ ) {
+                        vec dt = dl.pushdown ( Merger->_Smp()._samples() ( j ) );
+                        vec dtc = dl.get_cond ( Merger->_Smp()._samples() ( j ) );
+                        ll ( j ) = Sources ( i )->evallogcond ( dt, dtc );
                 }
 
-                vec sll = exp (ll);
+                vec sll = exp ( ll );
 
-                source_vals (i) = sll / sum (sll);
+                source_vals ( i ) = sll / sum ( sll );
         }
 
-        merger_mix* MerMix=dynamic_cast<merger_mix*>(Merger.get());
+        merger_mix* MerMix=dynamic_cast<merger_mix*> ( Merger.get() );
         vec mix_val;
-                        
-        if (MerMix){
-                vec ll (Merger->_Smp()._samples().length());
-                for (int j = 0; j < Merger->_Smp()._samples().length(); j++) {
-                        ll (j) = Merger->evallog (Merger->_Smp()._samples() (j));
+
+        if ( MerMix ) {
+                vec ll ( Merger->_Smp()._samples().length() );
+                for ( int j = 0; j < Merger->_Smp()._samples().length(); j++ ) {
+                        ll ( j ) = Merger->evallog ( Merger->_Smp()._samples() ( j ) );
                 }
-        
-                vec sll = exp (ll);
-        
-                mix_val = sll / sum (sll);
+
+                vec sll = exp ( ll );
+
+                mix_val = sll / sum ( sll );
         }
 
@@ -135 +133 @@
         mxArray* tmp ;
         // Save results
-        if (n_output > 0) {
-                tmp = mxCreateStructMatrix (1, 1, 0, NULL);
+        if ( n_output > 0 ) {
+                tmp = mxCreateStructMatrix ( 1, 1, 0, NULL );
                 //support
                 Array<vec> &samples = Merger->_Smp()._samples();
-                if (samples.size() > 0) {
-                        mxArray* fld = mxCreateDoubleMatrix (samples (0).length(), samples.size(), mxREAL);
-                        Arrayvec2mxArray (samples, fld);
-                        mxReplaceFieldNM (tmp, "support", fld);
+                if ( samples.size() > 0 ) {
+                        mxArray* fld = mxCreateDoubleMatrix ( samples ( 0 ).length(), samples.size(), mxREAL );
+                        Arrayvec2mxArray ( samples, fld );
+                        mxReplaceFieldNM ( tmp, "support", fld );
                 }
 
                 //weights
                 vec &w = Merger->_Smp()._w();
-                mxArray* fldw = mxCreateDoubleMatrix (1, w.length(), mxREAL);
-                vec2mxArray (w, fldw);
-                mxReplaceFieldNM (tmp, "weights", fldw);
+                mxArray* fldw = mxCreateDoubleMatrix ( 1, w.length(), mxREAL );
+                vec2mxArray ( w, fldw );
+                mxReplaceFieldNM ( tmp, "weights", fldw );
 
                 //mixture values
-                if (mix_val.length()>0){
-                        mxArray* fldm = mxCreateDoubleMatrix (1, w.length(), mxREAL);
-                        vec2mxArray (mix_val, fldm);
-                        mxReplaceFieldNM (tmp, "mix", fldm);
+                if ( mix_val.length() >0 ) {
+                        mxArray* fldm = mxCreateDoubleMatrix ( 1, w.length(), mxREAL );
+                        vec2mxArray ( mix_val, fldm );
+                        mxReplaceFieldNM ( tmp, "mix", fldm );
                 }
                 // sources
                 char srcstr[20];
-                for (int i = 0;i < Sources.length();i++) {
-                        sprintf (srcstr, "source%d", i + 1);
-                        mxArray* fldw = mxCreateDoubleMatrix (1, source_vals (i).length(), mxREAL);
-                        vec2mxArray (source_vals (i), fldw);
-                        mxReplaceFieldNM (tmp, srcstr, fldw);
+                for ( int i = 0;i < Sources.length();i++ ) {
+                        sprintf ( srcstr, "source%d", i + 1 );
+                        mxArray* fldw = mxCreateDoubleMatrix ( 1, source_vals ( i ).length(), mxREAL );
+                        vec2mxArray ( source_vals ( i ), fldw );
+                        mxReplaceFieldNM ( tmp, srcstr, fldw );
                 }
 

applications/bdmtoolbox/mex/mxstruct2config.cpp

@@ -2 +2 @@
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
-        UImxArray F (input[0]);
-        string filename = mxArray2string(input[1]);
-        F.writeFile(filename.c_str());
+        UImxArray F ( input[0] );
+        string filename = mxArray2string ( input[1] );
+        F.writeFile ( filename.c_str() );
 }

applications/bdmtoolbox/mex/simulator.cpp

@@ -12 +12 @@
 \enddot
 
-Here, 
+Here,
 \li Data Source is an object (class DS) providing sequential data, \f$ [d_1, d_2, \ldots d_t] \f$.
 \li Result Logger is an object (class logger) dedicated to storing important data from the experiment.
@@ -56 +56 @@
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
         // Check the number of inputs and output arguments
-        if(n_input<1) mexErrMsgTxt("Usage:\n"  
-                "result=simulator(system,  experiment, logger)\n"
-                "  system     = struct('class','datasource',...);  % Estimated system\n"
-                "  === optional ==="
-                "  experiment = struct('ndat',10);                 % number of data in experiment, full length of finite datasources, 10 otherwise \n"
-                "  logger     = struct('class','mexlogger');       % How to store results, default=mexlog, i.e. matlab structure\n\n"
-                "see documentation of classes datasource and mexlogger and their offsprings in BDM.");
-        
+        if ( n_input<1 ) mexErrMsgTxt ( "Usage:\n"
+                                                "result=simulator(system,  experiment, logger)\n"
+                                                "  system     = struct('class','datasource',...);  % Estimated system\n"
+                                                "  === optional ==="
+                                                "  experiment = struct('ndat',10);                 % number of data in experiment, full length of finite datasources, 10 otherwise \n"
+                                                "  logger     = struct('class','mexlogger');       % How to store results, default=mexlog, i.e. matlab structure\n\n"
+                                                "see documentation of classes datasource and mexlogger and their offsprings in BDM." );
+
         RV::clear_all();
-        //CONFIG 
+        //CONFIG
         UImxArray Cfg;
-        try{
-        Cfg.addGroup(input[0],"system");
-        if (n_input>2){
-                Cfg.addGroup(input[1],"experiment");
-        }
-        if (n_input>3){
-                Cfg.addGroup(input[2],"logger");
-        }/*else{
+        try {
+                Cfg.addGroup ( input[0],"system" );
+                if ( n_input>2 ) {
+                        Cfg.addGroup ( input[1],"experiment" );
+                }
+                if ( n_input>3 ) {
+                        Cfg.addGroup ( input[2],"logger" );
+                }/*else{
                 // define logger as mexlog
                 Setting &S=Cfg.getRoot();
@@ -85 +85 @@
                 S["logger"]["maxlen"]=maxlen;
         }*/
-        } catch(SettingException e){it_error("error: "+string(e.getPath()));}
+        } catch ( SettingException e ) {
+                it_error ( "error: "+string ( e.getPath() ) );
+        }
 
         //DBG
-        Cfg.writeFile("simulator.cfg");
+        Cfg.writeFile ( "simulator.cfg" );
 
 #else
@@ -100 +102 @@
         UIFile Cfg ( fname );
 #endif
-        
-        shared_ptr<DS> Ds = UI::build<DS>( Cfg, "system" );
+
+        shared_ptr<DS> Ds = UI::build<DS> ( Cfg, "system" );
         long Ndat=10;
-        if (Cfg.exists("experiment")) {
-                if (Cfg.lookupValue ( "experiment.ndat",Ndat )) {
-                        bdm_assert(Ndat<=Ds->max_length(), "Data source has less data then required");
+        if ( Cfg.exists ( "experiment" ) ) {
+                if ( Cfg.lookupValue ( "experiment.ndat",Ndat ) ) {
+                        bdm_assert ( Ndat<=Ds->max_length(), "Data source has less data then required" );
                 };
         } else {
-                if (Ds->max_length() < std::numeric_limits< int >::max()) {
+                if ( Ds->max_length() < std::numeric_limits< int >::max() ) {
                         Ndat=Ds->max_length();
-                };// else Ndat=10;
+                }
+                ;// else Ndat=10;
         }
-        shared_ptr<logger> L = UI::build<logger>( Cfg, "logger",UI::optional);
-        if (!L) {
-                #ifdef MEX
+        shared_ptr<logger> L = UI::build<logger> ( Cfg, "logger",UI::optional );
+        if ( !L ) {
+#ifdef MEX
                 //mex logger has only from_setting constructor - we  have to fill it...
-                L=new mexlog(Ndat);
-                #else
+                L=new mexlog ( Ndat );
+#else
                 L=new stdlog();
-                #endif
+#endif
         }
-        
+
         Ds->log_add ( *L );
         L->init();
@@ -130 +133 @@
                 Ds->getdata ( dt );                                     // read data
                 Ds->logit ( *L );
-                
+
                 L->step();
                 Ds->step();                                                     // simulator step
@@ -139 +142 @@
 
 #ifdef MEX
-        mexlog* mL=dynamic_cast<mexlog*>(L.get());
+        mexlog* mL=dynamic_cast<mexlog*> ( L.get() );
 
-        if (mL) { // user wants output!!
+        if ( mL ) { // user wants output!!
                 if ( n_output<1 ) mexErrMsgTxt ( "Wrong number of output variables!" );
                 output[0] = mL->toCell();

applications/bdmtoolbox/tutorial/arx_mex_test.cfg

@@ -1 +1 @@
 //Data generating system
-system = { type="external"; filename="arx_test.cfg"; path="system";};
+system = { type="external";
+           filename="arx_test.cfg";
+           path="system";
+         };
 
 //store results
@@ -6 +9 @@
         type= "mexlog";
         maxlen = 90; //
-    //dirname = "exp/ax";
+        //dirname = "exp/ax";
 };
 
 //estimation
 estimator = {
-   type = "ARX";
-        y = {type="RV"; names=("y"); };
+        type = "ARX";
+        y = {type="RV";
+             names= ( "y" );
+            };
         rgr = {type="RV";
-                names = ("y","y","y","u");
-                times = [-1, -2, -3, -1];
-        };
+               names = ( "y","y","y","u" );
+               times = [-1, -2, -3, -1];
+              };
 
         //optional fields
-        dV0 = matrix(5,1,[1e-3, 1e-5, 1e-5, 1e-5, 1e-5]); //default: 1e-3 for y, 1e-5 for rgr
+        dV0 = matrix ( 5,1,[1e-3, 1e-5, 1e-5, 1e-5, 1e-5] ); //default: 1e-3 for y, 1e-5 for rgr
         //nu0 = 8.;      //default: rgrlen + 2
         frg = .9991;    // forgetting, default frg=1.0
@@ -25 +30 @@
 
 //experiment description
-experiment:{
+experiment: {
         ndat = 90;
 };

applications/bdmtoolbox/tutorial/arx_test.cfg

@@ -2 +2 @@
 system = {
         class = "ArxDS";
-        y = {class="RV"; names=("y", "u");};
-        u = {class="RV"; names=(); };
+        y = {class="RV";
+             names= ( "y", "u" );
+            };
+        u = {class="RV";
+             names=();
+            };
         rgr = {class="RV";
-                names = ("y","y","y","u");
-                times = [-1, -2, -3, -1];
-        };
+               names = ( "y","y","y","u" );
+               times = [-1, -2, -3, -1];
+              };
         //AR parameters
-        theta = (2,4,[0.8, -0.3, 0.4, 1.0,
-                      0.0, 0.0, 0.0, 0.0]);
+        theta = ( 2,4,[0.8, -0.3, 0.4, 1.0,
+                       0.0, 0.0, 0.0, 0.0] );
         // offset
         offset = [0.0, 0.0];
         //variance
-        r = (2,2,[0.1, 0.0,
-                 0.0, 1.0] );
+        r = ( 2,2,[0.1, 0.0,
+                   0.0, 1.0] );
         // log also theta
         opt="L_theta";
@@ -30 +34 @@
 estimator = {
         class = "ARX";
-        y = {class="RV"; names=("y"); };
+        y = {class="RV";
+             names= ( "y" );
+            };
         rgr = {class="RV";
-                names = ("y","y","y","u");
-                times = [-1, -2, -3, -1];
-        };
+               names = ( "y","y","y","u" );
+               times = [-1, -2, -3, -1];
+              };
 
         //optional fields
@@ -43 +49 @@
 
 //experiment description
-experiment:{
+experiment: {
         ndat = 9000;
 };