Skip to content

Commit c30d136

Browse files
gfiumaragfiumara
committed
Remove validation images with invalid dimensions.
* Three images chosen for the validation package in 618a07e had dimensions outside those specified in the MINEX III test plan. * Fix bug where the last several lines in the create.log output would not be verified. * Bump validation version.
1 parent 618a07e commit c30d136

6 files changed

Lines changed: 5 additions & 34 deletions

File tree

‎minexiii/validation/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
201607291139
1+
201608020735

‎minexiii/validation/minexiii_validation_data.h‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ namespace MINEXIII
103103
MINEX_FINGER_LEFT_LITTLE, MINEX_IMP_NONLIVESCAN_PLAIN}},
104104
{"a005_02.gray", {348, 450, MINEX_QUALITY_GOOD,
105105
MINEX_FINGER_RIGHT_INDEX, MINEX_IMP_NONLIVESCAN_PLAIN}},
106-
{"a005_03.gray", {229, 133, MINEX_QUALITY_GOOD,
107-
MINEX_FINGER_RIGHT_MIDDLE, MINEX_IMP_NONLIVESCAN_PLAIN}},
108106
{"a005_04.gray", {347, 225, MINEX_QUALITY_POOR,
109107
MINEX_FINGER_RIGHT_RING, MINEX_IMP_NONLIVESCAN_PLAIN}},
110108
{"a005_05.gray", {373, 403, MINEX_QUALITY_VERYGOOD,
@@ -389,8 +387,6 @@ namespace MINEXIII
389387
MINEX_FINGER_LEFT_RING, MINEX_IMP_NONLIVESCAN_PLAIN}},
390388
{"a022_10.gray", {289, 465, MINEX_QUALITY_POOR,
391389
MINEX_FINGER_LEFT_LITTLE, MINEX_IMP_NONLIVESCAN_PLAIN}},
392-
{"a023_02.gray", {70, 499, MINEX_QUALITY_POOR,
393-
MINEX_FINGER_RIGHT_INDEX, MINEX_IMP_NONLIVESCAN_PLAIN}},
394390
{"a023_03.gray", {342, 489, MINEX_QUALITY_VERYGOOD,
395391
MINEX_FINGER_RIGHT_MIDDLE, MINEX_IMP_NONLIVESCAN_PLAIN}},
396392
{"a023_04.gray", {276, 537, MINEX_QUALITY_GOOD,
@@ -455,8 +451,6 @@ namespace MINEXIII
455451
MINEX_FINGER_LEFT_LITTLE, MINEX_IMP_NONLIVESCAN_PLAIN}},
456452
{"a027_02.gray", {332, 583, MINEX_QUALITY_VERYGOOD,
457453
MINEX_FINGER_RIGHT_INDEX, MINEX_IMP_NONLIVESCAN_PLAIN}},
458-
{"a027_03.gray", {209, 137, MINEX_QUALITY_POOR,
459-
MINEX_FINGER_RIGHT_MIDDLE, MINEX_IMP_NONLIVESCAN_PLAIN}},
460454
{"a027_04.gray", {263, 372, MINEX_QUALITY_POOR,
461455
MINEX_FINGER_RIGHT_RING, MINEX_IMP_NONLIVESCAN_PLAIN}},
462456
{"a027_05.gray", {263, 493, MINEX_QUALITY_FAIR,
@@ -1650,7 +1644,6 @@ namespace MINEXIII
16501644

16511645
/** MINEX III sample pairs of templates to match */
16521646
const std::vector<std::pair<std::string, std::string>> SAMPLE_PAIRS = {
1653-
{"a023_02.gray.tmpl", "b023_02.gray.tmpl"},
16541647
{"a023_03.gray.tmpl", "b023_03.gray.tmpl"},
16551648
{"a023_10.gray.tmpl", "b023_10.gray.tmpl"},
16561649
{"a023_09.gray.tmpl", "b023_09.gray.tmpl"},
@@ -1923,7 +1916,6 @@ namespace MINEXIII
19231916
{"a020_07.gray.tmpl", "b020_07.gray.tmpl"},
19241917
{"a020_04.gray.tmpl", "b020_04.gray.tmpl"},
19251918
{"a005_02.gray.tmpl", "b005_02.gray.tmpl"},
1926-
{"a005_03.gray.tmpl", "b005_03.gray.tmpl"},
19271919
{"a005_10.gray.tmpl", "b005_10.gray.tmpl"},
19281920
{"a005_09.gray.tmpl", "b005_09.gray.tmpl"},
19291921
{"a005_08.gray.tmpl", "b005_08.gray.tmpl"},
@@ -2019,7 +2011,6 @@ namespace MINEXIII
20192011
{"a024_07.gray.tmpl", "b024_07.gray.tmpl"},
20202012
{"a024_04.gray.tmpl", "b024_04.gray.tmpl"},
20212013
{"a027_02.gray.tmpl", "b027_02.gray.tmpl"},
2022-
{"a027_03.gray.tmpl", "b027_03.gray.tmpl"},
20232014
{"a027_10.gray.tmpl", "b027_10.gray.tmpl"},
20242015
{"a027_09.gray.tmpl", "b027_09.gray.tmpl"},
20252016
{"a027_08.gray.tmpl", "b027_08.gray.tmpl"},
@@ -2050,7 +2041,6 @@ namespace MINEXIII
20502041
{"a006_05.gray.tmpl", "b006_05.gray.tmpl"},
20512042
{"a006_07.gray.tmpl", "b006_07.gray.tmpl"},
20522043
{"a006_04.gray.tmpl", "b006_04.gray.tmpl"},
2053-
{"a023_02.gray.tmpl", "a023_02.gray.tmpl"},
20542044
{"a023_03.gray.tmpl", "a023_03.gray.tmpl"},
20552045
{"a023_10.gray.tmpl", "a023_10.gray.tmpl"},
20562046
{"a023_09.gray.tmpl", "a023_09.gray.tmpl"},
@@ -2324,7 +2314,6 @@ namespace MINEXIII
23242314
{"a020_07.gray.tmpl", "a020_07.gray.tmpl"},
23252315
{"a020_04.gray.tmpl", "a020_04.gray.tmpl"},
23262316
{"a005_02.gray.tmpl", "a005_02.gray.tmpl"},
2327-
{"a005_03.gray.tmpl", "a005_03.gray.tmpl"},
23282317
{"a005_10.gray.tmpl", "a005_10.gray.tmpl"},
23292318
{"a005_09.gray.tmpl", "a005_09.gray.tmpl"},
23302319
{"a005_08.gray.tmpl", "a005_08.gray.tmpl"},
@@ -2420,7 +2409,6 @@ namespace MINEXIII
24202409
{"a024_07.gray.tmpl", "a024_07.gray.tmpl"},
24212410
{"a024_04.gray.tmpl", "a024_04.gray.tmpl"},
24222411
{"a027_02.gray.tmpl", "a027_02.gray.tmpl"},
2423-
{"a027_03.gray.tmpl", "a027_03.gray.tmpl"},
24242412
{"a027_10.gray.tmpl", "a027_10.gray.tmpl"},
24252413
{"a027_09.gray.tmpl", "a027_09.gray.tmpl"},
24262414
{"a027_08.gray.tmpl", "a027_08.gray.tmpl"},
@@ -2486,7 +2474,6 @@ namespace MINEXIII
24862474
{"a044_07.gray.tmpl", "a006_07.gray.tmpl"},
24872475
{"a014_03.gray.tmpl", "a004_03.gray.tmpl"},
24882476
{"a012_05.gray.tmpl", "a049_05.gray.tmpl"},
2489-
{"a023_02.gray.tmpl", "a033_02.gray.tmpl"},
24902477
{"a042_10.gray.tmpl", "a030_10.gray.tmpl"},
24912478
{"a031_02.gray.tmpl", "a005_02.gray.tmpl"},
24922479
{"a017_10.gray.tmpl", "a041_10.gray.tmpl"},
@@ -2611,7 +2598,6 @@ namespace MINEXIII
26112598
{"a039_07.gray.tmpl", "a030_07.gray.tmpl"},
26122599
{"a038_10.gray.tmpl", "a027_10.gray.tmpl"},
26132600
{"a013_08.gray.tmpl", "a012_08.gray.tmpl"},
2614-
{"a013_02.gray.tmpl", "a023_02.gray.tmpl"},
26152601
{"a041_02.gray.tmpl", "a031_02.gray.tmpl"},
26162602
{"a029_02.gray.tmpl", "a032_02.gray.tmpl"},
26172603
{"a026_10.gray.tmpl", "a004_10.gray.tmpl"},
@@ -2621,7 +2607,6 @@ namespace MINEXIII
26212607
{"a014_05.gray.tmpl", "a050_05.gray.tmpl"},
26222608
{"a022_10.gray.tmpl", "a006_10.gray.tmpl"},
26232609
{"a028_04.gray.tmpl", "a020_04.gray.tmpl"},
2624-
{"a023_02.gray.tmpl", "a030_02.gray.tmpl"},
26252610
{"a028_05.gray.tmpl", "a047_05.gray.tmpl"},
26262611
{"a014_09.gray.tmpl", "a019_09.gray.tmpl"},
26272612
{"a042_02.gray.tmpl", "a038_02.gray.tmpl"},
@@ -2676,7 +2661,6 @@ namespace MINEXIII
26762661
{"a027_02.gray.tmpl", "a038_02.gray.tmpl"},
26772662
{"a026_08.gray.tmpl", "a002_08.gray.tmpl"},
26782663
{"a032_08.gray.tmpl", "a036_08.gray.tmpl"},
2679-
{"a005_03.gray.tmpl", "a043_03.gray.tmpl"},
26802664
{"a010_07.gray.tmpl", "a020_07.gray.tmpl"},
26812665
{"a044_03.gray.tmpl", "a048_03.gray.tmpl"},
26822666
{"a006_02.gray.tmpl", "a044_02.gray.tmpl"},
@@ -2800,7 +2784,6 @@ namespace MINEXIII
28002784
{"a033_02.gray.tmpl", "a050_02.gray.tmpl"},
28012785
{"a035_10.gray.tmpl", "a013_10.gray.tmpl"},
28022786
{"a002_07.gray.tmpl", "a022_07.gray.tmpl"},
2803-
{"a005_03.gray.tmpl", "a046_03.gray.tmpl"},
28042787
{"a010_10.gray.tmpl", "a023_10.gray.tmpl"},
28052788
{"a018_02.gray.tmpl", "a002_02.gray.tmpl"},
28062789
{"a035_04.gray.tmpl", "a013_04.gray.tmpl"},
@@ -2848,7 +2831,6 @@ namespace MINEXIII
28482831
{"a030_10.gray.tmpl", "a037_10.gray.tmpl"},
28492832
{"a026_04.gray.tmpl", "a037_04.gray.tmpl"},
28502833
{"a028_10.gray.tmpl", "a025_10.gray.tmpl"},
2851-
{"a021_03.gray.tmpl", "a027_03.gray.tmpl"},
28522834
{"a014_03.gray.tmpl", "a006_03.gray.tmpl"},
28532835
{"a042_04.gray.tmpl", "a024_04.gray.tmpl"},
28542836
{"a030_10.gray.tmpl", "a023_10.gray.tmpl"},
@@ -2930,11 +2912,9 @@ namespace MINEXIII
29302912
{"a009_02.gray.tmpl", "a038_02.gray.tmpl"},
29312913
{"a032_05.gray.tmpl", "a029_05.gray.tmpl"},
29322914
{"a024_08.gray.tmpl", "a002_08.gray.tmpl"},
2933-
{"a005_03.gray.tmpl", "a032_03.gray.tmpl"},
29342915
{"a031_02.gray.tmpl", "a021_02.gray.tmpl"},
29352916
{"a030_09.gray.tmpl", "a017_09.gray.tmpl"},
29362917
{"a027_02.gray.tmpl", "a005_02.gray.tmpl"},
2937-
{"a023_02.gray.tmpl", "a034_02.gray.tmpl"},
29382918
{"a045_03.gray.tmpl", "a041_03.gray.tmpl"},
29392919
{"a041_09.gray.tmpl", "a044_09.gray.tmpl"},
29402920
{"a007_09.gray.tmpl", "a031_09.gray.tmpl"},
@@ -3041,12 +3021,10 @@ namespace MINEXIII
30413021
{"a035_05.gray.tmpl", "a040_05.gray.tmpl"},
30423022
{"a009_05.gray.tmpl", "a015_05.gray.tmpl"},
30433023
{"a005_05.gray.tmpl", "a040_05.gray.tmpl"},
3044-
{"a030_02.gray.tmpl", "a023_02.gray.tmpl"},
30453024
{"a037_09.gray.tmpl", "a008_09.gray.tmpl"},
30463025
{"a045_05.gray.tmpl", "a044_05.gray.tmpl"},
30473026
{"a018_04.gray.tmpl", "a010_04.gray.tmpl"},
30483027
{"a049_08.gray.tmpl", "a035_08.gray.tmpl"},
3049-
{"a005_03.gray.tmpl", "a043_03.gray.tmpl"},
30503028
{"a050_07.gray.tmpl", "a026_07.gray.tmpl"},
30513029
{"a050_08.gray.tmpl", "a025_08.gray.tmpl"},
30523030
{"a036_03.gray.tmpl", "a049_03.gray.tmpl"},
@@ -3076,7 +3054,6 @@ namespace MINEXIII
30763054
{"a011_08.gray.tmpl", "a042_08.gray.tmpl"},
30773055
{"a029_09.gray.tmpl", "a014_09.gray.tmpl"},
30783056
{"a020_09.gray.tmpl", "a016_09.gray.tmpl"},
3079-
{"a005_03.gray.tmpl", "a019_03.gray.tmpl"},
30803057
{"a034_03.gray.tmpl", "a042_03.gray.tmpl"},
30813058
{"a013_03.gray.tmpl", "a020_03.gray.tmpl"},
30823059
{"a032_04.gray.tmpl", "a019_04.gray.tmpl"},
@@ -3103,7 +3080,6 @@ namespace MINEXIII
31033080
{"a012_04.gray.tmpl", "a033_04.gray.tmpl"},
31043081
{"a006_04.gray.tmpl", "a013_04.gray.tmpl"},
31053082
{"a047_08.gray.tmpl", "a005_08.gray.tmpl"},
3106-
{"a009_02.gray.tmpl", "a023_02.gray.tmpl"},
31073083
{"a001_07.gray.tmpl", "a035_07.gray.tmpl"},
31083084
{"a025_08.gray.tmpl", "a008_08.gray.tmpl"},
31093085
{"a023_08.gray.tmpl", "a005_08.gray.tmpl"},
@@ -3150,7 +3126,6 @@ namespace MINEXIII
31503126
{"a042_02.gray.tmpl", "a040_02.gray.tmpl"},
31513127
{"a020_04.gray.tmpl", "a037_04.gray.tmpl"},
31523128
{"a033_03.gray.tmpl", "a015_03.gray.tmpl"},
3153-
{"a023_02.gray.tmpl", "a044_02.gray.tmpl"},
31543129
{"a047_03.gray.tmpl", "a030_03.gray.tmpl"},
31553130
{"a050_09.gray.tmpl", "a002_09.gray.tmpl"},
31563131
{"a035_10.gray.tmpl", "a029_10.gray.tmpl"},
@@ -3301,7 +3276,6 @@ namespace MINEXIII
33013276
{"a037_08.gray.tmpl", "a043_08.gray.tmpl"},
33023277
{"a033_09.gray.tmpl", "a035_09.gray.tmpl"},
33033278
{"a007_10.gray.tmpl", "a026_10.gray.tmpl"},
3304-
{"a034_02.gray.tmpl", "a023_02.gray.tmpl"},
33053279
{"a034_04.gray.tmpl", "a024_04.gray.tmpl"},
33063280
{"a031_04.gray.tmpl", "a049_04.gray.tmpl"},
33073281
{"a033_08.gray.tmpl", "a017_08.gray.tmpl"},
@@ -3332,7 +3306,6 @@ namespace MINEXIII
33323306
{"a006_02.gray.tmpl", "a031_02.gray.tmpl"},
33333307
{"a032_09.gray.tmpl", "a021_09.gray.tmpl"},
33343308
{"a004_02.gray.tmpl", "a022_02.gray.tmpl"},
3335-
{"a018_03.gray.tmpl", "a027_03.gray.tmpl"},
33363309
{"a006_09.gray.tmpl", "a011_09.gray.tmpl"},
33373310
{"a027_02.gray.tmpl", "a013_02.gray.tmpl"},
33383311
{"a030_10.gray.tmpl", "a011_10.gray.tmpl"},

‎minexiii/validation/validate‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ if [ $? -ne 0 ]; then
226226
fi
227227

228228
# Check lines of template creation log
229-
if [ `cat "${WD}"/${OUTPUT_DIR}/${CREATE_LOG} | wc -l` -ne 809 ]; then
229+
if [ `cat "${WD}"/${OUTPUT_DIR}/${CREATE_LOG} | wc -l` -ne 806 ]; then
230230
fail "Invalid number of lines in template creation log. Please review:"\
231231
"${WD}/${OUTPUT_DIR}/${CREATE_LOG}"
232232
fi
@@ -250,7 +250,7 @@ fi
250250
# Check format of creation log
251251
unsuccessful_rv_g=0
252252
OLDIFS=$IFS; IFS=$'\n';
253-
for line in `sed -n "2,764 p" "${WD}"/${OUTPUT_DIR}/${CREATE_LOG}`; do
253+
for line in `sed -n "2,802 p" "${WD}"/${OUTPUT_DIR}/${CREATE_LOG}`; do
254254
formatTest=`echo $line | sed 's/\(.*gray\) [0-9]\+ [0-9]\{1,3\}/test/'`
255255
if [ $? -ne 0 ] || [ "$formatTest" != "test" ]; then
256256
fail "The template creation log is invalid. Please review:" \
@@ -311,7 +311,7 @@ if [ $? -eq 0 ]; then
311311
echo "${MATCH_LOG_FOOTER}" >> "${WD}"/${OUTPUT_DIR}/${MATCH_LOG}
312312
fi
313313
# Check lines of template matching log
314-
if [ `cat "${WD}"/${OUTPUT_DIR}/${MATCH_LOG} | wc -l` -ne 1746 ]; then
314+
if [ `cat "${WD}"/${OUTPUT_DIR}/${MATCH_LOG} | wc -l` -ne 1725 ]; then
315315
fail "Invalid number of lines in template matching log. Please review:"\
316316
"${WD}/${OUTPUT_DIR}/${MATCH_LOG}"
317317
fi
@@ -320,7 +320,7 @@ fi
320320
unsuccessful_rv_m=0
321321
uses_neg1=0
322322
OLDIFS=$IFS; IFS=$'\n';
323-
for line in `sed -n "2,1742 p" "${WD}"/${OUTPUT_DIR}/${MATCH_LOG}`; do
323+
for line in `sed -n "2,1721 p" "${WD}"/${OUTPUT_DIR}/${MATCH_LOG}`; do
324324
# Check line format
325325
formatTest=`echo $line | sed 's/\(.*tmpl\) \(.*tmpl\) \([0-9]\+\) \(-\?[0-9]\+\.[0-9]*\|-\?[0-9]\+\)/test/'`
326326
if [ $? -ne 0 ] || [ "$formatTest" != "test" ]; then

‎minexiii/validation/validation_imagery_raw/a005_03.gray‎

-29.7 KB
Binary file not shown.

‎minexiii/validation/validation_imagery_raw/a023_02.gray‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎minexiii/validation/validation_imagery_raw/a027_03.gray‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)