Changeset 270 for tests/merger_iter_test.cpp

Timestamp:

02/16/09 10:02:08 (16 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:

• tests/merger_iter_test.cpp (modified) (3 diffs)

tests/merger_iter_test.cpp

@@ -18 +18 @@
         RV xy=x; xy.add(y);
         
-        enorm<fsqmat> f1 ( xy );
-        enorm<fsqmat> f2 ( xy );
-        enorm<fsqmat> f3(y);
+        enorm<fsqmat> f1;f1.set_rv ( xy );
+        enorm<fsqmat> f2;f2.set_rv ( xy );
+        enorm<fsqmat> f3;f3.set_rv(y);
                 
         f1.set_parameters ( "4 3",mat ( "0.4 0.3; 0.3 0.4" ) );
@@ -45 +45 @@
         
         merger M ( A );
-        enorm<fsqmat> g0(xy);
+        enorm<fsqmat> g0; g0.set_rv(xy);
         g0.set_parameters(vec("4 4"),mat("1 0; 0 1"));
         
@@ -52 +52 @@
         
         MixEF &MM = M._Mix();
-        epdf* MP = MM.predictor(xy);
+        epdf* MP = MM.epredictor();//xy
         
         vec Res1 = M.evallog_m(Grid);