Changeset 270 for mpdm/merg_giw.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_giw.cpp

    r254 r270  
    3737        mat V0g = 0.001*eye ( 3 ); V0g ( 0,0 ) = 1; // 
    3838 
    39         ARX P1 ( concat ( a1,r ), V0, -1 ); 
    40         ARX P2 ( concat ( a2,r ), V0, -1 ); 
    41         ARX PG ( all, V0g, -1 ); //or -1? 
     39        ARX P1; P1.set_statistics(2, V0, -1 ); 
     40        ARX P2; P2.set_statistics(2, V0, -1 ); 
     41        ARX PG; PG.set_statistics(3, V0g, -1 ); //or -1? 
    4242//      ARX PGk ( all, V0g, -1 ); 
    4343 
    … …  
    6363 
    6464        //Proposal 
    65         enorm<ldmat> g0 ( a1 ); g0.set_parameters ( "1  ",mat ( "1" ) ); 
    66         egamma g1 ( r ); g1.set_parameters ( "2  ", "2" ); 
    67         enorm<ldmat> g2 ( a2 ); g2.set_parameters ( "1  ",mat ( "1" ) ); 
     65        enorm<ldmat> g0; g0.set_rv( a1 ); g0.set_parameters ( "1  ",mat ( "1" ) ); 
     66        egamma g1; g1.set_rv ( r ); g1.set_parameters ( "2  ", "2" ); 
     67        enorm<ldmat> g2; g2.set_rv ( a2 ); g2.set_parameters ( "1  ",mat ( "1" ) ); 
    6868 
    6969        Array<const epdf*> A ( 3 ); A ( 0 ) = &g0; A ( 1 ) =&g1; A ( 2 ) = &g2;