code cleanup

This commit is contained in:
Henry Schimke
2023-04-29 09:58:04 -05:00
parent ef999a4eb0
commit 508f5f14c5
19 changed files with 56 additions and 154 deletions

View File

@@ -8,86 +8,62 @@ use crate::{common::BitMatrix, qrcode::cpp_port::data_mask::GetMaskedBit};
#[test]
fn Mask0() {
TestMaskAcrossDimensions(0, |i, j| {
(i + j) % 2 == 0
});
TestMaskAcrossDimensions(0, |i, j| (i + j) % 2 == 0);
}
#[test]
fn Mask1() {
TestMaskAcrossDimensions(1, |i, _| {
i % 2 == 0
});
TestMaskAcrossDimensions(1, |i, _| i % 2 == 0);
}
#[test]
fn Mask2() {
TestMaskAcrossDimensions(2, |_, j| {
j % 3 == 0
});
TestMaskAcrossDimensions(2, |_, j| j % 3 == 0);
}
#[test]
fn Mask3() {
TestMaskAcrossDimensions(3, |i, j| {
(i + j) % 3 == 0
});
TestMaskAcrossDimensions(3, |i, j| (i + j) % 3 == 0);
}
#[test]
fn Mask4() {
TestMaskAcrossDimensions(4, |i, j| {
(i / 2 + j / 3) % 2 == 0
});
TestMaskAcrossDimensions(4, |i, j| (i / 2 + j / 3) % 2 == 0);
}
#[test]
fn Mask5() {
TestMaskAcrossDimensions(5, |i, j| {
(i * j) % 2 + (i * j) % 3 == 0
});
TestMaskAcrossDimensions(5, |i, j| (i * j) % 2 + (i * j) % 3 == 0);
}
#[test]
fn Mask6() {
TestMaskAcrossDimensions(6, |i, j| {
((i * j) % 2 + (i * j) % 3) % 2 == 0
});
TestMaskAcrossDimensions(6, |i, j| ((i * j) % 2 + (i * j) % 3) % 2 == 0);
}
#[test]
fn Mask7() {
TestMaskAcrossDimensions(7, |i, j| {
((i + j) % 2 + (i * j) % 3) % 2 == 0
});
TestMaskAcrossDimensions(7, |i, j| ((i + j) % 2 + (i * j) % 3) % 2 == 0);
}
#[test]
fn MicroMask0() {
TestMicroMaskAcrossDimensions(0, |i, _| {
i % 2 == 0
});
TestMicroMaskAcrossDimensions(0, |i, _| i % 2 == 0);
}
#[test]
fn MicroMask1() {
TestMicroMaskAcrossDimensions(1, |i, j| {
(i / 2 + j / 3) % 2 == 0
});
TestMicroMaskAcrossDimensions(1, |i, j| (i / 2 + j / 3) % 2 == 0);
}
#[test]
fn MicroMask2() {
TestMicroMaskAcrossDimensions(2, |i, j| {
((i * j) % 2 + (i * j) % 3) % 2 == 0
});
TestMicroMaskAcrossDimensions(2, |i, j| ((i * j) % 2 + (i * j) % 3) % 2 == 0);
}
#[test]
fn MicroMask3() {
TestMicroMaskAcrossDimensions(3, |i, j| {
((i + j) % 2 + (i * j) % 3) % 2 == 0
});
TestMicroMaskAcrossDimensions(3, |i, j| ((i + j) % 2 + (i * j) % 3) % 2 == 0);
}
fn TestMaskAcrossDimensionsImpl<F>(

View File

@@ -23,10 +23,8 @@
// using namespace ZXing;
// using namespace ZXing::QRCode;
use crate::{
common::{BitArray},
common::BitArray,
qrcode::{
cpp_port::decoder::DecodeBitStream,
decoder::{ErrorCorrectionLevel, Version},

View File

@@ -43,8 +43,8 @@ fn VersionForNumber() {
fn GetProvisionalVersionForDimension() {
for i in 1..=40 {
// for (int i = 1; i <= 40; i++) {
let prov =
Version::FromDimension(4 * i + 17).unwrap_or_else(|_| panic!("version should exist for {i}"));
let prov = Version::FromDimension(4 * i + 17)
.unwrap_or_else(|_| panic!("version should exist for {i}"));
// assert_ne!(prov, nullptr);
assert_eq!(i, prov.getVersionNumber());
}