Commit 58e9b5b1 authored by Jakub Klemsa's avatar Jakub Klemsa
Browse files

Major: changed to non-improved BRot error estimate.

parent b74dc5f8
......@@ -425,6 +425,12 @@ pub const KAPPA_MAX: usize = 20;
#[cfg(any(feature = "perturb", feature = "numerical"))]
pub const NU_MAX: usize = 20; // just to ensure ...
/// Noise Growth in BlindRotate
#[cfg(not(feature = "brot_im"))]
pub const BROT_NOISE_FACTOR: usize = 1;
#[cfg(feature = "brot_im")]
pub const BROT_NOISE_FACTOR: usize = 3;
// Imported Constants
......
......@@ -195,7 +195,7 @@ impl Params {
// 16) in Ruby: logVBKnn = -(2*pi +1 +3*Math.log2(3) -Math.log2(a) -Math.log2(y) +_2D +Math.log2(n) +nu +Math.log2(l) +2*gamma)
#[allow(non_snake_case)]
// was: let cand_logVBKnn = -((2*pi +4 +nu +2*cand_gamma) as f64 +Delta2 +3.0*THREE.log2() +(n as f64).log2() +(cand_l as f64).log2());
let cand_logVBKnn = -((2*pi +1 +nu +2*cand_gamma) as f64 +Delta2 +3.0*THREE.log2() -a.log2() -y.log2() +(n as f64).log2() +(cand_l as f64).log2());
let cand_logVBKnn = -((2*pi +1 +nu +2*cand_gamma) as f64 +Delta2 +2.0*THREE.log2() -a.log2() -y.log2() +(n as f64).log2() +(cand_l as f64).log2() +(BROT_NOISE_FACTOR as f64).log2());
// 17) in Ruby: logABKnn = logVBKnn / 2
#[allow(non_snake_case)]
let cand_logABKnn = cand_logVBKnn / 2.0;
......@@ -238,7 +238,7 @@ impl Params {
// was: let logVBKnn = -((2*pi +4 +nu +2*gamma) as f64 +Delta2 +3.0*THREE.log2() +(n as f64).log2() +(l as f64).log2());
//TODO FIXME replace 3.0*THREE.log2() -> 2.0*THREE.log2()
// according to current implementation, there does not seem to be BRot-Im
let logVBKnn = -((2*pi +1 +nu +2*gamma) as f64 +Delta2 +3.0*THREE.log2() -a.log2() -y.log2() +(n as f64).log2() +(l as f64).log2());
let logVBKnn = -((2*pi +1 +nu +2*gamma) as f64 +Delta2 +2.0*THREE.log2() -a.log2() -y.log2() +(n as f64).log2() +(l as f64).log2() +(BROT_NOISE_FACTOR as f64).log2());
#[allow(non_snake_case)]
let logABKnn = logVBKnn / 2.0;
//17.5) in Ruby: tauBK = 0.5 * (-logVBKnn - Math.log2(3) + 1)
......
Markdown is supported
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