Changeset 741

Timestamp:

11/26/09 22:46:01 (15 years ago)

Author:

smidl

Message:

Stress tests are passing now. Missing validate calls are filled...

Location:

library

Files:

• bdm/base/bdmbase.h (modified) (1 diff)
• bdm/estim/arx.cpp (modified) (1 diff)
• bdm/estim/mixtures.h (modified) (1 diff)
• bdm/stat/exp_family.h (modified) (1 diff)
• bdm/stat/merger.cpp (modified) (1 diff)
• tests/stresssuite/merger_iter_stress.cpp (modified) (2 diffs)
• tests/stresssuite/mixtures_stress.cpp (modified) (2 diffs)

library/bdm/base/bdmbase.h

@@ -437 +437 @@
         //! Array<vec> version of evallogcond
         virtual vec evallogcond_mat ( const Array<vec> &Yt, const vec &cond ) {
-                bdm_error ( "Not implemented" );
-                return vec();
+                vec v ( Yt.length() );
+                for ( int i = 0; i < Yt.length(); i++ ) {
+                        v ( i ) = evallogcond ( Yt( i ), cond );
+                }
+                return v;
         }
 

library/bdm/estim/arx.cpp

@@ -12 +12 @@
 
         dyad.set_subvector ( 0, yt );
-        dyad.set_subvector ( dimy, cond );
+        if (cond.length()>0)
+                dyad.set_subvector ( dimy, cond );
         // possible "1" is there from the beginning
 

library/bdm/estim/mixtures.h

@@ -77 +77 @@
                         Coms ( i ) = ( BMEF* ) Coms0 ( i )->_copy_();
                 }
+                weights.set_parameters(alpha0);
+                weights.validate();
                 build_est();
         }

library/bdm/stat/exp_family.h

@@ -518 +518 @@
         void set_parameters ( const vec &beta0 ) {
                 est.set_parameters ( beta0 );
+                est.validate();
                 if ( evalll ) {
                         last_lognc = est.lognc();

library/bdm/stat/merger.cpp

@@ -204 +204 @@
         ARX A0;
         A0.set_statistics ( dim, V0 ); //initial guess of Mix:
+        A0.validate();
 
         Mix.init ( &A0, Smp_ex, Ncoms );

library/tests/stresssuite/merger_iter_stress.cpp

@@ -27 +27 @@
 
         f1->set_parameters ( "4 3", mat ( "0.4 0.3; 0.3 0.4" ) );
+        f1->validate();
         f2->set_parameters ( "1 3", mat ( "0.3 -0.2; -0.2 0.3" ) );
+        f2->validate();
         f3->set_parameters ( "2", mat ( "0.4" ) );
-
+        f3->validate();
+        
         pdf_array A ( 3 );
         A ( 0 ) = f1;
@@ -49 +52 @@
         g0.set_rv ( xy );
         g0.set_parameters ( vec ( "4 4" ), mat ( "1 0; 0 1" ) );
-
+        g0.validate();
+        
         M.set_parameters ( 5 );
         M.set_method ( LOGNORMAL, 1.2 );
         M.set_support ( g0, 400 );
+        M.validate();
         M.merge();
+        
 
         MixEF &MM = M._Mix();

library/tests/stresssuite/mixtures_stress.cpp

@@ -88 +88 @@
         ARX M1;
         M1.set_statistics ( 2, V0 - Vp, 8 );
+        M1.validate();
         ARX M2;
         M2.set_statistics ( 2, V0 + Vp, 8 );
+        M2.validate();
 
         // Build mixture model
@@ -110 +112 @@
         ARX Aflat;
         Aflat.set_statistics ( 2, V0, 7 );
+        Aflat.validate();
         MixEF RND;
         RND.init ( &Aflat, Data, 10 ); // already initialized!