From 82209c58aa4fd4f6758a29670b24b09aa05418fc Mon Sep 17 00:00:00 2001 From: PSeitz Date: Wed, 24 Aug 2022 01:16:25 -0700 Subject: [PATCH] reuse get_calculated_value (#1472) --- fastfield_codecs/src/linearinterpol.rs | 2 +- fastfield_codecs/src/multilinearinterpol.rs | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/fastfield_codecs/src/linearinterpol.rs b/fastfield_codecs/src/linearinterpol.rs index 8d1a9f374..8905c8008 100644 --- a/fastfield_codecs/src/linearinterpol.rs +++ b/fastfield_codecs/src/linearinterpol.rs @@ -124,7 +124,7 @@ fn diff(val1: u64, val2: u64) -> f64 { } #[inline] -fn get_calculated_value(first_val: u64, pos: u64, slope: f32) -> u64 { +pub fn get_calculated_value(first_val: u64, pos: u64, slope: f32) -> u64 { if slope < 0.0 { first_val - (pos as f32 * -slope) as u64 } else { diff --git a/fastfield_codecs/src/multilinearinterpol.rs b/fastfield_codecs/src/multilinearinterpol.rs index 198d4765b..1c1f57352 100644 --- a/fastfield_codecs/src/multilinearinterpol.rs +++ b/fastfield_codecs/src/multilinearinterpol.rs @@ -17,7 +17,7 @@ use common::{BinarySerializable, CountingWriter, DeserializeFrom}; use ownedbytes::OwnedBytes; use tantivy_bitpacker::{compute_num_bits, BitPacker, BitUnpacker}; -use crate::linearinterpol::get_slope; +use crate::linearinterpol::{get_calculated_value, get_slope}; use crate::{FastFieldCodecReader, FastFieldCodecSerializer, FastFieldDataAccess, FastFieldStats}; const CHUNK_SIZE: u64 = 512; @@ -355,11 +355,6 @@ fn distance + Ord>(x: T, y: T) -> T { } } -#[inline] -fn get_calculated_value(first_val: u64, pos: u64, slope: f32) -> u64 { - (first_val as i64 + (pos as f32 * slope) as i64) as u64 -} - #[cfg(test)] mod tests { use super::*;