Changeset 270 for tests/merger_2d_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_2d_test.cpp (modified) (3 diffs)

tests/merger_2d_test.cpp

@@ -18 +18 @@
         RV xy=x; xy.add(y);
         
-        enorm<fsqmat> f1 ( xy );
-        enorm<fsqmat> f2 ( xy );
+        enorm<fsqmat> f1; f1.set_rv ( xy );
+        enorm<fsqmat> f2; f1.set_rv ( xy );
                 
         mat R1 ( "0.5 0.48; 0.48 0.5" );
@@ -43 +43 @@
         
         merger M ( A );
-        enorm<fsqmat> g0(xy);
+        enorm<fsqmat> g0; g0.set_rv(xy);
         g0.set_parameters(vec("1 1"),mat("10 0; 0 10"));
         
@@ -50 +50 @@
         
         MixEF &MM = M._Mix();
-        emix* MP = MM.predictor(xy);
+        emix* MP = MM.epredictor(); //xy
         
         vec Res1 = M.evallog_m(Grid);