Changeset 737 for library/bdm/estim/arx.cpp

Timestamp:

11/25/09 12:14:38 (15 years ago)

Author:

mido

Message:

ASTYLER RUN OVER THE WHOLE LIBRARY, JUPEE

Files:

• library/bdm/estim/arx.cpp (modified) (6 diffs)

library/bdm/estim/arx.cpp

@@ -3 +3 @@
 
 void ARX::bayes_weighted ( const vec &yt, const vec &cond, const double w ) {
-                
-        bdm_assert_debug(yt.length()>=dimy,"ARX::bayes yt is smaller then dimc");       
-        bdm_assert_debug(cond.length()>=dimc,"ARX::bayes cond is smaller then dimc");   
+
+        bdm_assert_debug ( yt.length() >= dimy, "ARX::bayes yt is smaller then dimc" );
+        bdm_assert_debug ( cond.length() >= dimc, "ARX::bayes cond is smaller then dimc" );
         double lnc;
         //cache
-        ldmat &V=est._V(); 
-        double &nu=est._nu();
-
-        dyad.set_subvector(0,yt);
-        dyad.set_subvector(dimy,cond);
+        ldmat &V = est._V();
+        double &nu = est._nu();
+
+        dyad.set_subvector ( 0, yt );
+        dyad.set_subvector ( dimy, cond );
         // possible "1" is there from the beginning
-        
+
         if ( frg < 1.0 ) {
                 est.pow ( frg ); // multiply V and nu
 
-                
+
                 //stabilize
-                ldmat V0=alter_est._V(); //$ copy
-                double &nu0=alter_est._nu();
-                
-                V0*=(1-frg);
+                ldmat V0 = alter_est._V(); //$ copy
+                double &nu0 = alter_est._nu();
+
+                V0 *= ( 1 - frg );
                 V += V0; //stabilization
-                nu +=(1-frg)*nu0;
-                
+                nu += ( 1 - frg ) * nu0;
+
                 // recompute loglikelihood of new "prior"
                 if ( evalll ) {
@@ -50 +50 @@
         double lll;
         vec dyad_p = dyad;
-        dyad_p.set_subvector(0,yt);
+        dyad_p.set_subvector ( 0, yt );
 
         if ( frg < 1.0 ) {
@@ -101 +101 @@
 mlstudent* ARX::predictor_student ( ) const {
         const ldmat &V = posterior()._V();
-        
+
         mat mu ( dimy, V.rows() - dimy );
         mat R ( dimy, dimy );
@@ -114 +114 @@
 
 
-        if ( have_constant) { // no constant term
+        if ( have_constant ) { // no constant term
                 //Assume the constant term is the last one:
                 if ( mu.cols() > 1 ) {
@@ -206 +206 @@
         // rgrlen - including constant!!!
         dimc = rrv->_dsize();
-        
+
         yrv = *yrv_;
         rvc = *rrv;
-        
+
         string opt;
-        if ( UI::get(opt, set,  "options", UI::optional) ) {
-                BM::set_options(opt);
+        if ( UI::get ( opt, set,  "options", UI::optional ) ) {
+                BM::set_options ( opt );
         }
         int constant;
-        if (!UI::get(constant, set, "constant", UI::optional)){
-                have_constant=true;
-        } else {
-                have_constant=constant>0;
-        }
-        int rgrlen = dimc+int(have_constant==true);
+        if ( !UI::get ( constant, set, "constant", UI::optional ) ) {
+                have_constant = true;
+        } else {
+                have_constant = constant > 0;
+        }
+        int rgrlen = dimc + int ( have_constant == true );
 
         //init
-        shared_ptr<egiw> pri=UI::build<egiw>(set, "prior", UI::optional);
-        if (pri) {
-                bdm_assert(pri->_dimx()==dimy,"prior is not compatible");
-                bdm_assert(pri->_V().rows()==dimy+rgrlen,"prior is not compatible");
-                est.set_parameters( pri->_dimx(),pri->_V(), pri->_nu());
-        }else{
-                est.set_parameters( dimy, zeros(dimy+rgrlen));
-                set_prior_default(est);
-        }
-                
-        shared_ptr<egiw> alt=UI::build<egiw>(set, "alternative", UI::optional);
-        if (alt) {
-                bdm_assert(alt->_dimx()==dimy,"alternative is not compatible");
-                bdm_assert(alt->_V().rows()==dimy+rgrlen,"alternative is not compatible");
-                alter_est.set_parameters( alt->_dimx(),alt->_V(), alt->_nu());
+        shared_ptr<egiw> pri = UI::build<egiw> ( set, "prior", UI::optional );
+        if ( pri ) {
+                bdm_assert ( pri->_dimx() == dimy, "prior is not compatible" );
+                bdm_assert ( pri->_V().rows() == dimy + rgrlen, "prior is not compatible" );
+                est.set_parameters ( pri->_dimx(), pri->_V(), pri->_nu() );
+        } else {
+                est.set_parameters ( dimy, zeros ( dimy + rgrlen ) );
+                set_prior_default ( est );
+        }
+
+        shared_ptr<egiw> alt = UI::build<egiw> ( set, "alternative", UI::optional );
+        if ( alt ) {
+                bdm_assert ( alt->_dimx() == dimy, "alternative is not compatible" );
+                bdm_assert ( alt->_V().rows() == dimy + rgrlen, "alternative is not compatible" );
+                alter_est.set_parameters ( alt->_dimx(), alt->_V(), alt->_nu() );
         } else {
                 alter_est = est;
@@ -247 +247 @@
 
         set_parameters ( frg );
-        
+
         //name results (for logging)
-        shared_ptr<RV> rv_par=UI::build<RV>(set, "rv_param",UI::optional );
-        if (!rv_par){
+        shared_ptr<RV> rv_par = UI::build<RV> ( set, "rv_param", UI::optional );
+        if ( !rv_par ) {
                 est.set_rv ( RV ( "{theta r }", vec_2 ( dimy*rgrlen, dimy*dimy ) ) );
         } else {