Changeset 750

Timestamp:

12/07/09 01:26:55 (14 years ago)

Author:

sarka

Message:

dimc ze set_parameters do validate

Location:

library

Files:

• bdm/base/bdmbase.h (modified) (1 diff)
• bdm/estim/mixtures.cpp (modified) (1 diff)
• bdm/stat/emix.cpp (modified) (3 diffs)
• bdm/stat/emix.h (modified) (2 diffs)
• bdm/stat/exp_family.h (modified) (2 diffs)
• bdm/stat/merger.h (modified) (1 diff)
• tests/stresssuite/mixtures_stress.cpp (modified) (1 diff)
• tests/testsuite/emix_test.cpp (modified) (2 diffs)
• tests/testsuite/epdf_test.cpp (modified) (2 diffs)

library/bdm/base/bdmbase.h

@@ -516 +516 @@
         epdf() {};
         epdf ( const epdf &e ) : pdf ( e ) {};
-        void set_parameters ( int dim0 ) {
+        
+        virtual void    validate (int dim0){
                 dim = dim0;
         }
+        
         epdf* _copy_() const {
                 return new epdf ( *this );

library/bdm/estim/mixtures.cpp

@@ -148 +148 @@
         tmp = new emix( );
         tmp->set_parameters ( weights.posterior().mean(), pC );
+        tmp->validate();
         return tmp;
 }

library/bdm/stat/emix.cpp

@@ -5 +5 @@
 void emix::set_parameters ( const vec &w0, const Array<shared_ptr<epdf> > &Coms0 ) {
         w = w0 / sum ( w0 );
-        dim = Coms0 ( 0 )->dimension();
+        
         bool isnamed = Coms0 ( 0 )->isnamed();
         int i;
         RV tmp_rv;
         if ( isnamed ) tmp_rv = Coms0 ( 0 )->_rv();
-
-        for ( i = 0; i < w.length(); i++ ) {
-                bdm_assert ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
-                bdm_assert ( !isnamed || tmp_rv.equal ( Coms0 ( i )->_rv() ), "Component RVs do not match!" );
-        }
-
         Coms = Coms0;
 
         if ( isnamed ) epdf::set_rv ( tmp_rv ); //coms aer already OK, no need for set_rv
 }
+
+void emix::validate (){
+        dim = Coms ( 0 )->dimension();
+        bool isnamed = Coms ( 0 )->isnamed();
+        int i;
+        RV tmp_rv;
+        if ( isnamed ) tmp_rv = Coms ( 0 )->_rv();
+        for ( i = 0; i < w.length(); i++ ) {
+                bdm_assert ( dim == ( Coms ( i )->dimension() ), "Component sizes do not match!" );
+                bdm_assert ( !isnamed || tmp_rv.equal ( Coms ( i )->_rv() ), "Component RVs do not match!" );
+        }
+
+}
+
+
+
 
 vec emix::sample() const {
@@ -101 +111 @@
 
         target.set_parameters ( w, Cn );
+        target.validate();
 }
 
@@ -181 +192 @@
 
         target.set_parameters ( w, Cn );
+        target.validate();
 }
 

library/bdm/stat/emix.h

@@ -127 +127 @@
         */
         void set_parameters ( const vec &w, const Array<shared_ptr<epdf> > &Coms );
+    
+        virtual void validate ();
 
         vec sample() const;
@@ -187 +189 @@
                 // TODO asi lze nacitat primocare do w a coms, jen co bude hotovy validate()
                 set_parameters ( w0, Coms0 );
+                validate();
         }
 };

library/bdm/stat/exp_family.h

@@ -1293 +1293 @@
                 delta = delta0;
                 W.set_parameters ( inv ( Y0 ), delta0 );
-                dim = W.dimension();
                 p = Y0.rows();
         }
+        
+        virtual void    validate (){
+      dim = W.dimension();
+        }
+        
+        
         vec sample() const {
                 mat iCh;
@@ -1412 +1417 @@
         //! Set samples
         void set_parameters ( const Array<vec> &Av ) {
-                bdm_assert ( Av.size() > 0, "Empty samples" );
                 n = Av.size();
-                epdf::set_parameters ( Av ( 0 ).length() );
                 w = 1 / n * ones ( n );
                 samples = Av;
         };
+        virtual void    validate (){
+          bdm_assert ( n > 0, "Empty samples" );
+          epdf::validate ( samples ( 0 ).length() );
+        }
         //! Potentially dangerous, use with care.
         vec& _w()  {

library/bdm/stat/merger.h

@@ -102 +102 @@
                 Npoints = Sup.points();
                 eSmp.set_parameters ( Sup._Spoints() );
+                eSmp.validate();
         }
         //! set debug file

library/tests/stresssuite/mixtures_stress.cpp

@@ -68 +68 @@
         Simul.set_rv ( x );
         Simul.set_parameters ( "0.5 0.6", Sim );
+        Simul.validate();
 
         // Sample parameters

library/tests/testsuite/emix_test.cpp

@@ -39 +39 @@
         M1.set_rv ( xy );
         M1.set_parameters ( vec ( "1" ), A1 );
+        M1.validate();
 
         // test if ARX and emix with one ARX are the same
@@ -68 +69 @@
         M2.set_rv ( xy );
         M2.set_parameters ( vec ( "1" ), A2 );
-
+        M2.validate();
 
         // mixture normalization

library/tests/testsuite/epdf_test.cpp

@@ -18 +18 @@
 // not using epdf_harness because eprod isn't configurable (yet?)
 TEST ( eprod_test ) {
+                
         RV a ( "{eprod_a }", "1" );
         RV b ( "{eprod_b }", "2" );
@@ -61 +62 @@
         rwiWishartCh rwW;
         rwW.set_parameters ( 2, 0.1, "1 1", 0.9 );
+        rwW.validate();
         mat mea = zeros ( 2, 2 );
         mat wMch = chol ( wM );
         mat Ch ( 2, 2 );
+        
         for ( int i = 0; i < 100; i++ ) {
                 vec tmp = rwW.samplecond ( vec ( wMch._data(), 4 ) );
                 copy_vector ( 4, tmp._data(), Ch._data() );
                 mea += Ch.T() * Ch;
+                
         }