kai/pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpll: clean up asserts

Browse Source
This commit is contained in:
Robert Jördens 2021-02-01 14:44:53 +01:00
parent 7e82fce4f0
commit ab7e3d229b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dsp/src/rpll.rs
View File

@ -49,7 +49,7 @@ impl RPLL {
shift_frequency: u8, shift_frequency: u8,
shift_phase: u8, shift_phase: u8,
) -> (i32, u32) { ) -> (i32, u32) {
debug_assert!(shift_frequency > self.dt2); debug_assert!(shift_frequency >= self.dt2);
debug_assert!(shift_phase >= self.dt2); debug_assert!(shift_phase >= self.dt2);
// Advance phase // Advance phase
self.y = self.y.wrapping_add(self.f as i32); self.y = self.y.wrapping_add(self.f as i32);
@ -122,6 +122,10 @@ mod test {
} }
fn run(&mut self, n: usize) -> (Vec<f32>, Vec<f32>) { fn run(&mut self, n: usize) -> (Vec<f32>, Vec<f32>) {
assert!(self.period >= 1 << self.dt2);
assert!(self.period < 1 << self.shift_frequency);
assert!(self.period < 1 << self.shift_phase + 1);
let mut y = Vec::<f32>::new(); let mut y = Vec::<f32>::new();
let mut f = Vec::<f32>::new(); let mut f = Vec::<f32>::new();
for _ in 0..n { for _ in 0..n {
@ -162,10 +166,6 @@ mod test {
} }
fn measure(&mut self, n: usize, limits: [f32; 4]) { fn measure(&mut self, n: usize, limits: [f32; 4]) {
assert!(self.period >= 1 << self.dt2);
assert!(self.dt2 <= self.shift_frequency);
assert!(self.period < 1 << self.shift_frequency);
assert!(self.period < 1 << self.shift_frequency + 1);
let t_settle = (1 << self.shift_frequency - self.dt2 + 4) let t_settle = (1 << self.shift_frequency - self.dt2 + 4)
+ (1 << self.shift_phase - self.dt2 + 4); + (1 << self.shift_phase - self.dt2 + 4);
self.run(t_settle); self.run(t_settle);
@ -190,7 +190,7 @@ mod test {
print!("{:.2e} ", rel); print!("{:.2e} ", rel);
assert!( assert!(
rel <= 1., rel <= 1.,
"idx {}, have |{}| > want {}", "idx {}, have |{:.2e}| > limit {:.2e}",
i, i,
m[i], m[i],
limits[i] limits[i]