diff --git a/slapsegiii/validation/VERSION b/slapsegiii/validation/VERSION index c0d124c..3db2830 100644 --- a/slapsegiii/validation/VERSION +++ b/slapsegiii/validation/VERSION @@ -1 +1 @@ -201907011047 +202006111520 diff --git a/slapsegiii/validation/images/segments-upperpalm.csv b/slapsegiii/validation/images/segments-upperpalm.csv index 108f6ee..13bc3af 100644 --- a/slapsegiii/validation/images/segments-upperpalm.csv +++ b/slapsegiii/validation/images/segments-upperpalm.csv @@ -271,30 +271,30 @@ filename,frgp,tlx,tly,trx,try,blx,bly,brx,bry,theta 00002448_Q_1000_28_4992x5120.gray,7,3202,621,3606,621,3202,1334,3606,1334,0 00002448_Q_1000_28_4992x5120.gray,8,2171,55,2560,55,2171,823,2560,823,0 00002448_Q_1000_28_4992x5120.gray,9,1277,414,1736,414,1277,1192,1736,1192,0 -00002449_N_500_28_2500x2750.gray,10,396,842,653,842,396,1227,653,1227,0 -00002449_N_500_28_2500x2750.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 -00002449_N_500_28_2500x2750.gray,8,1120,112,1395,112,1120,540,1395,540,0 -00002449_N_500_28_2500x2750.gray,9,786,272,1075,287,762,732,1051,747,-2.98 -00002449_N_500_28_2500x2750_challenge01.gray,10,396,842,653,842,396,1227,653,1227,0 -00002449_N_500_28_2500x2750_challenge01.gray,7,1336,298,1553,241,1434,674,1651,617,14.65 -00002449_N_500_28_2500x2750_challenge01.gray,8,1120,112,1395,112,1120,540,1395,540,0 -00002449_N_500_28_2500x2750_challenge01.gray,9,786,272,1075,287,762,732,1051,747,-2.98 -00002449_N_500_28_2500x2750_challenge02.gray,10,396,842,653,842,396,1227,653,1227,0 -00002449_N_500_28_2500x2750_challenge02.gray,7,NA,NA,NA,NA,NA,NA,NA,NA,5.77 -00002449_N_500_28_2500x2750_challenge02.gray,8,1120,112,1395,112,1120,540,1395,540,0 -00002449_N_500_28_2500x2750_challenge02.gray,9,786,272,1075,287,762,732,1051,747,-2.98 -00002449_N_500_28_2500x2750_challenge03.gray,10,NA,NA,NA,NA,NA,NA,NA,NA,0 -00002449_N_500_28_2500x2750_challenge03.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 -00002449_N_500_28_2500x2750_challenge03.gray,8,1120,112,1395,112,1120,540,1395,540,0 -00002449_N_500_28_2500x2750_challenge03.gray,9,786,272,1075,287,762,732,1051,747,-2.98 -00002449_N_500_28_2500x2750_challenge04.gray,10,396,842,653,842,396,1227,653,1227,0 -00002449_N_500_28_2500x2750_challenge04.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 -00002449_N_500_28_2500x2750_challenge04.gray,8,1120,112,1395,112,1120,540,1395,540,0 -00002449_N_500_28_2500x2750_challenge04.gray,9,903,68,1183,115,826,526,1106,573,-9.56 -00002449_N_500_28_2500x2750_challenge05.gray,10,396,842,653,842,396,1227,653,1227,0 -00002449_N_500_28_2500x2750_challenge05.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 -00002449_N_500_28_2500x2750_challenge05.gray,8,1120,112,1395,112,1120,540,1395,540,0 -00002449_N_500_28_2500x2750_challenge05.gray,9,NA,NA,NA,NA,NA,NA,NA,NA,-2.98 +00002449_N_500_28_2500x2500.gray,10,396,842,653,842,396,1227,653,1227,0 +00002449_N_500_28_2500x2500.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 +00002449_N_500_28_2500x2500.gray,8,1120,112,1395,112,1120,540,1395,540,0 +00002449_N_500_28_2500x2500.gray,9,786,272,1075,287,762,732,1051,747,-2.98 +00002449_N_500_28_2500x2500_challenge01.gray,10,396,842,653,842,396,1227,653,1227,0 +00002449_N_500_28_2500x2500_challenge01.gray,7,1336,298,1553,241,1434,674,1651,617,14.65 +00002449_N_500_28_2500x2500_challenge01.gray,8,1120,112,1395,112,1120,540,1395,540,0 +00002449_N_500_28_2500x2500_challenge01.gray,9,786,272,1075,287,762,732,1051,747,-2.98 +00002449_N_500_28_2500x2500_challenge02.gray,10,396,842,653,842,396,1227,653,1227,0 +00002449_N_500_28_2500x2500_challenge02.gray,7,NA,NA,NA,NA,NA,NA,NA,NA,5.77 +00002449_N_500_28_2500x2500_challenge02.gray,8,1120,112,1395,112,1120,540,1395,540,0 +00002449_N_500_28_2500x2500_challenge02.gray,9,786,272,1075,287,762,732,1051,747,-2.98 +00002449_N_500_28_2500x2500_challenge03.gray,10,NA,NA,NA,NA,NA,NA,NA,NA,0 +00002449_N_500_28_2500x2500_challenge03.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 +00002449_N_500_28_2500x2500_challenge03.gray,8,1120,112,1395,112,1120,540,1395,540,0 +00002449_N_500_28_2500x2500_challenge03.gray,9,786,272,1075,287,762,732,1051,747,-2.98 +00002449_N_500_28_2500x2500_challenge04.gray,10,396,842,653,842,396,1227,653,1227,0 +00002449_N_500_28_2500x2500_challenge04.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 +00002449_N_500_28_2500x2500_challenge04.gray,8,1120,112,1395,112,1120,540,1395,540,0 +00002449_N_500_28_2500x2500_challenge04.gray,9,903,68,1183,115,826,526,1106,573,-9.56 +00002449_N_500_28_2500x2500_challenge05.gray,10,396,842,653,842,396,1227,653,1227,0 +00002449_N_500_28_2500x2500_challenge05.gray,7,1459,318,1690,294,1497,687,1728,663,5.77 +00002449_N_500_28_2500x2500_challenge05.gray,8,1120,112,1395,112,1120,540,1395,540,0 +00002449_N_500_28_2500x2500_challenge05.gray,9,NA,NA,NA,NA,NA,NA,NA,NA,-2.98 00002449_Q_1000_26_4992x5120.gray,2,1477,601,1986,601,1477,1344,1986,1344,0 00002449_Q_1000_26_4992x5120.gray,3,2280,287,2736,239,2363,1086,2819,1038,5.95 00002449_Q_1000_26_4992x5120.gray,4,3169,686,3658,686,3169,1489,3658,1489,0 diff --git a/slapsegiii/validation/src/slapsegiii_validation_data.h b/slapsegiii/validation/src/slapsegiii_validation_data.h index acdb137..6be623c 100644 --- a/slapsegiii/validation/src/slapsegiii_validation_data.h +++ b/slapsegiii/validation/src/slapsegiii_validation_data.h @@ -691,28 +691,28 @@ namespace SlapSegIII {2500, 2500, 500, SlapImage::CaptureTechnology::OpticalTIRBright, SlapImage::Orientation::Left}}, - {"00002449_N_500_28_2500x2750_challenge01.gray", - {2500, 2750, 500, + {"00002449_N_500_28_2500x2500_challenge01.gray", + {2500, 2500, 500, SlapImage::CaptureTechnology::OpticalTIRBright, SlapImage::Orientation::Left}}, - {"00002449_N_500_28_2500x2750_challenge02.gray", - {2500, 2750, 500, + {"00002449_N_500_28_2500x2500_challenge02.gray", + {2500, 2500, 500, SlapImage::CaptureTechnology::OpticalTIRBright, SlapImage::Orientation::Left}}, - {"00002449_N_500_28_2500x2750_challenge03.gray", - {2500, 2750, 500, + {"00002449_N_500_28_2500x2500_challenge03.gray", + {2500, 2500, 500, SlapImage::CaptureTechnology::OpticalTIRBright, SlapImage::Orientation::Left}}, - {"00002449_N_500_28_2500x2750_challenge04.gray", - {2500, 2750, 500, + {"00002449_N_500_28_2500x2500_challenge04.gray", + {2500, 2500, 500, SlapImage::CaptureTechnology::OpticalTIRBright, SlapImage::Orientation::Left}}, - {"00002449_N_500_28_2500x2750_challenge05.gray", - {2500, 2750, 500, + {"00002449_N_500_28_2500x2500_challenge05.gray", + {2500, 2500, 500, SlapImage::CaptureTechnology::OpticalTIRBright, SlapImage::Orientation::Left}}, - {"00002449_N_500_28_2500x2750.gray", - {2500, 2750, 500, + {"00002449_N_500_28_2500x2500.gray", + {2500, 2500, 500, SlapImage::CaptureTechnology::OpticalTIRBright, SlapImage::Orientation::Left}}, {"canary-upperpalm_500x500.gray", diff --git a/slapsegiii/validation/validate b/slapsegiii/validation/validate index 6544210..c68e253 100755 --- a/slapsegiii/validation/validate +++ b/slapsegiii/validation/validate @@ -198,7 +198,7 @@ check_image_versions() declare -A acceptable_versions acceptable_versions["twoinch"]="201902271132" acceptable_versions["threeinch"]="201902271132" - acceptable_versions["upperpalm"]="201902271132" + acceptable_versions["upperpalm"]="202006111448" acceptable_versions["fullpalm"]="201902271132" local found_some_images=0