Changeset 141

Timestamp:

08/18/08 14:28:08 (16 years ago)

Author:

smidl

Message:

Opraveny warningy

Files:

• bdm/estim/arx.cpp (modified) (1 diff)
• bdm/estim/ekf_templ.h (modified) (1 diff)
• bdm/estim/libKF.cpp (modified) (2 diffs)
• bdm/estim/libPF.h (modified) (1 diff)
• bdm/itpp_ext.cpp (modified) (1 diff)
• bdm/math/libDC.cpp (modified) (1 diff)
• bdm/stat/emix.cpp (modified) (1 diff)
• bdm/stat/emix.h (modified) (3 diffs)
• tests/CMakeLists.txt (modified) (1 diff)
• tests/blas_test.cpp (modified) (1 diff)

bdm/estim/arx.cpp

@@ -75 +75 @@
 ivec ARX::structure_est ( egiw est0 ) {
         ivec ind=linspace ( 1,rv.count()-1 );
-        double tmp = egiw_bestbelow ( est, est0, est.lognc()- est0.lognc(), ind );
+        egiw_bestbelow ( est, est0, est.lognc()- est0.lognc(), ind );
         return ind;
 }

bdm/estim/ekf_templ.h

@@ -30 +30 @@
 
 
-#endif EKF_TEMP_H
+#endif //EKF_TEMP_H

bdm/estim/libKF.cpp

@@ -141 +141 @@
 
 //      if ( !qr ( preA,Q,postA ) ) it_warning ( "QR in kalman unstable!" );
-        if ( !qr ( preA,postA ) ) it_warning ( "QR in kalman unstable!" );
+        if ( !qr ( preA,postA ) ) {it_warning ( "QR in kalman unstable!" );}
 
         ( _Ry._Ch() ) =postA ( 0,dimy-1, 0,dimy-1 );
@@ -204 +204 @@
 
 //      if ( !qr ( preA,Q,postA ) ) it_warning ( "QR in kalman unstable!" );
-        if ( !qr ( preA,postA ) ) it_warning ( "QR in kalman unstable!" );
+        if ( !qr ( preA,postA ) ) {it_warning ( "QR in kalman unstable!" );}
 
         ( _Ry._Ch() ) =postA ( 0,dimy-1, 0,dimy-1 );

bdm/estim/libPF.h

@@ -108 +108 @@
                 //
 
-                if ( n>10000 ) it_error ( "increase 10000 here!" );
+                if ( n>10000 ) {it_error ( "increase 10000 here!" );}
 
                 for ( int i=0;i<n;i++ ) {

bdm/itpp_ext.cpp

@@ -90 +90 @@
 
     if (!R_FINITE(a) || !R_FINITE(scale) || a < 0.0 || scale <= 0.0)
-        it_error("Gamma_RNG wrong parameters");
+        {it_error("Gamma_RNG wrong parameters");}
 
     if (a < 1.) { /* GS algorithm for parameters a < 1 */

bdm/math/libDC.cpp

@@ -117 +117 @@
 
 void ldmat::inv( ldmat &Inv ) const {
-        int dim = D.length();
         Inv.clear();   //Inv = zero in LD
         mat U = ltuinv( L );

bdm/stat/emix.cpp

@@ -7 +7 @@
         int i;
         for ( i=0;i<w.length();i++ ) {
-                epdf* Mp=Coms0 ( i );
                 it_assert_debug ( rv.equal ( Coms0 ( i )->_rv() ),"RVs do not match!" );
         }

bdm/stat/emix.h

@@ -30 +30 @@
 
 */
-class emix : public epdf {
-protected:
-        //! weights of the components
-        vec w;
-        //! Component (epdfs)
-        Array<epdf*> Coms;
-public:
-        //!Default constructor
-        emix ( RV &rv ) : epdf ( rv ) {};
-        //! Set weights \c w and components \c R
-        void set_parameters ( const vec &w, const Array<epdf*> &Coms );
+class emix : public epdf
+{
+        protected:
+                //! weights of the components
+                vec w;
+                //! Component (epdfs)
+                Array<epdf*> Coms;
+        public:
+                //!Default constructor
+                emix ( RV &rv ) : epdf ( rv ) {};
+                //! Set weights \c w and components \c R
+                void set_parameters ( const vec &w, const Array<epdf*> &Coms );
 
-        vec sample() const;
-        vec mean() const {
-                int i; vec mu=zeros ( rv.count() );
-                for ( i=0;i<w.length();i++ ) {mu+=w ( i ) *Coms ( i )->mean(); }
-                return mu;
-        }
-        double evalpdflog ( const vec &val ) const {
-                int i;
-                double sum=0.0;
-                for ( i=0;i<w.length();i++ ) {sum+=w ( i ) *Coms ( i )->evalpdflog ( val );}
-                return log ( sum );
-        };
+                vec sample() const;
+                vec mean() const
+                {
+                        int i; vec mu=zeros ( rv.count() );
+                        for ( i=0;i<w.length();i++ ) {mu+=w ( i ) *Coms ( i )->mean(); }
+                        return mu;
+                }
+                double evalpdflog ( const vec &val ) const
+                {
+                        int i;
+                        double sum=0.0;
+                        for ( i=0;i<w.length();i++ ) {sum+=w ( i ) *Coms ( i )->evalpdflog ( val );}
+                        return log ( sum );
+                };
 
 //Access methods
-        //! returns a pointer to the internal mean value. Use with Care!
-        vec& _w() {return w;}
+                //! returns a pointer to the internal mean value. Use with Care!
+                vec& _w() {return w;}
 };
 
@@ -64 +67 @@
 
 */
-class eprod: public epdf {
-protected:
-        Array<epdf*> epdfs;
-        Array<mpdf*> mpdfs;
-public:
+class eprod: public epdf
+{
+        protected:
+                Array<epdf*> epdfs;
+                Array<mpdf*> mpdfs;
+        public:
 
 
@@ -76 +80 @@
 
 */
-class mmix : public mpdf {
-protected:
-        //! Component (epdfs)
-        Array<mpdf*> Coms;
-        //!Internal epdf
-        emix Epdf;
-public:
-        //!Default constructor
-        mmix ( RV &rv, RV &rvc ) : mpdf ( rv, rvc ), Epdf ( rv ) {ep=&Epdf;};
-        //! Set weights \c w and components \c R
-        void set_parameters ( const vec &w, const Array<mpdf*> &Coms ) {
-                Array<epdf*> Eps ( Coms.length());
+class mmix : public mpdf
+{
+        protected:
+                //! Component (epdfs)
+                Array<mpdf*> Coms;
+                //!Internal epdf
+                emix Epdf;
+        public:
+                //!Default constructor
+                mmix ( RV &rv, RV &rvc ) : mpdf ( rv, rvc ), Epdf ( rv ) {ep=&Epdf;};
+                //! Set weights \c w and components \c R
+                void set_parameters ( const vec &w, const Array<mpdf*> &Coms )
+                {
+                        Array<epdf*> Eps ( Coms.length() );
 
-                for ( int i=0;i<Coms.length();i++ ) {mpdf* Ci=Coms(i);
-                 Eps ( i ) =& ( Coms ( i )->_epdf() );}
-                Epdf.set_parameters ( w,Eps );
-        };
+                        for ( int i=0;i<Coms.length();i++ )
+                        {
+                                Eps ( i ) =& ( Coms ( i )->_epdf() );
+                        }
+                        Epdf.set_parameters ( w,Eps );
+                };
 
-        void condition ( const vec &cond ) {
-                for ( int i=0;i<Coms.length();i++ ) {Coms ( i )->condition ( cond );}
-        };
+                void condition ( const vec &cond )
+                {
+                        for ( int i=0;i<Coms.length();i++ ) {Coms ( i )->condition ( cond );}
+                };
 };
 #endif //MX_H

tests/CMakeLists.txt

@@ -32 +32 @@
 add_executable (blas_test blas_test.cpp)
 target_link_libraries (blas_test itpp)
-
-add_executable (struct_test struct_test.cpp)
-target_link_libraries (struct_test itpp)
-
-add_executable (linefit2_c linefit2_c.cpp)
-target_link_libraries (linefit2_c ${BdmLibs})
 
 add_executable (test0 test0.cpp)

tests/blas_test.cpp

@@ -59 +59 @@
 
                 tt.tic();
-                for ( int i=0;i<10;i++ ) {C = matmul ( A,B );}
+                for ( int ii=0;ii<10;ii++ ) {C = matmul ( A,B );}
                 exec_times ( i ) =tt.toc();
 
                 tt.tic();
-                for ( int i=0;i<10;i++ ) {C = A*B;}
+                for ( int ii=0;ii<10;ii++ ) {C = A*B;}
                 exec_times_b ( i ) =tt.toc();
 
                 C = zeros(n,n);
                 tt.tic();
-                for ( int i=0;i<10;i++ ) { matmul2(n,A._data(),B._data(),C._data());}
+                for ( int ii=0;ii<10;ii++ ) { matmul2(n,A._data(),B._data(),C._data());}
                 exec_times_c ( i ) =tt.toc();
         }