From 6d84142584c4b35cbcf823d8871e56888af8f99c Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Thu, 3 Apr 2008 16:03:57 +0000
Subject: [PATCH] reverted to 1.21
---
fibre.h | 58 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/fibre.h b/fibre.h
index 56c7baa..8aca32d 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;
--
GitLab