Skip to content
Snippets Groups Projects
Commit 6d841425 authored by Matthew Webster's avatar Matthew Webster
Browse files

reverted to 1.21

parent 9c3f64c6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 29 deletions
fibre.h
+ 29
− 29
View file @ 6d841425
...@@ -748,36 +748,36 @@ namespace FIBRE{ ...@@ -748,36 +748,36 @@ namespace FIBRE{
void jump( bool can_use_ard=true ){ void jump( bool can_use_ard=true ){
/* if(!propose_d()){ */ if(!propose_d()){
/* compute_prior(); */ compute_prior();
/* compute_likelihood(); */ compute_likelihood();
/* compute_energy(); */ compute_energy();
/* if(test_energy()){ */ if(test_energy()){
/* accept_d(); */ accept_d();
/* } */ }
/* else{ */ else{
/* reject_d(); */ reject_d();
/* restore_energy(); */ restore_energy();
/* } */ }
/* } */ }
/* else{ */ else{
/* reject_d(); */ reject_d();
/* } */ }
/* if(!propose_S0()){ */ if(!propose_S0()){
/* compute_prior(); */ compute_prior();
/* compute_likelihood(); */ compute_likelihood();
/* compute_energy(); */ compute_energy();
/* if(test_energy()) */ if(test_energy())
/* accept_S0(); */ accept_S0();
/* else{ */ else{
/* reject_S0(); */ reject_S0();
/* restore_energy(); */ restore_energy();
/* } */ }
/* } */ }
/* else{ */ else{
/* reject_S0(); */ reject_S0();
/* } */ }
for(unsigned int f=0;f<m_fibres.size();f++){ for(unsigned int f=0;f<m_fibres.size();f++){
//cout<<"pre th"<<m_fibres[f].get_th()<<endl; //cout<<"pre th"<<m_fibres[f].get_th()<<endl;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment