Changeset 125

Timestamp:

06/20/08 11:16:53 (16 years ago)

Author:

smidl

Message:

drobnosti...

Files:

• CMakeLists.txt (modified) (1 diff)
• bdm/estim/libPF.h (modified) (3 diffs)
• pmsm/pmsm_mix.cpp (modified) (1 diff)
• tests/CMakeLists.txt (modified) (1 diff)
• tests/testSmp.cpp (modified) (1 diff)

CMakeLists.txt

@@ -23 +23 @@
 ELSE()
         #This is for UNIX makefile which does only one release at a time.
-        SET(CMAKE_BUILD_TYPE Debug)
+#       SET(CMAKE_BUILD_TYPE Debug)
         SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall")
 ENDIF(WIN32)

bdm/estim/libPF.h

@@ -147 +147 @@
         double WL = 0.0;
 
+cout << est.mean();
+
         for ( i=0;i<n;i++ ) {
                 //generate new samples from paramater evolution model;
@@ -157 +159 @@
         }
 
-        if ( true ) {
+cout << min(lls) << "'" << max(lls)<<endl;
+
+        if ( false) {
                 for ( i=0;i<n;i++ ) {
                         WL = _w ( i ) *exp ( llsP ( i ) ); //using old weights!
@@ -199 +203 @@
                 };
                 cout << '.';
+cout << est.mean() << endl;             
         }
 }

pmsm/pmsm_mix.cpp

@@ -79 +79 @@
 //      cout << Eevol.sample() <<endl;
 
-        mepdf evolQR(rQR,rQR,&Eevol);
+        mepdf evolQR(rQR,rQR,&Ucom);
         MPF<EKFful_unQR> M ( rx,rQR, evolQR, evolQR, Npar, EKU );
+        M.set_est ( evolQR._epdf() );
 
         epdf& Efix_ep = Efix._epdf();

tests/CMakeLists.txt

@@ -29 +29 @@
 add_executable (loggers_test loggers_test.cpp)
 target_link_libraries (loggers_test ${BdmLibs})
+
+add_executable (blas_test blas_test.cpp)
+target_link_libraries (blas_test ${BdmLibs})
 
 add_executable (test0 test0.cpp)

tests/testSmp.cpp

@@ -78 +78 @@
         disp(eMix.mean(),zeros(2),Smp);
 
-        cout << "======= MMix_triv ======== " << endl;
-        mepdf mMix(rv,rv,&eMix);
+        cout << "======= MEpdf ======== " << endl;
+        mepdf meMix(rv,rv,&eMix);
+        
+        Smp = meMix.samplecond(mu0,lik,N);
+        disp(eMix.mean(),zeros(2),Smp);
+
+        cout << "======= MMix ======== " << endl;
+        mmix mMix(rv,rv);
+        Array<mpdf*> mComs(2);
+        mComs(0) = &mG;
+        eN.set_mu(vec_2(0.0,0.0));
+        mepdf mEnorm(rv,rv,&eN);
+        mComs(1) = &mEnorm;
+        mMix.set_parameters(vec_2(0.5,0.5),mComs);
         
         Smp = mMix.samplecond(mu0,lik,N);
-        disp(eMix.mean(),zeros(2),Smp);
+        disp(mMix._epdf().mean(),zeros(2),Smp);
 
         //Exit program: