Changeset 270 for mpdm/merger_iter_cond.cpp

Timestamp:

02/16/09 10:02:08 (15 years ago)

Author:

smidl

Message:

Changes in the very root classes!
* rv and rvc are no longer compulsory,
* samplecond does not return ll
* BM has drv

Files:

• mpdm/merger_iter_cond.cpp (modified) (3 diffs)

mpdm/merger_iter_cond.cpp

@@ -21 +21 @@
         all.add ( u2 );
 
-        mlnorm<fsqmat> f1 ( y , u1 );
-        mlnorm<fsqmat> f2 ( y , u2 );
+        mlnorm<fsqmat> f1; f1.set_rv( y ); f1.set_rvc( u1 );
+        mlnorm<fsqmat> f2; f2.set_rv( y ); f2.set_rvc( u2 );
 
         //Differneces in constant term are essential
@@ -33 +33 @@
 
         merger M ( A );
-        enorm<fsqmat> g0 ( all );
+        enorm<fsqmat> g0; g0.set_rv ( all );
         g0.set_parameters ( vec ( "1 -1 1" ),3*eye ( 3 ));// +1*ones ( 3,3 ) );
 
@@ -50 +50 @@
 
                 MixEF &MM = M._Mix();
-                epdf* MP = MM._Coms ( 0 )->predictor ( all );
+                epdf* MP = MM._Coms ( 0 )->epredictor ( );
 
                 RV yu1 = y; yu1.add ( u1 );