Changeset 750 for library/bdm/stat/emix.cpp

Timestamp:

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

Author:

sarka

Message:

dimc ze set_parameters do validate

Files:

• library/bdm/stat/emix.cpp (modified) (3 diffs)

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();
 }