Changeset 317

Timestamp:

04/23/09 13:18:58 (16 years ago)

Author:

smidl

Message:

logger cleanup

Files:

• bdm/estim/libKF.h (modified) (1 diff)
• bdm/stat/libBM.h (modified) (2 diffs)
• pmsm/TR2245/pmsm_wishart.cpp (modified) (2 diffs)
• pmsm/TR2245/unitsteps.cpp (modified) (2 diffs)
• pmsm/TR2245/wishart.cpp (modified) (2 diffs)

bdm/estim/libKF.h

@@ -179 +179 @@
 */
 class EKFfull : public KalmanFull, public BM {
-
+        protected:
         //! Internal Model f(x,u)
         diffbifn* pfxu;

bdm/stat/libBM.h

@@ -709 +709 @@
         bool opt_L_bounds;
         //! Add all logged variables to a logger
-        void log_add ( logger *L, const string &name="" ) {
+        virtual void log_add ( logger &L, const string &name="" ) {
                 // internal
                 RV r;
@@ -716 +716 @@
 
                 // Add mean value
-                LIDs ( 0 ) =L->add ( r,name );
+                LIDs ( 0 ) =L.add ( r,name );
                 if ( opt_L_bounds ) {
-                        LIDs ( 1 ) =L->add ( r,name+"_lb" );
-                        LIDs ( 2 ) =L->add ( r,name+"_ub" );
+                        LIDs ( 1 ) =L.add ( r,name+"_lb" );
+                        LIDs ( 2 ) =L.add ( r,name+"_ub" );
                 }
         }
-        void logit ( logger *L ) {
-                L->logit ( LIDs ( 0 ), posterior().mean() );
+        virtual void logit ( logger &L ) {
+                L.logit ( LIDs ( 0 ), posterior().mean() );
                 if ( opt_L_bounds ) {
                         vec ub,lb;
                         posterior().qbounds ( lb,ub );
-                        L->logit ( LIDs ( 1 ), lb );
-                        L->logit ( LIDs ( 2 ), ub );
+                        L.logit ( LIDs ( 1 ), lb );
+                        L.logit ( LIDs ( 2 ), ub );
                 }
         }

pmsm/TR2245/pmsm_wishart.cpp

@@ -94 +94 @@
         
         KFE.set_options ( "logbounds" );
-        KFE.log_add ( L,"KF" );
+        KFE.log_add ( *L,"KF" );
         M.set_options ( "logbounds" );
-        M.log_add ( L,"M" );
+        M.log_add ( *L,"M" );
         DS->log_add(*L);
         L->init();
@@ -122 +122 @@
                 DS->logit (*L);
 
-                KFE.logit ( L );
-                M.logit ( L );
+                KFE.logit ( *L );
+                M.logit ( *L );
                 L->step();
         }

pmsm/TR2245/unitsteps.cpp

@@ -87 +87 @@
 
         KFE.set_options ( "logbounds" );
-        KFE.log_add ( L,"KF" );
+        KFE.log_add ( *L,"KF" );
         M.set_options ( "logbounds" );
-        M.log_add ( L,"M" );
+        M.log_add ( *L,"M" );
         L->init();
 
@@ -132 +132 @@
                 L->logit ( l_Q,Qdiag );
 
-                KFE.logit ( L );
-                M.logit ( L );
+                KFE.logit ( *L );
+                M.logit ( *L );
                 L->step();
         }

pmsm/TR2245/wishart.cpp

@@ -91 +91 @@
 
         KFE.set_options ( "logbounds" );
-        KFE.log_add ( L,"KF" );
+        KFE.log_add ( *L,"KF" );
         M.set_options ( "logbounds" );
-        M.log_add ( L,"M" );
+        M.log_add ( *L,"M" );
         L->init();
 
@@ -156 +156 @@
                 L->logit ( l_fullQ,vec(fQ._data(),16) );
 
-                KFE.logit ( L );
-                M.logit ( L );
+                KFE.logit ( *L );
+                M.logit ( *L );
                 L->step();
         }