From 7258dcc4b3444a0ede86ad0b77561e02c878e35c Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Fri, 16 Dec 2022 11:17:34 -0600 Subject: [PATCH] cargo fmt --- src/oned/rss/expanded/mod.rs | 2 +- .../rss_expanded_image_2_binary_test_tase.rs | 153 ++++++++++-------- src/oned/rss/expanded/rss_expanded_reader.rs | 15 +- 3 files changed, 100 insertions(+), 70 deletions(-) diff --git a/src/oned/rss/expanded/mod.rs b/src/oned/rss/expanded/mod.rs index 0103c32..12f5cfa 100644 --- a/src/oned/rss/expanded/mod.rs +++ b/src/oned/rss/expanded/mod.rs @@ -19,4 +19,4 @@ pub use rss_expanded_reader::*; mod rss_expanded_internal_test_case; #[cfg(test)] -mod rss_expanded_image_2_binary_test_tase; \ No newline at end of file +mod rss_expanded_image_2_binary_test_tase; diff --git a/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs b/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs index 5c594ee..3bc9cbf 100644 --- a/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs +++ b/src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs @@ -30,152 +30,169 @@ use std::rc::Rc; * @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es) * @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es) */ - -use crate::{common::{BitArray, GlobalHistogramBinarizer}, BinaryBitmap, BufferedImageLuminanceSource, oned::rss::expanded::RSSExpandedReader}; +use crate::{ + common::{BitArray, GlobalHistogramBinarizer}, + oned::rss::expanded::RSSExpandedReader, + BinaryBitmap, BufferedImageLuminanceSource, +}; use super::bit_array_builder; - #[test] - fn testDecodeRow2binary1() { +#[test] +fn testDecodeRow2binary1() { // (11)100224(17)110224(3102)000100 assertCorrectImage2binary("1.png", " ...X...X .X....X. .XX...X. X..X...X ...XX.X. ..X.X... ..X.X..X ...X..X. X.X....X .X....X. .....X.. X...X..."); - } +} - #[test] - fn testDecodeRow2binary2() { +#[test] +fn testDecodeRow2binary2() { // (01)90012345678908(3103)001750 - assertCorrectImage2binary("2.png", " ..X..... ......X. .XXX.X.X .X...XX. XXXXX.XX XX.X.... .XX.XX.X .XX."); - } + assertCorrectImage2binary( + "2.png", + " ..X..... ......X. .XXX.X.X .X...XX. XXXXX.XX XX.X.... .XX.XX.X .XX.", + ); +} - #[test] - fn testDecodeRow2binary3() { +#[test] +fn testDecodeRow2binary3() { // (10)12A assertCorrectImage2binary("3.png", " .......X ..XX..X. X.X....X .......X ...."); - } +} - #[test] - fn testDecodeRow2binary4() { +#[test] +fn testDecodeRow2binary4() { // (01)98898765432106(3202)012345(15)991231 assertCorrectImage2binary( "4.png", " ..XXXX.X XX.XXXX. .XXX.XX. XX..X... .XXXXX.. XX.X..X. ..XX..XX XX.X.XXX X..XX..X .X.XXXXX XXXX"); - } +} - #[test] - fn testDecodeRow2binary5() { +#[test] +fn testDecodeRow2binary5() { // (01)90614141000015(3202)000150 assertCorrectImage2binary( - "5.png", " ..X.X... .XXXX.X. XX..XXXX ....XX.. X....... ....X... ....X..X .XX."); - } + "5.png", + " ..X.X... .XXXX.X. XX..XXXX ....XX.. X....... ....X... ....X..X .XX.", + ); +} - #[test] - fn testDecodeRow2binary10() { +#[test] +fn testDecodeRow2binary10() { // (01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456(423)0123456789012 assertCorrectImage2binary("10.png", " .X.XX..X XX.XXXX. .XXX.XX. XX..X... .XXXXX.. XX.X..X. ..XX...X XX.X.... X.X.X.X. X.X..X.X .X....X. XX...X.. ...XX.X. .XXXXXX. .X..XX.. X.X.X... .X...... XXXX.... XX.XX... XXXXX.X. ...XXXXX .....X.X ...X.... X.XXX..X X.X.X... XX.XX..X .X..X..X .X.X.X.X X.XX...X .XX.XXX. XXX.X.XX ..X."); - } +} - #[test] - fn testDecodeRow2binary11() { +#[test] +fn testDecodeRow2binary11() { // (01)98898765432106(15)991231(3103)001750(10)12A(422)123(21)123456 assertCorrectImage2binary("11.png", " .X.XX..X XX.XXXX. .XXX.XX. XX..X... .XXXXX.. XX.X..X. ..XX...X XX.X.... X.X.X.X. X.X..X.X .X....X. XX...X.. ...XX.X. .XXXXXX. .X..XX.. X.X.X... .X...... XXXX.... XX.XX... XXXXX.X. ...XXXXX .....X.X ...X.... X.XXX..X X.X.X... ...."); - } +} - #[test] - fn testDecodeRow2binary12() { +#[test] +fn testDecodeRow2binary12() { // (01)98898765432106(3103)001750 assertCorrectImage2binary( - "12.png", " ..X..XX. XXXX..XX X.XX.XX. .X....XX XXX..XX. X..X.... .XX.XX.X .XX."); - } + "12.png", + " ..X..XX. XXXX..XX X.XX.XX. .X....XX XXX..XX. X..X.... .XX.XX.X .XX.", + ); +} - #[test] - fn testDecodeRow2binary13() { +#[test] +fn testDecodeRow2binary13() { // (01)90012345678908(3922)795 assertCorrectImage2binary( - "13.png", " ..XX..X. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. X.X.XXXX .X..X..X ......X."); - } + "13.png", + " ..XX..X. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. X.X.XXXX .X..X..X ......X.", + ); +} - #[test] - fn testDecodeRow2binary14() { +#[test] +fn testDecodeRow2binary14() { // (01)90012345678908(3932)0401234 assertCorrectImage2binary( "14.png", " ..XX.X.. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. X.....X. X.....X. X.X.X.XX .X...... X..."); - } +} - #[test] - fn testDecodeRow2binary15() { +#[test] +fn testDecodeRow2binary15() { // (01)90012345678908(3102)001750(11)100312 assertCorrectImage2binary( "15.png", " ..XXX... ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - #[test] - fn testDecodeRow2binary16() { +#[test] +fn testDecodeRow2binary16() { // (01)90012345678908(3202)001750(11)100312 assertCorrectImage2binary( "16.png", " ..XXX..X ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - #[test] - fn testDecodeRow2binary17() { +#[test] +fn testDecodeRow2binary17() { // (01)90012345678908(3102)001750(13)100312 assertCorrectImage2binary( "17.png", " ..XXX.X. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - #[test] - fn testDecodeRow2binary18() { +#[test] +fn testDecodeRow2binary18() { // (01)90012345678908(3202)001750(13)100312 assertCorrectImage2binary( "18.png", " ..XXX.XX ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - #[test] - fn testDecodeRow2binary19() { +#[test] +fn testDecodeRow2binary19() { // (01)90012345678908(3102)001750(15)100312 assertCorrectImage2binary( "19.png", " ..XXXX.. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - #[test] - fn testDecodeRow2binary20() { +#[test] +fn testDecodeRow2binary20() { // (01)90012345678908(3202)001750(15)100312 assertCorrectImage2binary( "20.png", " ..XXXX.X ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - #[test] - fn testDecodeRow2binary21() { +#[test] +fn testDecodeRow2binary21() { // (01)90012345678908(3102)001750(17)100312 assertCorrectImage2binary( "21.png", " ..XXXXX. ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - #[test] - fn testDecodeRow2binary22() { +#[test] +fn testDecodeRow2binary22() { // (01)90012345678908(3202)001750(17)100312 assertCorrectImage2binary( "22.png", " ..XXXXXX ........ .X..XXX. X.X.X... XX.XXXXX .XXXX.X. ..XX...X .X.....X .XX..... XXXX.X.. XX.."); - } +} - fn assertCorrectImage2binary( fileName:&str, expected:&str) - { - let path = format!("test_resources/blackbox/rssexpanded-1/{}",fileName); +fn assertCorrectImage2binary(fileName: &str, expected: &str) { + let path = format!("test_resources/blackbox/rssexpanded-1/{}", fileName); let image = image::open(path).expect("file exists"); - let binaryMap = BinaryBitmap::new(Rc::new( GlobalHistogramBinarizer::new(Box::new(BufferedImageLuminanceSource::new(image))))); + let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new( + BufferedImageLuminanceSource::new(image), + )))); let rowNumber = binaryMap.getHeight() / 2; - let row = binaryMap.getBlackRow(rowNumber, &mut BitArray::new()).expect("row"); + let row = binaryMap + .getBlackRow(rowNumber, &mut BitArray::new()) + .expect("row"); // let pairs = Vec::new(); // try { - let mut rssExpandedReader = RSSExpandedReader::new(); - let pairs = rssExpandedReader.decodeRow2pairs(rowNumber as u32, &row).expect("decode"); + let mut rssExpandedReader = RSSExpandedReader::new(); + let pairs = rssExpandedReader + .decodeRow2pairs(rowNumber as u32, &row) + .expect("decode"); // } catch (ReaderException re) { // fail(re.toString()); // return; // } let binary = bit_array_builder::buildBitArray(&pairs); assert_eq!(expected, binary.to_string()); - } +} diff --git a/src/oned/rss/expanded/rss_expanded_reader.rs b/src/oned/rss/expanded/rss_expanded_reader.rs index 595c664..6bc9c14 100644 --- a/src/oned/rss/expanded/rss_expanded_reader.rs +++ b/src/oned/rss/expanded/rss_expanded_reader.rs @@ -1028,6 +1028,19 @@ impl RSSExpandedReader { impl Default for RSSExpandedReader { fn default() -> Self { - Self { _possibleLeftPairs: Default::default(), _possibleRightPairs: Default::default(), decodeFinderCounters: Default::default(), dataCharacterCounters: Default::default(), oddRoundingErrors: Default::default(), evenRoundingErrors: Default::default(), oddCounts: Default::default(), evenCounts: Default::default(), pairs: Default::default(), rows: Default::default(), startEnd: Default::default(), startFromEven: Default::default() } + Self { + _possibleLeftPairs: Default::default(), + _possibleRightPairs: Default::default(), + decodeFinderCounters: Default::default(), + dataCharacterCounters: Default::default(), + oddRoundingErrors: Default::default(), + evenRoundingErrors: Default::default(), + oddCounts: Default::default(), + evenCounts: Default::default(), + pairs: Default::default(), + rows: Default::default(), + startEnd: Default::default(), + startFromEven: Default::default(), + } } }