Changeset 750 for library/bdm/stat

Timestamp:

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

Author:

sarka

Message:

dimc ze set_parameters do validate

Location:

library/bdm/stat

Files:

• emix.cpp (modified) (3 diffs)
• emix.h (modified) (2 diffs)
• exp_family.h (modified) (2 diffs)
• merger.h (modified) (1 diff)

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