Changeset 716 for library/bdm/stat/emix.h

Timestamp:

11/11/09 22:58:25 (15 years ago)

Author:

mido

Message:

clean up within testsuite - pdf_harness is used even in the case of emix and mmix test

Files:

• library/bdm/stat/emix.h (modified) (2 diffs)

library/bdm/stat/emix.h

@@ -209 +209 @@
         //!@}
         void from_setting ( const Setting &set ) {
-                UI::get ( Coms, set, "pdfs", UI::compulsory );
-
-                if( !UI::get( w, set, "weights", UI::optional ) )
+        
+                vec w0;                 
+                Array<shared_ptr<epdf> > Coms0;
+        
+                UI::get ( Coms0, set, "pdfs", UI::compulsory );
+
+                if( !UI::get( w0, set, "weights", UI::optional ) )
                 {
                         int len = Coms.length();
-                        w.set_length( len );
-                        w = 1.0 / len;
-                }
+                        w0.set_length( len );
+                        w0 = 1.0 / len;
+                }
+
+                // TODO asi lze nacitat primocare do w a coms, jen co bude hotovy validate()
+                set_parameters( w0, Coms0 );
         }
 };
@@ -527 +534 @@
         //!@}
         void from_setting ( const Setting &set ) {
-                UI::get ( Coms, set, "pdfs", UI::compulsory );
+                UI::get ( Coms, set, "pdfs", UI::compulsory );  
+
+                // TODO ma byt zde, ci ve validate()?
+                if (Coms.length()>0){
+                        set_rv(Coms(0)->_rv());
+                        dim = rv._dsize();
+                        set_rvc(Coms(0)->_rvc());
+                        dimc = rvc._dsize();
+                }
 
                 if( !UI::get( w, set, "weights", UI::optional ) )