Changeset 384 for library/bdm/estim

Timestamp:

06/19/09 10:17:25 (15 years ago)

Author:

mido

Message:

possibly broken?

Location:

library/bdm

Files:

• . (moved) (moved from bdm)
• estim/arx.h (modified) (2 diffs)
• estim/ekf_template.h (moved) (moved from bdm/estim/ekf_templ.h) (1 diff)
• estim/kalman.cpp (moved) (moved from bdm/estim/libKF.cpp) (1 diff)
• estim/kalman.h (moved) (moved from bdm/estim/libKF.h) (1 diff)
• estim/mixtures.cpp (moved) (moved from bdm/estim/mixef.cpp) (2 diffs)
• estim/mixtures.h (moved) (moved from bdm/estim/mixef.h) (2 diffs)
• estim/particles.cpp (moved) (moved from bdm/estim/libPF.cpp) (1 diff)
• estim/particles.h (moved) (moved from bdm/estim/libPF.h) (1 diff)

library/bdm/estim/arx.h

@@ -14 +14 @@
 #define AR_H
 
-#include "../stat/libFN.h"
-#include "../stat/libEF.h"
-#include "../user_info.h"
+#include "../math/functions.h"
+#include "../stat/exp_family.h"
+#include "../base/user_info.h"
 
 namespace bdm {
@@ -37 +37 @@
 \include arx_simple.cpp
 
+        \todo sort out constant terms - bayes should accept vec without additional 1s
 */
 class ARX: public BMEF {

library/bdm/estim/ekf_template.h

@@ -11 +11 @@
 */
 
-#ifndef EKF_TEMP_H
-#define EKF_TEMP_H
+#ifndef EKF_TEMPLATE_H
+#define EKF_TEMPLATE_H
 
-#include "libKF.h"
+#include "kalman.h"
 
 namespace bdm{

library/bdm/estim/kalman.cpp

@@ -1 +1 @@
 
-#include "libKF.h"
+#include "kalman.h"
 
 namespace bdm{

library/bdm/estim/kalman.h

@@ -15 +15 @@
 
 
-#include "../stat/libFN.h"
-#include "../stat/libEF.h"
+#include "../math/functions.h"
+#include "../stat/exp_family.h"
 #include "../math/chmat.h"
-#include "../user_info.h"
+#include "../base/user_info.h"
 
 namespace bdm

library/bdm/estim/mixtures.cpp

@@ -1 @@
-#include "mixef.h"
 #include <vector>
+#include "mixtures.h"
 
 namespace bdm{
@@ -136 +136 @@
 }
 
-emix* MixEF::epredictor (  ) const {
+mixtures* MixEF::epredictor (  ) const {
         Array<epdf*> pC ( n );
         for ( int i=0;i<n;i++ ) {pC ( i ) =Coms ( i )->epredictor ( );}
-        emix* tmp;
-        tmp = new emix (  );
+        mixtures* tmp;
+        tmp = new mixtures (  );
         tmp->set_parameters ( weights.posterior().mean(), pC, false );
         tmp->ownComs();

library/bdm/estim/mixtures.h

@@ -11 +11 @@
 */
 
-#ifndef MEF_H
-#define MEF_H
+#ifndef ESTIM_MIXTURES_H
+#define ESTIM_MIXTURES_H
 
 
-#include "../stat/libFN.h"
-#include "../stat/libEF.h"
-#include "../stat/emix.h"
+#include "../math/functions.h"
+#include "../stat/exp_family.h"
+#include "../stat/mixtures.h"
 
 namespace bdm {
@@ -120 +120 @@
 
 }
-#endif // MEF_H
+#endif // MIXTURES_H
 
 

library/bdm/estim/particles.cpp

@@ -1 @@
-#include "libPF.h"
+#include "particles.h"
 
 namespace bdm {

library/bdm/estim/particles.h

@@ -11 +11 @@
 */
 
-#ifndef PF_H
-#define PF_H
-
-
-#include "../stat/libEF.h"
+#ifndef PARTICLES_H
+#define PARTICLES_H
+
+
+#include "../stat/exp_family.h"
 
 namespace bdm {