Changeset 585

Timestamp:

08/27/09 15:39:34 (15 years ago)

Author:

smidl

Message:

ticket #12 preparations

Location:

library/bdm/estim

Files:

• arx.cpp (modified) (5 diffs)
• arx.h (modified) (2 diffs)
• arx_straux.cpp (added)
• arx_straux.h (added)

library/bdm/estim/arx.cpp

@@ -1 +1 @@
 #include "arx.h"
-
 namespace bdm {
 
@@ -130 +129 @@
         return tmp;
 }
+
+
 
 /*! \brief Return the best structure
@@ -193 +194 @@
 }
 
-//! Rplication of Ludvik Tesar original straux1 from mixtools straux1
-ivec straux1(ldmat Ld, double nu, ldmat Ld0, double nu0/*, ivec belief, int nbest, int max_nrep, double lambda, int order_k, ivec &rgrsout*/){
-// see utia_legacy/ticket_12/ implementation and str_test.m
-}
 
 
 ivec ARX::structure_est_LT ( egiw est0 ) {
         //some stuff with beliefs etc.
-        ivec ind = straux1(V,nu, est0._V(), est0._nu());
-        return ind;
+//      ivec ind = bdm::straux1(V,nu, est0._V(), est0._nu());
+        return ivec();//ind;
 }
 
@@ -210 +207 @@
         int ylen = yrv->_dsize();
         int rgrlen = rrv->_dsize();
+
+        string opt;
+        if ( UI::get(opt, set,  "options", UI::optional) ) {
+                BM::set_options(opt);
+        }
 
         //init
@@ -232 +234 @@
         //name results (for logging)
         set_rv ( RV ( "{theta r }", vec_2 ( ylen*rgrlen, ylen*ylen ) ) );
-}
-
-}
+
+}
+
+}

library/bdm/estim/arx.h

@@ -17 +17 @@
 #include "../stat/exp_family.h"
 #include "../base/user_info.h"
+//#include "../estim/kalman.h"
+#include "arx_straux.h"
 
 namespace bdm {
@@ -144 +146 @@
         \code
         estimator = {
-                type = "ARX";
+                class = "ARX";
                 y = {type="rv", ...}   // description of output variables
                 rgr = {type="rv", ...} // description of regressor variables