Changeset 1383 for library/bdm

Timestamp:

08/18/11 16:02:53 (13 years ago)

Author:

sindj

Message:

Program update, kontrola vypoctu provedena, integruje spravne v nedegenerovanem pripade. JS

Location:

library/bdm

Files:

• base/itpp/CMakeLists.txt (modified) (1 diff)
• estim/arx.h (modified) (1 diff)
• stat/exp_family.h (modified) (1 diff)

library/bdm/base/itpp/CMakeLists.txt

@@ -13 +13 @@
 SET(itpp_math base/math/elem_math.cpp  base/math/error.cpp  base/math/integration.cpp  base/math/misc.cpp)
 
+SET(itpp_signal signal/fastica.cpp signal/filter.cpp signal/filter_design.cpp signal/freq_filt.cpp signal/poly.cpp signal/resampling.cpp signal/source.cpp signal/transforms.cpp signal/window.cpp)
+
+SET(itpp_stat stat/misc_stat.cpp stat/mog_diag.cpp stat/mog_diag_em.cpp stat/mog_diag_kmeans.cpp stat/mog_generic.cpp)
+
 # add BDMLIB compile flag
 #ADD_DEFINITIONS(-DNDEBUG)
 
 # Normal BDM library
-add_library (itpp STATIC ${itpp_base} ${itpp_algebra} ${itpp_bessel} ${itpp_math})
+add_library (itpp STATIC ${itpp_base} ${itpp_algebra} ${itpp_bessel} ${itpp_math} ${itpp_signal} ${itpp_stat})

library/bdm/estim/arx.h

@@ -311 +311 @@
         
         void bayes ( const vec &val, const vec &cond ) {
-                // fill window
-                Y.append_col(val);
-                Cond.append_col(cond);          
-                if (Y.cols()>win_length){
-                        // shift the buffer
-                        Y=Y.get_cols(1,Y.cols()-1);
-                        Cond=Cond.get_cols(1,Cond.cols()-1);
+                
+                if(cond.size()>0)
+                {
+                        // fill window
+                        Y.append_col(val);
+                        Cond.append_col(cond);          
+                        if (Y.cols()>win_length){
+                                // shift the buffer
+                                Y=Y.get_cols(1,Y.cols()-1);
+                                Cond=Cond.get_cols(1,Cond.cols()-1);
+                        }
+                        
+                        est._V()=V0;
+                        est._nu()=nu0;
+                        for ( int t = 0; t < Y.cols(); t++ ) {
+                                ARX::bayes ( Y.get_col ( t ), Cond.get_col ( t ) );
+                        }
+                }
+                else
+                {
+                        Y.append_col(val);
+
+                        if (Y.cols()>win_length){
+                                // shift the buffer
+                                Y=Y.get_cols(1,Y.cols()-1);                             
+                        }
+
+                        est._V()=V0;
+                        est._nu()=nu0;
+
+                        for ( int t = 0; t < Y.cols(); t++ ) {
+                                ARX::bayes (Y.get_col ( t ));
+                        }
                 }
                 
-                est._V()=V0;
-                est._nu()=nu0;
-                for ( int t = 0; t < Y.cols(); t++ ) {
-                        ARX::bayes ( Y.get_col ( t ), Cond.get_col ( t ) );
-                }
-                
-        }
+        }
+
         void from_setting(const Setting &set){
                 ARX::from_setting(set);

library/bdm/stat/exp_family.h

@@ -28 +28 @@
 //! Global Gamma_RNG
 extern Gamma_RNG GamRNG;
+
 
 /*!