Changeset 270 for mpdm/merg_2a.cpp

Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed
  • mpdm/merg_2a.cpp

    r254 r270  
    3939        mat V0 = 0.001*eye ( 3 ); V0 ( 0,0 ) = 1; // 
    4040 
    41         ARX P1 ( concat ( ab,r ), V0, -1 ); 
    42         ARX P2 ( concat ( ac,r ), V0, -1 ); 
     41        ARX P1; 
     42        P1.set_statistics(2, V0, -1 ); 
     43        ARX P2; 
     44         P2.set_statistics(2, V0, -1 ); 
    4345 
    4446        //Test estimation 
     
    6264 
    6365        //Proposal 
    64         enorm<ldmat> g0 ( ab ); g0.set_parameters ( "1 1 ",mat ( "1 0; 0 1" ) ); 
    65         egamma g1 ( r ); g1.set_parameters ( "2  ", "2" ); 
    66         enorm<ldmat> g2 ( c ); g2.set_parameters ( "1 ",mat ( "1" ) ); 
     66        enorm<ldmat> g0;  
     67        g0.set_parameters ( "1 1 ",mat ( "1 0; 0 1" ) ); 
     68        egamma g1;  
     69        g1.set_parameters ( "2  ", "2" ); 
     70        enorm<ldmat> g2;  
     71        g2.set_parameters ( "1 ",mat ( "1" ) ); 
    6772 
    6873        Array<const epdf*> A ( 3 ); A ( 0 ) = &g0; A ( 1 ) =&g1; A(2) = &g2;