diff --git a/fibre.h b/fibre.h index 8aca32d8401f61909a717b44dbc1053ae8c938d2..56c7baa9b5cf438d3630d2a36d3af63a7b5e7a11 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; diff --git a/tractvolsx.h b/tractvolsx.h index f4cf8f385ad15d14cffaf0a2bcc10750fa997541..f9cabd3eadded80132bed9c74c8b0c4cce3c59cc 100644 --- a/tractvolsx.h +++ b/tractvolsx.h @@ -104,7 +104,7 @@ namespace TRACTVOLSX{ ColumnVector sample(const float& x,const float& y,const float&z,const float& r_x,const float& r_y,const float& r_z, - float& prefer_x=0,float& prefer_y=0,float& prefer_z=0){ + float& prefer_x,float& prefer_y,float& prefer_z){ ////////Probabilistic interpolation int cx =(int) ceil(x),fx=(int) floor(x); @@ -161,7 +161,7 @@ namespace TRACTVOLSX{ init_sample=false; } else{ - if(fabs(prefer_x)+fabs(prefer_y)+fabs(prefer_z)==0){ + if((fabs(prefer_x)+fabs(prefer_y)+fabs(prefer_z))==0){ prefer_x=r_x;prefer_y=r_y;prefer_z=r_z; } for(unsigned int fib=0;fib<thsamples.size();fib++){