Changeset 606

Timestamp:

09/10/09 17:38:09 (15 years ago)

Author:

smidl

Message:

ticket 12

Location:

library/bdm

Files:

• CMakeLists.txt (modified) (1 diff)
• estim/arx_straux.cpp (modified) (1 diff)
• estim/arx_straux.h (modified) (1 diff)

library/bdm/CMakeLists.txt

@@ -6 +6 @@
         math/functions.cpp math/functions.h)
 SET(bdm_stat stat/exp_family.cpp stat/exp_family.h stat/emix.cpp stat/emix.h stat/merger.h stat/merger.cpp)
-SET(bdm_estim estim/kalman.cpp estim/kalman.h estim/particles.cpp estim/particles.h estim/arx.cpp estim/arx.h estim/mixtures.cpp estim/mixtures.h)
+SET(bdm_estim estim/kalman.cpp estim/kalman.h estim/particles.cpp estim/particles.h estim/arx.cpp estim/arx.h estim/arx_straux.cpp estim/mixtures.cpp estim/mixtures.h)
 SET(bdm_ctrl design/ctrlbase.cpp design/ctrlbase.h)
 SET(bdm_user_info base/libconfig/libconfigcpp.cc base/libconfig/grammar.c base/libconfig/libconfig.c base/libconfig/scanner.c 

library/bdm/estim/arx_straux.cpp

@@ -3 +3 @@
 namespace bdm {
 
-ivec straux1(ldmat Ld, double nu, ldmat Ld0, double nu0/*, ivec belief, int nbest, int max_nrep, double lambda, int order_k, ivec &rgrsout*/);{
+  struct str_aux {
+        vec d0;
+        double nu0;
+        mat L0;
+        mat L;
+        vec d;
+        double nu;
+        ivec strL;                 // Current structure of L and d
+        ivec strRgr;               // Structure elements currently inside regressor (after regressand)
+        ivec strMis;               // structure elements, that are currently outside regressor (before regressand)
+        int posit1;                // regressand position
+        int nbits;                                 // number of bits available in double
+        int bitstr; 
+        double loglik;          // loglikelihood
+  };
+  
+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
 
-return ivec();
+const mat &L = Ld._L();
+const vec &d = Ld._D();
+
+const mat &L0 = Ld0._L();
+const vec &d0 = Ld0._D();
+
+int n_data = d.length();
+
+ivec belief_out = find(belief==4)+1; // we are avoiding to put this into regressor
+ivec belief_in  = find(belief==1)+1; // we are instantly keeping this in regressor
+
+str_aux full;
+
+full.d0  = d0;
+full.nu0 = nu0;
+full.L0  = L0;
+full.L   = L;
+full.d   = d;
+full.nu  = nu;
+full.strL = linspace(1,n_data);
+full.strRgr = linspace(2,n_data);
+full.strMis = ivec(0);                     
+full.posit1 = 1;   
+//full.nbits  = floor(log2(bitmax))-1;  //!!!!!!!
+
 }
 
+
+
 }

library/bdm/estim/arx_straux.h

@@ -17 +17 @@
 
         //! 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*/);
+ivec straux1(ldmat Ld, double nu, ldmat Ld0, double nu0, ivec belief, int nbest, int max_nrep, double lambda, int order_k, ivec &rgrsout);
 
 }