Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tsar-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sha1 = "0.11.0"
smallvec = "1.9.0"
thiserror = "2.0.1"
zip = { version = "8.1.0", default-features = false, features = ["deflate"] }
zstd = "0.13.0"
zstd = "0.14.0"

[target.'cfg(windows)'.dependencies]
zfp-sys-cc = "0.2.0"
Expand Down
18 changes: 9 additions & 9 deletions tsar-rs/src/data_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,19 @@ impl DataType {
match self {
DataType::Byte => {
const N: usize = std::mem::size_of::<u64>();
let src_it = src.chunks_exact(N);
let targ_it = targ.chunks_exact(N);
let mut err = src_it
.remainder()
let (src_chunks, src_rem) = src.as_chunks::<N>();
let (targ_chunks, targ_rem) = targ.as_chunks::<N>();
let mut err = src_rem
.iter()
.zip(targ_it.remainder().iter())
.zip(targ_rem.iter())
.map(|(src, targ)| (targ ^ src).count_ones())
.sum::<u32>() as f64;
err += src_it
.zip(targ_it)
err += src_chunks
.iter()
.zip(targ_chunks.iter())
.map(|(src, targ)| {
let src = <u64>::from_le_bytes(src.try_into().unwrap());
let targ = <u64>::from_le_bytes(targ.try_into().unwrap());
let src = <u64>::from_le_bytes(*src);
let targ = <u64>::from_le_bytes(*targ);
(targ ^ src).count_ones()
})
.sum::<u32>() as f64;
Expand Down
Loading