diff --git a/fibre.h b/fibre.h index 56c7baa9b5cf438d3630d2a36d3af63a7b5e7a11..8aca32d8401f61909a717b44dbc1053ae8c938d2 100644 --- a/fibre.h +++ b/fibre.h @@ -748,36 +748,36 @@ namespace FIBRE{ void jump( bool can_use_ard=true ){ - /* if(!propose_d()){ */ -/* compute_prior(); */ -/* compute_likelihood(); */ -/* compute_energy(); */ -/* if(test_energy()){ */ -/* accept_d(); */ -/* } */ -/* else{ */ -/* reject_d(); */ -/* restore_energy(); */ -/* } */ -/* } */ -/* else{ */ -/* reject_d(); */ -/* } */ + if(!propose_d()){ + compute_prior(); + compute_likelihood(); + compute_energy(); + if(test_energy()){ + accept_d(); + } + else{ + reject_d(); + restore_energy(); + } + } + else{ + reject_d(); + } -/* if(!propose_S0()){ */ -/* compute_prior(); */ -/* compute_likelihood(); */ -/* compute_energy(); */ -/* if(test_energy()) */ -/* accept_S0(); */ -/* else{ */ -/* reject_S0(); */ -/* restore_energy(); */ -/* } */ -/* } */ -/* else{ */ -/* reject_S0(); */ -/* } */ + if(!propose_S0()){ + compute_prior(); + compute_likelihood(); + compute_energy(); + if(test_energy()) + accept_S0(); + else{ + reject_S0(); + restore_energy(); + } + } + else{ + reject_S0(); + } for(unsigned int f=0;f<m_fibres.size();f++){ //cout<<"pre th"<<m_fibres[f].get_th()<<endl;