Changeset 332 for bdm

Timestamp:

04/29/09 20:14:56 (15 years ago)

Author:

smidl

Message:

pmsm experiments for Barcelona
- improved model of voltage
- new Mz experiment

Location:

bdm/estim

Files:

• KF_ui.h (modified) (2 diffs)
• libKF.cpp (modified) (1 diff)

bdm/estim/KF_ui.h

@@ -24 +24 @@
                 //parameters
                 EKFCh* E; E=new EKFCh;
-                E->set_parameters(IM, OM, diag(getvec(S["dQ"])), diag(getvec(S["dR"])));
+                //EKFfull* E; E=new EKFfull;
                 
                 //statistics
@@ -31 +31 @@
                 mat P0;
                 if (S.exists("mu0")){mu0=getvec(S["mu0"]);}else{mu0=zeros(dim);};
-                if (S.exists("P0")){mu0=getmat(S["P0"],dim);}else{P0=eye(dim);};
+                if (S.exists("P0")){P0=getmat(S["P0"],dim);}else{P0=eye(dim);};
+                if (S.exists("dP0")){P0=diag(getvec(S["dP0"]));}else{P0=eye(dim);};
                 E->set_statistics(mu0,P0);
                 
+                //parameters
+                E->set_parameters(IM, OM, diag(getvec(S["dQ"])), diag(getvec(S["dR"])));
+
                 //connect
                 RV* drv; UIbuild(S["drv"],drv);

bdm/estim/libKF.cpp

@@ -71 +71 @@
         dimy = phxu0->dimension();
         dimu = pfxu0->_dimu();
-
+        E.epdf::set_parameters(dimx);
+        
         A.set_size(dimx,dimx);
         C.set_size(dimy,dimx);