From f5d0ef77254feab74dbcfcf6f53cf0116f09bd84 Mon Sep 17 00:00:00 2001
From: Tim Behrens <behrens@fmrib.ox.ac.uk>
Date: Fri, 15 Jul 2005 13:49:22 +0000
Subject: [PATCH] *** empty log message ***
---
fibre.h | 40 +++++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/fibre.h b/fibre.h
index 0df75be..72f1705 100644
--- a/fibre.h
+++ b/fibre.h
@@ -58,8 +58,13 @@ namespace FIBRE{
const ColumnVector& m_alpha;
const ColumnVector& m_beta;
const Matrix& m_bvals;
+<<<<<<< fibre.h
+ xfibresOptions& opts;
+ public:
+=======
xfibresOptions& opts;
public:
+>>>>>>> 1.10
//constructors::
Fibre( const ColumnVector& alpha, const ColumnVector& beta,
const Matrix& bvals,const float& d):
@@ -221,7 +226,12 @@ namespace FIBRE{
if (m_f<0 | m_f>=1 )
return true;
else{
- m_f_prior=-(log(m_lam) + (m_lam-1)*log(1-m_f));
+ //m_f_prior=-(log(m_lam) + (m_lam-1)*log(1-m_f));
+ if(m_lam_jump)
+ m_f_prior=log(1-f)+2*log(fabs(log(1-f))); //marginalised with uniform prior on lambda
+ else
+ m_f_prior=0;
+
m_f_prior=opts.fudge.value()*m_f_prior;
return false;
}
@@ -696,20 +706,20 @@ namespace FIBRE{
}
- if(!m_fibres[f].propose_lam()){
- compute_prior();
- compute_energy();
- if(test_energy()){
- m_fibres[f].accept_lam();
- }
- else{
- m_fibres[f].reject_lam();
- restore_energy_no_lik();
- }
- }
- else{
- m_fibres[f].reject_lam();
- }
+// if(!m_fibres[f].propose_lam()){
+// compute_prior();
+// compute_energy();
+// if(test_energy()){
+// m_fibres[f].accept_lam();
+// }
+// else{
+// m_fibres[f].reject_lam();
+// restore_energy_no_lik();
+// }
+// }
+// else{
+// m_fibres[f].reject_lam();
+// }
}
--
GitLab