diff --git a/resources/result/Result.xml b/resources/result/Result.xml
index 443ec72..4ebae6d 100644
--- a/resources/result/Result.xml
+++ b/resources/result/Result.xml
@@ -7,28 +7,21 @@
- ¾©A88731
-
- À¶ÅÆ:¾©A88711
-
-
-
- ÔÁBR75Y3
+ ÍîAH8331
- À¶ÅÆ:ÔÁBR75Y3
+ À¶ÅÆ:ÍîAH8331
- ÍîAH8331
+ ¾©A88731
- À¶ÅÆ:ÍîAH8331
+ À¶ÅÆ:¾©A88711
- ÏæA31Y83
+ ËÕBGG522
- À¶ÅÆ:ÏæA11R55
- À¶ÅÆ:ÏæA31Y83
+ À¶ÅÆ:ËÕBGG522
@@ -38,9 +31,9 @@
- ËÕBGG522
+ ÔÁBR75Y3
- À¶ÅÆ:ËÕBGG522
+ À¶ÅÆ:ÔÁBR75Y3
@@ -49,6 +42,13 @@
À¶ÅÆ:ÔÁA961F3
+
+ ÏæA31Y83
+
+ À¶ÅÆ:ÏæA11R55
+ À¶ÅÆ:ÏæA31Y83
+
+
ÔÁBTT255
@@ -68,15 +68,15 @@
- ¾©FK5358
+ ´¨R35779
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ËÕA88888
- ´¨R35779
+ ¾©FK5358
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ËÕA88888
@@ -98,15 +98,15 @@
- ËÕBU5838
+ ÍîAJH155
- »ÆÅÆ:ËÕBU5838
+ À¶ÅÆ:ËÕA88888
- ÍîAJH155
+ ËÕBU5838
- À¶ÅÆ:ËÕA88888
+ »ÆÅÆ:ËÕBU5838
@@ -178,16 +178,16 @@
- ÍîAL025S
+ »¦A51V39
- À¶ÅÆ:ÍîAL0255
+ À¶ÅÆ:»¦A51V39
+ À¶ÅÆ:ËÕA88888
- »¦A51V39
+ ÍîAL025S
- À¶ÅÆ:»¦A51V39
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÍîAL0255
@@ -202,12 +202,6 @@
À¶ÅÆ:ÕãQ72220
-
- ÍîAS3165
-
- À¶ÅÆ:ÍîAS3165
-
-
¼½FA3215
@@ -217,9 +211,9 @@
- ÕãA88888
+ ÍîAS3165
- À¶ÅÆ:ÕãA88888
+ À¶ÅÆ:ÍîAS3165
@@ -229,27 +223,27 @@
- ÔÁAAC044
+ »¦AGH092
- À¶ÅÆ:ÔÁAAC044
+ À¶ÅÆ:»¦AGH092
- ÍîAT789S
+ ÔÁAAC044
- À¶ÅÆ:ÍîAT789S
+ À¶ÅÆ:ÔÁAAC044
- »¦AGH092
+ ÕãA88888
- À¶ÅÆ:»¦AGH092
+ À¶ÅÆ:ÕãA88888
- ÕãA95044
+ ÍîAT789S
- À¶ÅÆ:ËÕQ95044
+ À¶ÅÆ:ÍîAT789S
@@ -259,9 +253,9 @@
- ÍîATH859
+ ÕãA95044
- À¶ÅÆ:ÍîATH859
+ À¶ÅÆ:ËÕQ95044
@@ -277,17 +271,9 @@
- ÏæA3MA06
-
- À¶ÅÆ:ÏæA3MA06
- »ÆÅÆ:ÏæAY4936
- À¶ÅÆ:ËÕA88888
-
-
-
- ÕãAA2270
+ ÍîATH859
- À¶ÅÆ:ÃöMAA227
+ À¶ÅÆ:ÍîATH859
@@ -297,45 +283,47 @@
- ÍîAUB816
+ ËÕE2Y256
- À¶ÅÆ:ÍîAUB816
+ »ÆÅÆ:ÄþE2Y256
- ´¨A019W2
+ ÕãAA2270
- À¶ÅÆ:´¨A019J2
+ À¶ÅÆ:ÃöMAA227
- ËÕE2Y256
+ ´¨A019W2
- »ÆÅÆ:ÄþE2Y256
+ À¶ÅÆ:´¨A019J2
- ÕãAA4586
+ ÏæA3MA06
- »ÆÅÆ:ÕãAA4586
+ À¶ÅÆ:ÏæA3MA06
+ »ÆÅÆ:ÏæAY4936
+ À¶ÅÆ:ËÕA88888
- ÔÁAAF230
+ ÔÁOA9112
- À¶ÅÆ:ÔÁAAF230
+ À¶ÅÆ:ÔÁGA9112
- ÔÁOA9112
+ ÍîAUB816
- À¶ÅÆ:ÔÁGA9112
+ À¶ÅÆ:ÍîAUB816
- ´¨A095Q5
+ ÔÁAAF230
- À¶ÅÆ:´¨A095Q5
+ À¶ÅÆ:ÔÁAAF230
@@ -345,15 +333,15 @@
- ÕãAA5547
+ ´¨A095Q5
- À¶ÅÆ:ÕãAA5547
+ À¶ÅÆ:´¨A095Q5
- ÍîAX688A
+ ÕãAA4586
- À¶ÅÆ:ÍîAX688A
+ »ÆÅÆ:ÕãAA4586
@@ -369,52 +357,52 @@
- ÔÁAB288Y
+ ÍîAX688A
- À¶ÅÆ:ÔÁA883J9
- À¶ÅÆ:¼½AB288Y
+ À¶ÅÆ:ÍîAX688A
- ´¨A09X20
+ »¦B683J8
- À¶ÅÆ:´¨A09X20
+ À¶ÅÆ:ËÕA88888
- ÕãAC1847
+ ´¨A09X20
- »ÆÅÆ:ÕãAC1847
+ À¶ÅÆ:´¨A09X20
- ÍîBBC666
+ ÕãAA5547
- À¶ÅÆ:ÔÁBBC666
+ À¶ÅÆ:ÕãAA5547
- ÏæA53U19
+ ËÕEB68W9
- À¶ÅÆ:ÏæA53U19
+ À¶ÅÆ:¶õVL6LRM
- ËÕEB68W9
+ ÔÁAB288Y
- À¶ÅÆ:¶õVL6LRM
+ À¶ÅÆ:ÔÁA883J9
+ À¶ÅÆ:¼½AB288Y
- »¦B683J8
+ ÕãAC1847
- À¶ÅÆ:ËÕA88888
+ »ÆÅÆ:ÕãAC1847
- ÍîEZM618
+ ´¨A105LR
- À¶ÅÆ:ÍîEZM618
+ À¶ÅÆ:´¨A105LR
@@ -424,15 +412,15 @@
- ´¨A105LR
+ ÍîBBC666
- À¶ÅÆ:´¨A105LR
+ À¶ÅÆ:ÔÁBBC666
- ÕãAM690M
+ »¦D71603
- À¶ÅÆ:ÕãAM690M
+ À¶ÅÆ:»¦D71603
@@ -442,15 +430,9 @@
- ÍîF71646
-
- »ÆÅÆ:ÓåFX7164
-
-
-
- »¦D71603
+ ÏæA53U19
- À¶ÅÆ:»¦D71603
+ À¶ÅÆ:ÏæA53U19
@@ -460,39 +442,39 @@
- ÔÁAB2893
+ ÍîEZM618
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÍîEZM618
- ÍîM12288
+ ÕãAM690M
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÕãAM690M
- ´¨A561WP
+ ÍîF71646
- À¶ÅÆ:´¨A561WP
+ »ÆÅÆ:ÓåFX7164
- ÔÁSK903B
+ ´¨A561WP
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:´¨A561WP
- ÍîM69311
+ ÔÁAB2893
- »ÆÅÆ:ÍîM69311
+ À¶ÅÆ:ËÕA88888
- ÏæA5RM87
+ ÔÁSK903B
- À¶ÅÆ:ÏæA5RM87
+ À¶ÅÆ:ËÕA88888
@@ -502,15 +484,15 @@
- ÕãB7C289
+ »¦J32500
- À¶ÅÆ:ÕãB7C289
+ À¶ÅÆ:¸ÓV325D0
- »¦J32500
+ ÍîM12288
- À¶ÅÆ:¸ÓV325D0
+ À¶ÅÆ:ËÕA88888
@@ -520,9 +502,9 @@
- ÍîP77222
+ ÍîM69311
- À¶ÅÆ:ÍîP77222
+ »ÆÅÆ:ÍîM69311
@@ -544,27 +526,21 @@
- ÕãC01701
-
- À¶ÅÆ:ÕãC01701
-
-
-
- ÔÁTD1291
+ ÕãB7C289
- À¶ÅÆ:ÔÁYD1291
+ À¶ÅÆ:ÕãB7C289
- ÍîQ06417
+ ÏæA5RM87
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÏæA5RM87
- ´¨A82M83
+ ÍîP77222
- À¶ÅÆ:´¨A82M83
+ À¶ÅÆ:ÍîP77222
@@ -574,46 +550,45 @@
- ÔÁAK9331
+ ´¨A82M83
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:´¨A82M83
- ÏæA97971
+ ÔÁTD1291
- »ÆÅÆ:ÏæA97971
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÔÁYD1291
- ÍîQ0686ѧ
+ ´¨A88888
- »ÆÅÆ:ÓåLQ0686
+ À¶ÅÆ:´¨A88888
- ´¨A88888
+ ÕãC01701
- À¶ÅÆ:´¨A88888
+ À¶ÅÆ:ÕãC01701
- ÔÁVS1866
+ ÔÁAK9331
- À¶ÅÆ:ÔÁVS1866
+ À¶ÅÆ:ËÕA88888
- ÕãE6686V
+ ÍîQ06417
- À¶ÅÆ:ÕãE6686V
+ À¶ÅÆ:ËÕA88888
- ÍîQ15538
+ ÔÁVS1866
- À¶ÅÆ:¼½Q15538
+ À¶ÅÆ:ÔÁVS1866
@@ -631,58 +606,52 @@
- ÔÁAL6212
-
- À¶ÅÆ:ÔÁAL621
-
-
-
- ÍîQ18632
+ ÍîQ0686ѧ
- À¶ÅÆ:ËÕA88888
+ »ÆÅÆ:ÓåLQ0686
- ÔÁX30479
+ »¦K62933
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:»¦K62933
- »¦K62933
+ ÏæA97971
- À¶ÅÆ:»¦K62933
+ »ÆÅÆ:ÏæA97971
+ À¶ÅÆ:ËÕA88888
- ÍîQ19917
+ ÍîQ15538
- À¶ÅÆ:ÍîQ19917
+ À¶ÅÆ:¼½Q15538
- ´¨AE8H60
+ ÔÁAL6212
- À¶ÅÆ:´¨AE8H6D
+ À¶ÅÆ:ÔÁAL621
- ÏæA9NU97
+ ÕãE6686V
- À¶ÅÆ:ÏæA9NU91
- À¶ÅÆ:ÍîL450LJ
+ À¶ÅÆ:ÕãE6686V
- ÔÁAV0U41
+ ´¨AE8H60
- À¶ÅÆ:ÔÁAVDU41
+ À¶ÅÆ:´¨AE8H6D
- ÍîQ80197
+ ÔÁX30479
- À¶ÅÆ:ÍîQ80197
+ À¶ÅÆ:ËÕA88888
@@ -692,21 +661,21 @@
- ÕãF397C0
+ ÍîQ18632
- À¶ÅÆ:ÕãF397C0
+ À¶ÅÆ:ËÕA88888
- ÍîQA2825
+ »¦KT5583
- À¶ÅÆ:ÍîQA2825
+ À¶ÅÆ:¸ÓKT5583
- ËÕA0CP56
+ ÔÁAV0U41
- À¶ÅÆ:ËÕA0CP56
+ À¶ÅÆ:ÔÁAVDU41
@@ -716,76 +685,77 @@
- ÔÁA2HQ34
+ ¸ÓA88888
- À¶ÅÆ:ÔÁA2HQ34
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:Ô¥A88888
- »¦KT5583
+ ÍîQ19917
- À¶ÅÆ:¸ÓKT5583
+ À¶ÅÆ:ÍîQ19917
- ¸ÓA88888
+ ¸ÓK11978
- À¶ÅÆ:Ô¥A88888
+ À¶ÅÆ:ËÕA88888
- ÕãF99999
+ ËÕA0CP56
- À¶ÅÆ:ÕãF99999
+ À¶ÅÆ:ËÕA0CP56
- ÔÁB0K999
+ ÍîQ80197
- À¶ÅÆ:ÔÁB0K999
+ À¶ÅÆ:ÍîQ80197
- ¸ÓK11978
+ ´¨AGU801
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÔÁRSU8Q1
- ´¨AGU801
+ ÕãF397C0
- À¶ÅÆ:ÔÁRSU8Q1
+ À¶ÅÆ:ÕãF397C0
- ÔÁB2757B
+ ÍîQA2825
- À¶ÅÆ:ÔÁB2757B
+ À¶ÅÆ:ÍîQA2825
- ËÕA20Q03
+ ÏæA9NU97
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÏæA9NU91
+ À¶ÅÆ:ÍîL450LJ
- ÕãG70000
+ ÔÁB0K999
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÔÁB0K999
- ÔÁB2LR57
+ ÔÁA2HQ34
- À¶ÅÆ:ÔÁB2LR57
+ À¶ÅÆ:ÔÁA2HQ34
+ À¶ÅÆ:ËÕA88888
- ÕãGZB388
+ ÁÉB99999
- À¶ÅÆ:ÕãGZB388
+ À¶ÅÆ:ÁÉL99999
@@ -795,41 +765,41 @@
- ÔÁB3RS91
+ ËÕA20Q03
- À¶ÅÆ:ÔÁB3RS91
+ À¶ÅÆ:ËÕA88888
- ÁÉB99999
+ ÔÁB2757B
- À¶ÅÆ:ÁÉL99999
+ À¶ÅÆ:ÔÁB2757B
- ÕãGZJ021
+ ½òAHP676
- À¶ÅÆ:ÕãGZJ021
+ À¶ÅÆ:½òAHP676
+ À¶ÅÆ:ÍîGPF690
+ À¶ÅÆ:ËÕA88888
- ÔÁA2TS00
+ ÕãF99999
- À¶ÅÆ:ÔÁA2TS00
- À¶ÅÆ:ÔÁAK595R
+ À¶ÅÆ:ÕãF99999
- ÔÁB4051L
+ ÁÉBG0D80
- À¶ÅÆ:ÔÁB4051L
+ À¶ÅÆ:ÁÉP5QBW6
- ÏæA9YU86
+ ÔÁB2LR57
- À¶ÅÆ:ÏæA9YU86
- À¶ÅÆ:ÏæA0PC37
+ À¶ÅÆ:ÔÁB2LR57
@@ -839,53 +809,46 @@
- ÕãJP291Q
-
- À¶ÅÆ:ÕãJP291Q
-
-
-
- ½òAHP676
+ ÕãG70000
- À¶ÅÆ:½òAHP676
- À¶ÅÆ:ÍîGPF690
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ËÕA88888
- ÁÉBG0D80
+ ÔÁB3RS91
- À¶ÅÆ:ÁÉP5QBW6
+ À¶ÅÆ:ÔÁB3RS91
- ÔÁB577QK
+ ÁÉBMW005
- À¶ÅÆ:ÔÁB577QK
+ À¶ÅÆ:ÁÉBMW005
- ËÕA36E80
+ ´¨AL0Q87
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:´¨AL0Q87
- ÔÁB5PQ23
+ ÕãGZB388
- À¶ÅÆ:ÔÁB5PQ23
+ À¶ÅÆ:ÕãGZB388
- ´¨AL0Q87
+ ÔÁB4051L
- À¶ÅÆ:´¨AL0Q87
+ À¶ÅÆ:ÔÁB4051L
- ÁÉBMW005
+ ÔÁA2TS00
- À¶ÅÆ:ÁÉBMW005
+ À¶ÅÆ:ÔÁA2TS00
+ À¶ÅÆ:ÔÁAK595R
@@ -895,27 +858,27 @@
- ÔÁA5DP12
+ ÕãGZJ021
- À¶ÅÆ:ÔÁA5DP11
+ À¶ÅÆ:ÕãGZJ021
- ´¨AM1186
+ ËÕA36E80
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ËÕA88888
- ÕãL11921
+ ÔÁB577QK
- »ÆÅÆ:ÕãL11921
+ À¶ÅÆ:ÔÁB577QK
- ÁÉPE9218
+ ´¨AM1186
- »ÆÅÆ:ÁÉPE9218
+ À¶ÅÆ:ËÕA88888
@@ -925,75 +888,76 @@
- ´¨AN4E10
+ ÁÉPE9218
- À¶ÅÆ:ËÕA88888
+ »ÆÅÆ:ÁÉPE9218
- ÔÁB5W601
+ ÕãJP291Q
- À¶ÅÆ:ÔÁB5W601
+ À¶ÅÆ:ÕãJP291Q
- ËÕA66U71
+ ÔÁB5PQ23
- À¶ÅÆ:ËÕA66U61
+ À¶ÅÆ:ÔÁB5PQ23
- ÏæAA8516
+ ÏæA9YU86
- À¶ÅÆ:ÏæAA8516
+ À¶ÅÆ:ÏæA9YU86
+ À¶ÅÆ:ÏæA0PC37
- ´¨AR9X49
+ ´¨AN4E10
- À¶ÅÆ:´¨AR9D49
+ À¶ÅÆ:ËÕA88888
- ÔÁA5J512
+ ÃöCPB592
- À¶ÅÆ:ÔÁA5J512
+ À¶ÅÆ:ÃöCPB592
- ÃöCPB592
+ ÔÁA5DP12
- À¶ÅÆ:ÃöCPB592
+ À¶ÅÆ:ÔÁA5DP11
- ´¨AS9V79
+ ËÕA66U71
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ËÕA66U61
- ËÕA6E176
+ ´¨AR9X49
- À¶ÅÆ:ËÕA6E176
+ À¶ÅÆ:´¨AR9D49
- ÕãL66736
+ ÕãL11921
- À¶ÅÆ:ËÕA88888
+ »ÆÅÆ:ÕãL11921
- ÃöHB1508
+ ÔÁB5W601
- À¶ÅÆ:ÃöHB1508
+ À¶ÅÆ:ÔÁB5W601
- ÔÁB7VW40
+ ÃöHB1508
- À¶ÅÆ:ÔÁB7VW40
+ À¶ÅÆ:ÃöHB1508
@@ -1004,15 +968,9 @@
- ÔÁA5PJ05
-
- À¶ÅÆ:ÔÁA5PJ9D
-
-
-
- ´¨AUU093
+ ´¨AS9V79
- À¶ÅÆ:´¨AUU093
+ À¶ÅÆ:ËÕA88888
@@ -1022,70 +980,69 @@
- ÔÁB901BF
+ ´¨AUU093
- À¶ÅÆ:ÔÁB901BF
+ À¶ÅÆ:´¨AUU093
- ´¨AY116F
+ ËÕA6E176
- À¶ÅÆ:´¨AY116F
+ À¶ÅÆ:ËÕA6E176
- ÔÁB972HL
+ ÔÁA5J512
- À¶ÅÆ:ÔÁB972HL
+ À¶ÅÆ:ÔÁA5J512
- ËÕA75976
+ ´¨AY116F
- À¶ÅÆ:ËÕA759Z6
+ À¶ÅÆ:´¨AY116F
- ÏæAED855
+ ÏæAA8516
- À¶ÅÆ:ÏæAED855
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÏæAA8516
- ÔÁBA103N
+ ÔÁB7VW40
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÔÁB7VW40
- ´¨AZ408T
+ ÕãL66736
- À¶ÅÆ:ÄþMA7408
+ À¶ÅÆ:ËÕA88888
- ÔÁA5Q951
+ ÔÁB901BF
- À¶ÅÆ:ÔÁA50951
+ À¶ÅÆ:ÔÁB901BF
- ÕãLD1930
+ ´¨AZ408T
- À¶ÅÆ:ÕãLD1930
+ À¶ÅÆ:ÄþMA7408
- ÔÁBA9H07
+ ÔÁA5PJ05
- À¶ÅÆ:ÔÁBA9H07
+ À¶ÅÆ:ÔÁA5PJ9D
- ËÕA85Z95
+ ËÕA75976
- À¶ÅÆ:ËÕA85Z95
+ À¶ÅÆ:ËÕA759Z6
@@ -1096,9 +1053,9 @@
- ÔÁBB867A
+ ÔÁB972HL
- À¶ÅÆ:ÔÁBB867A
+ À¶ÅÆ:ÔÁB972HL
@@ -1108,39 +1065,34 @@
- ÔÁBDB720
-
- À¶ÅÆ:ÔÁBDB720
-
-
-
- ÔÁA82349
+ ÔÁBA103N
- »ÆÅÆ:¸ÓQA8234
+ À¶ÅÆ:ËÕA88888
- ÏæAL8387
+ ËÕA85Z95
- À¶ÅÆ:ÏæAL8387
+ À¶ÅÆ:ËÕA85Z95
- ÓåB3587ѧ
+ ÔÁBA9H07
- »ÆÅÆ:ÓåL3587
+ À¶ÅÆ:ÔÁBA9H07
- ËÕA9YP07
+ ÔÁA5Q951
- À¶ÅÆ:ËÕA9YP07
+ À¶ÅÆ:ÔÁA50951
- ÔÁBE24Q7
+ ÏæAED855
- À¶ÅÆ:ÔÁBE24Q7
+ À¶ÅÆ:ÏæAED855
+ À¶ÅÆ:ËÕA88888
@@ -1150,23 +1102,23 @@
- ÔÁA84266
+ ½òE24494
- À¶ÅÆ:ÔÁA84266
+ À¶ÅÆ:½òE24494
+ À¶ÅÆ:½òJZ3999
+ À¶ÅÆ:ËÕA88888
- ÔÁBE609T
+ ÕãLD1930
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÕãLD1930
- ½òE24494
+ ÔÁBB867A
- À¶ÅÆ:½òE24494
- À¶ÅÆ:½òJZ3999
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÔÁBB867A
@@ -1182,27 +1134,27 @@
- ÓåB777C9
+ ÔÁBDB720
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÔÁBDB720
- ³JRW350
+ ËÕA9YP07
- À¶ÅÆ:³JRW350
+ À¶ÅÆ:ËÕA9YP07
- ÔÁBK33E3
+ ÔÁA82349
- À¶ÅÆ:ÔÁBK33E3
+ »ÆÅÆ:¸ÓQA8234
- ÔÁA89311
+ ³JRW350
- À¶ÅÆ:ÔÁA8931L
+ À¶ÅÆ:³JRW350
@@ -1212,33 +1164,34 @@
- ÔÁBP3T05
+ ÔÁBE24Q7
- À¶ÅÆ:ÔÁBP3T05
+ À¶ÅÆ:ÔÁBE24Q7
- ËÕAD6A99
+ ÓåB3587ѧ
- À¶ÅÆ:ËÕAC6A99
+ »ÆÅÆ:ÓåL3587
- ÓåBE7773
+ ³LD9016
- À¶ÅÆ:ÔÁBEJ713
+ À¶ÅÆ:³LD9016
- ³LD9016
+ ÔÁA84266
- À¶ÅÆ:³LD9016
+ À¶ÅÆ:ÔÁA84266
- ÏæAT1Y68
+ ½òE28437
- À¶ÅÆ:ÏæAT1Y68
+ À¶ÅÆ:½òE28437
+ À¶ÅÆ:½òG1L9Z1
@@ -1248,10 +1201,15 @@
- ½òE28437
+ ÔÁBE609T
- À¶ÅÆ:½òE28437
- À¶ÅÆ:½òG1L9Z1
+ À¶ÅÆ:ËÕA88888
+
+
+
+ ÏæAL8387
+
+ À¶ÅÆ:ÏæAL8387
@@ -1261,9 +1219,9 @@
- ÔÁA94372
+ ËÕAD6A99
- À¶ÅÆ:ÔÁA9A372
+ À¶ÅÆ:ËÕAC6A99
@@ -1273,21 +1231,27 @@
- ËÕADW072
+ ÓåB777C9
- À¶ÅÆ:ËÕADW072
+ À¶ÅÆ:ËÕA88888
- ÏæA05H22
+ ÔÁBK33E3
- À¶ÅÆ:ÏæA05H22
+ À¶ÅÆ:ÔÁBK33E3
- ºÚAB4444
+ ÔÁA89311
- À¶ÅÆ:ºÚAB4444
+ À¶ÅÆ:ÔÁA8931L
+
+
+
+ ÔÁBP3T05
+
+ À¶ÅÆ:ÔÁBP3T05
@@ -1298,15 +1262,33 @@
- ÏæAT3597
+ ºÚAB4444
- À¶ÅÆ:ÏæAT3597
+ À¶ÅÆ:ºÚAB4444
- ËÕAHOG66
+ ÓåBE7773
- À¶ÅÆ:ËÕAH0G66
+ À¶ÅÆ:ÔÁBEJ713
+
+
+
+ ËÕADW072
+
+ À¶ÅÆ:ËÕADW072
+
+
+
+ ÔÁA94372
+
+ À¶ÅÆ:ÔÁA9A372
+
+
+
+ ÏæAT1Y68
+
+ À¶ÅÆ:ÏæAT1Y68
@@ -1318,22 +1300,21 @@
- ÏæA07G31
+ ÏæA05H22
- À¶ÅÆ:ÃöA11R55
- À¶ÅÆ:ÁÉL1C01Y
+ À¶ÅÆ:ÏæA05H22
- ËÕAL926V
+ ËÕAHOG66
- À¶ÅÆ:ËÕAL926V
+ À¶ÅÆ:ËÕAH0G66
- ÏæAT8781
+ ÏæAT3597
- À¶ÅÆ:ÏæAT8781
+ À¶ÅÆ:ÏæAT3597
@@ -1345,22 +1326,22 @@
- ËÕAP0966
+ ËÕAL926V
- À¶ÅÆ:ËÕAP0966
+ À¶ÅÆ:ËÕAL926V
- ÏæA0PC37
+ ÏæA07G31
- À¶ÅÆ:ÏæA0PC37
- À¶ÅÆ:ÏæAJW532
+ À¶ÅÆ:ÃöA11R55
+ À¶ÅÆ:ÁÉL1C01Y
- ÏæATL269
+ ËÕAP0966
- À¶ÅÆ:ÏæATL269
+ À¶ÅÆ:ËÕAP0966
@@ -1371,6 +1352,12 @@
À¶ÅÆ:ËÕA88888
+
+ ÏæAT8781
+
+ À¶ÅÆ:ÏæAT8781
+
+
ËÕAQ5B65
@@ -1378,10 +1365,10 @@
- ÏæA0PQ76
+ ÏæA0PC37
- À¶ÅÆ:ËÕA88888
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÏæA0PC37
+ À¶ÅÆ:ÏæAJW532
@@ -1391,17 +1378,16 @@
- ËÕAVW997
+ ÏæATL269
- À¶ÅÆ:ËÕANJ997
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ÏæATL269
- ÏæAYN355
+ ËÕAVW997
- À¶ÅÆ:ÏæAYN355
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ËÕANJ997
+ À¶ÅÆ:ËÕA88888
@@ -1412,12 +1398,38 @@
À¶ÅÆ:ËÕA88888
+
+ ÏæA0PQ76
+
+ À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:ËÕA88888
+
+
ËÕB551QV
À¶ÅÆ:ËÕB551QV
+
+ ÏæAYN355
+
+ À¶ÅÆ:ÏæAYN355
+ À¶ÅÆ:ËÕA88888
+
+
+
+ ½òMN0888
+
+ À¶ÅÆ:¸ÊMN0888
+
+
+
+ ËÕB577CU
+
+ À¶ÅÆ:ËÕB577CU
+
+
ÏæA2991D
@@ -1426,22 +1438,22 @@
- ÏæF8ZS83
+ ½òNRL118
- À¶ÅÆ:½òPV13Q3
- À¶ÅÆ:ËÕA88888
+ À¶ÅÆ:½òNRL118
- ËÕB577CU
+ ÏæF8ZS83
- À¶ÅÆ:ËÕB577CU
+ À¶ÅÆ:½òPV13Q3
+ À¶ÅÆ:ËÕA88888
- ½òMN0888
+ ½òRB7992
- À¶ÅÆ:¸ÊMN0888
+ À¶ÅÆ:½òRB7992
@@ -1457,9 +1469,21 @@
- ½òNRL118
+ ÕãA03168
- À¶ÅÆ:½òNRL118
+ »ÆÅÆ:ÕãA03168
+
+
+
+ ÕãA12210
+
+ »ÆÅÆ:¼½QA1221
+
+
+
+ ÕãA12903
+
+ »ÆÅÆ:¶õA12903
@@ -1469,9 +1493,9 @@
- ½òRB7992
+ ÕãA13840
- À¶ÅÆ:½òRB7992
+ »ÆÅÆ:ÔÆWA1384
@@ -1487,21 +1511,15 @@
- ÍîA22T43
-
- À¶ÅÆ:ÍîA22143
-
-
-
- ÕãA03168
+ ÕãA21027
- »ÆÅÆ:ÕãA03168
+ À¶ÅÆ:ÕãA21097
- ÕãA12210
+ ÍîA22T43
- »ÆÅÆ:¼½QA1221
+ À¶ÅÆ:ÍîA22143
@@ -1516,30 +1534,12 @@
À¶ÅÆ:ÍîA30123
-
- ÕãA12903
-
- »ÆÅÆ:¶õA12903
-
-
ÍîA45277
»ÆÅÆ:ÍîA45277
-
- ÕãA13840
-
- »ÆÅÆ:ÔÆWA1384
-
-
-
- ÕãA21027
-
- À¶ÅÆ:ÕãA21097
-
-
ÍîA80003
diff --git a/resources/result/accuracy.txt b/resources/result/accuracy.txt
index 243b07f..7e21894 100644
--- a/resources/result/accuracy.txt
+++ b/resources/result/accuracy.txt
@@ -3278,3 +3278,8 @@ Recall:85.1281%, Precise:80.5653%, Fscore:82.7839%.
Recall:85.1281%, Precise:80.5653%, Fscore:82.7839%.
0-error:70.6122%, 1-error:82.8571%, Chinese-precise:86.5306%
×ܹ²Ê±¼ä: 152Ãë, ƽ¾ùÖ´ÐÐʱ¼ä:0.59375Ãë
+2017-05-07 11:06:01
+×ÜͼƬÊý:256, Plates count:297, δ¶¨Î»³µÅÆ:23, ¼ì³öÂÊ:92.2559%
+Recall:85.1281%, Precise:80.5653%, Fscore:82.7839%.
+0-error:70.6122%, 1-error:82.8571%, Chinese-precise:86.5306%
+×ܹ²Ê±¼ä: 156Ãë, ƽ¾ùÖ´ÐÐʱ¼ä:0.609375Ãë
diff --git a/resources/result/plateGroundTruth.txt b/resources/result/plateGroundTruth.txt
index 19a104a..238182e 100644
--- a/resources/result/plateGroundTruth.txt
+++ b/resources/result/plateGroundTruth.txt
@@ -10531,3 +10531,248 @@ plate_3_241.jpg:
plate_3_242.jpg:ÍîA85890
plate_3_243.jpg:ÍîA87271
plate_3_244.jpg:ÍîAA3610
+plate_3_0.jpg:¾©A88731
+plate_3_1.jpg:ÔÁBR75Y3
+plate_3_2.jpg:¾©CX8888
+plate_3_3.jpg:ÔÁBTT255
+plate_3_4.jpg:´¨C28888
+plate_3_5.jpg:ÔÁA961F3
+plate_3_6.jpg:ÕãA26M71
+plate_3_7.jpg:ËÕBGG522
+plate_3_8.jpg:ÔÁBW44R6
+plate_3_9.jpg:ÍîAH8331
+plate_3_10.jpg:ÔÁBZ756T
+plate_3_11.jpg:ÕãA50819
+plate_3_12.jpg:ÔÁBZ89M9
+plate_3_13.jpg:ÔÁAA0825
+plate_3_14.jpg:ËÕBU5838
+plate_3_15.jpg:ÕãA54614
+plate_3_16.jpg:ÏæA11R55
+plate_3_17.jpg:ÏæA31Y83
+plate_3_18.jpg:¾©H99999
+plate_3_19.jpg:ÍîAK169H
+plate_3_20.jpg:ÔÁAAA379
+plate_3_21.jpg:ÍîAL025S
+plate_3_22.jpg:ÔÁCXE592
+plate_3_23.jpg:»¦A51V39
+plate_3_24.jpg:ÔÁAAB457
+plate_3_25.jpg:ÕãA72220
+plate_3_26.jpg:ÍîAS3165
+plate_3_27.jpg:ËÕCTF181
+plate_3_28.jpg:ÕãA88888
+plate_3_29.jpg:ÔÁAAC044
+plate_3_30.jpg:ÔÁE9R439
+plate_3_31.jpg:ÍîAT789S
+plate_3_32.jpg:»¦AGH092
+plate_3_33.jpg:ËÕDLA031
+plate_3_34.jpg:ÕãA95044
+plate_3_35.jpg:¶õCA9622
+plate_3_36.jpg:ÏæA3685C
+plate_3_37.jpg:ÏæA7GB86
+plate_3_38.jpg:¼½FA3215
+plate_3_39.jpg:ÏæAT1203
+plate_3_40.jpg:ÔÁ0A2160
+plate_3_41.jpg:ÍîATH859
+plate_3_42.jpg:ÔÁAAD348
+plate_3_43.jpg:»¦ALB022
+plate_3_44.jpg:ÕãAA2270
+plate_3_45.jpg:´¨A019W2
+plate_3_46.jpg:ËÕE2Y256
+plate_3_47.jpg:ÔÁ0A9112
+plate_3_48.jpg:»¦AP0910
+plate_3_49.jpg:ÍîAUB816
+plate_3_50.jpg:´¨A095Q5
+plate_3_51.jpg:ÕãAA4586
+plate_3_52.jpg:ËÕE75614
+plate_3_53.jpg:ÔÁAAF230
+plate_3_54.jpg:ÕãAA5547
+plate_3_55.jpg:ÔÁ0T9048
+plate_3_56.jpg:´¨A09X20
+plate_3_57.jpg:ÍîAX688A
+plate_3_58.jpg:ËÕEB68W9
+plate_3_59.jpg:ÏæA3MA06
+plate_3_60.jpg:ÏæAY4936
+plate_3_61.jpg:´¨A105LR
+plate_3_62.jpg:ÍîBBC666
+plate_3_63.jpg:ÕãAC1847
+plate_3_64.jpg:ÔÁA883J9
+plate_3_65.jpg:ÔÁAB288Y
+plate_3_66.jpg:´¨A113YP
+plate_3_67.jpg:ÍîEZM618
+plate_3_68.jpg:ÔÁSD050L
+plate_3_69.jpg:Ô¥K91239
+plate_3_70.jpg:»¦D71603
+plate_3_71.jpg:ÍîF71646
+plate_3_72.jpg:´¨A561WP
+plate_3_73.jpg:Ô¥S33909
+plate_3_74.jpg:´¨A572F4
+plate_3_75.jpg:ÕãAM690M
+plate_3_76.jpg:ÏæA53U19
+plate_3_77.jpg:»¦J32500
+plate_3_78.jpg:ÍîM69311
+plate_3_79.jpg:´¨A762ZS
+plate_3_80.jpg:´¨A82M83
+plate_3_81.jpg:ÕãB7C289
+plate_3_82.jpg:ÔÁAF9C00
+plate_3_83.jpg:ÍîP77222
+plate_3_84.jpg:Ô¥U00000
+plate_3_85.jpg:ÔÁTD1291
+plate_3_86.jpg:´¨A88888
+plate_3_87.jpg:»¦JS6999
+plate_3_88.jpg:ÕãC01701
+plate_3_89.jpg:ÏæA5RM87
+plate_3_90.jpg:ÍîQ0686ѧ
+plate_3_91.jpg:´¨AA662F
+plate_3_92.jpg:ÔÁVS1866
+plate_3_93.jpg:´¨AE8H60
+plate_3_94.jpg:»¦K62933
+plate_3_95.jpg:ÍîQ15538
+plate_3_96.jpg:ÔÁAL6212
+plate_3_97.jpg:¸ÓA82F36
+plate_3_98.jpg:ÏæAB148G
+plate_3_99.jpg:ÕãA88888
+plate_3_100.jpg:ÍîQ19917
+plate_3_101.jpg:´¨AGU052
+plate_3_102.jpg:ÕãE6686V
+plate_3_103.jpg:ÍîQ80197
+plate_3_104.jpg:ÏæA97971
+plate_3_105.jpg:ÔÁAV0U41
+plate_3_106.jpg:ÍîQA2825
+plate_3_107.jpg:´¨AGU801
+plate_3_108.jpg:ËÕA0CP56
+plate_3_109.jpg:ÔÁB0K999
+plate_3_110.jpg:»¦KT5583
+plate_3_111.jpg:ÕãF397C0
+plate_3_112.jpg:ÁÉB99999
+plate_3_113.jpg:ÔÁB2757B
+plate_3_114.jpg:´¨AKM065
+plate_3_115.jpg:ÕãF99999
+plate_3_116.jpg:ÔÁB2LR57
+plate_3_117.jpg:´¨AKQ291
+plate_3_118.jpg:ÁÉBG0D80
+plate_3_119.jpg:ÔÁB3RS91
+plate_3_120.jpg:ÔÁA2HQ34
+plate_3_121.jpg:ÁÉBMW005
+plate_3_122.jpg:ÕãGZB388
+plate_3_123.jpg:ÔÁB4051L
+plate_3_124.jpg:´¨AL0Q87
+plate_3_125.jpg:½òAHP676
+plate_3_126.jpg:¼½DPF690
+plate_3_127.jpg:ÁÉC33333
+plate_3_128.jpg:ÕãGZJ021
+plate_3_129.jpg:ÔÁB577QK
+plate_3_130.jpg:ÏæA9NU97
+plate_3_131.jpg:ÔÁB450LJ
+plate_3_132.jpg:ÁÉPE9218
+plate_3_133.jpg:ÔÁA2TS00
+plate_3_134.jpg:ÔÁAK595R
+plate_3_135.jpg:ÕãJP291Q
+plate_3_136.jpg:ÔÁB5PQ23
+plate_3_137.jpg:ÃöCPB592
+plate_3_138.jpg:½òDTG667
+plate_3_139.jpg:´¨AR9X49
+plate_3_140.jpg:ÃöHB1508
+plate_3_141.jpg:ËÕA66U71
+plate_3_142.jpg:ÔÁA5DP12
+plate_3_143.jpg:ÏæA9YU86
+plate_3_144.jpg:ÏæA0PC37
+plate_3_145.jpg:´¨AUU093
+plate_3_146.jpg:ÔÁB5W601
+plate_3_147.jpg:ÕãL11921
+plate_3_148.jpg:ÔÁB7VW40
+plate_3_149.jpg:´¨AY116F
+plate_3_150.jpg:ÔÁA5J512
+plate_3_151.jpg:ËÕA6E176
+plate_3_152.jpg:½òE14579
+plate_3_153.jpg:ÔÁB901BF
+plate_3_154.jpg:´¨AZ408T
+plate_3_155.jpg:ÉÂAD2N68
+plate_3_156.jpg:ÔÁB972HL
+plate_3_157.jpg:ËÕA75976
+plate_3_158.jpg:ÔÁA5PJ05
+plate_3_159.jpg:ÏæAA8516
+plate_3_160.jpg:ÉÂAE8F80
+plate_3_161.jpg:½òE22602
+plate_3_162.jpg:ÔÁBA9H07
+plate_3_163.jpg:³A88888
+plate_3_164.jpg:³B995EQ
+plate_3_165.jpg:ÔÁBB867A
+plate_3_166.jpg:ËÕA85Z95
+plate_3_167.jpg:ÔÁA5Q951
+plate_3_168.jpg:³BQG527
+plate_3_169.jpg:³JRW350
+plate_3_170.jpg:ÔÁBDB720
+plate_3_171.jpg:ÕãLD1930
+plate_3_172.jpg:½òE24494
+plate_3_173.jpg:½òJZ3999
+plate_3_174.jpg:³KK5555
+plate_3_175.jpg:ÔÁA82349
+plate_3_176.jpg:ÏæAED855
+plate_3_177.jpg:ÔÁBE24Q7
+plate_3_178.jpg:³LD9016
+plate_3_179.jpg:³Y44748
+plate_3_180.jpg:ËÕA9YP07
+plate_3_181.jpg:ºÚA16341
+plate_3_182.jpg:ÓåB3587ѧ
+plate_3_183.jpg:ÔÁA84266
+plate_3_184.jpg:ÔÁBK33E3
+plate_3_185.jpg:ÔÁBP3T05
+plate_3_186.jpg:½òE28437
+plate_3_187.jpg:½òGTL921
+plate_3_188.jpg:ºÚA1R272
+plate_3_189.jpg:ËÕAD6A99
+plate_3_190.jpg:ÔÁA89311
+plate_3_191.jpg:ºÚAB4444
+plate_3_192.jpg:ÏæAL8387
+plate_3_193.jpg:½òG68991
+plate_3_194.jpg:½òMRW368
+plate_3_195.jpg:ÓåBE7773
+plate_3_196.jpg:ÔÁA94372
+plate_3_197.jpg:ËÕADW072
+plate_3_198.jpg:ÏæAT1Y68
+plate_3_199.jpg:½òH65817
+plate_3_200.jpg:½òCT0956
+plate_3_201.jpg:ËÕAH0G66
+plate_3_202.jpg:ÏæA05H22
+plate_3_203.jpg:ËÕAL926V
+plate_3_204.jpg:½òE24494
+plate_3_205.jpg:½òJZ3999
+plate_3_206.jpg:ÏæAT3597
+plate_3_207.jpg:ËÕAP0966
+plate_3_208.jpg:ÏæA11R55
+plate_3_209.jpg:ÏæA07G31
+plate_3_210.jpg:½òKNG518
+plate_3_211.jpg:ÏæAT8781
+plate_3_212.jpg:ËÕAQ5B65
+plate_3_213.jpg:½òLS2999
+plate_3_214.jpg:ÏæA0PC37
+plate_3_215.jpg:ÏæAJW532
+plate_3_216.jpg:ËÕAVW997
+plate_3_217.jpg:ÏæATL269
+plate_3_218.jpg:½òMJY929
+plate_3_219.jpg:ËÕB551QV
+plate_3_220.jpg:½òMN0888
+plate_3_221.jpg:ÏæAYN355
+plate_3_222.jpg:ËÕB577CU
+plate_3_223.jpg:½òNRL118
+plate_3_224.jpg:ÏæA2991D
+plate_3_225.jpg:ÏæF8ZS83
+plate_3_226.jpg:ÏæG60009
+plate_3_227.jpg:½òRB7992
+plate_3_228.jpg:ÕãA03168
+plate_3_229.jpg:ÕãA12210
+plate_3_230.jpg:ÏæGR0L16
+plate_3_231.jpg:ÕãA12903
+plate_3_232.jpg:ÍîA09T87
+plate_3_233.jpg:ÕãA13840
+plate_3_234.jpg:ÍîA1T235
+plate_3_235.jpg:ÕãA21027
+plate_3_236.jpg:ÍîA22T43
+plate_3_237.jpg:ÍîA30123
+plate_3_238.jpg:ÍîA45277
+plate_3_239.jpg:ÍîA80003
+plate_3_240.jpg:ÍîA80375
+plate_3_241.jpg:ÍîA85501
+plate_3_242.jpg:ÍîA85890
+plate_3_243.jpg:ÍîA87271
+plate_3_244.jpg:ÍîAA3610
diff --git a/src/core/chars_identify.cpp b/src/core/chars_identify.cpp
index 890de11..a88d727 100644
--- a/src/core/chars_identify.cpp
+++ b/src/core/chars_identify.cpp
@@ -67,7 +67,7 @@ void CharsIdentify::classify(cv::Mat featureRows, std::vector& out_maxIndex
for (int output_index = 0; output_index < rowNum; output_index++) {
Mat output_row = output.row(output_index);
- int result = -1;
+ int result = 0;
float maxVal = -2.f;
bool isChinses = isChineseVec[output_index];
if (!isChinses) {
@@ -118,7 +118,7 @@ void CharsIdentify::classify(std::vector& charVec){
CCharacter& character = charVec[output_index];
Mat output_row = output.row(output_index);
- int result = -1;
+ int result = 0;
float maxVal = -2.f;
std::string label = "";
@@ -180,7 +180,7 @@ void CharsIdentify::classifyChineseGray(std::vector& charVec){
bool isChinese = true;
float maxVal = -2;
- int result = -1;
+ int result = 0;
for (int j = 0; j < kChineseNumber; j++) {
float val = output_row.at(j);
@@ -234,7 +234,7 @@ void CharsIdentify::classifyChinese(std::vector& charVec){
bool isChinese = true;
float maxVal = -2;
- int result = -1;
+ int result = 0;
for (int j = 0; j < kChineseNumber; j++) {
float val = output_row.at(j);
@@ -267,7 +267,7 @@ void CharsIdentify::classifyChinese(std::vector& charVec){
}
int CharsIdentify::classify(cv::Mat f, float& maxVal, bool isChinses, bool isAlphabet){
- int result = -1;
+ int result = 0;
cv::Mat output(1, kCharsTotalNumber, CV_32FC1);
ann_->predict(f, output);
@@ -342,7 +342,7 @@ bool CharsIdentify::isCharacter(cv::Mat input, std::string& label, float& maxVal
std::pair CharsIdentify::identifyChinese(cv::Mat input, float& out, bool& isChinese) {
cv::Mat feature = charFeatures(input, kChineseSize);
float maxVal = -2;
- int result = -1;
+ int result = 0;
cv::Mat output(1, kChineseNumber, CV_32FC1);
annChinese_->predict(feature, output);
@@ -379,7 +379,7 @@ std::pair CharsIdentify::identifyChineseGray(cv::Mat i
cv::Mat feature;
extractFeature(input, feature);
float maxVal = -2;
- int result = -1;
+ int result = 0;
cv::Mat output(1, kChineseNumber, CV_32FC1);
annGray_->predict(feature, output);
diff --git a/src/train/annCh_train.cpp b/src/train/annCh_train.cpp
index c066484..ec98607 100644
--- a/src/train/annCh_train.cpp
+++ b/src/train/annCh_train.cpp
@@ -91,7 +91,7 @@ std::pair AnnChTrain::identifyGrayChinese(cv::Mat inpu
Mat feature;
extractFeature(input, feature);
float maxVal = -2;
- int result = -1;
+ int result = 0;
cv::Mat output(1, kChineseNumber, CV_32FC1);
ann_->predict(feature, output);
diff --git a/src/train/ann_train.cpp b/src/train/ann_train.cpp
index 8c1b828..51aec1f 100644
--- a/src/train/ann_train.cpp
+++ b/src/train/ann_train.cpp
@@ -22,6 +22,7 @@ AnnTrain::AnnTrain(const char* chars_folder, const char* xml)
}
void AnnTrain::train() {
+
int classNumber = 0;
cv::Mat layers;
@@ -93,17 +94,16 @@ void AnnTrain::train() {
ann_->train(traindata);
long end = utils::getTimestamp();
ann_->save(ann_xml_);
-
+
test();
std::cout << "Your ANN Model was saved to " << ann_xml_ << std::endl;
- std::cout << "Training done. Time elapse: " << (end - start) / (1000 * 60) << "minute"
- << std::endl;
+ std::cout << "Training done. Time elapse: " << (end - start) / (1000 * 60) << "minute" << std::endl;
}
std::pair AnnTrain::identifyChinese(cv::Mat input) {
cv::Mat feature = charFeatures2(input, kPredictSize);
float maxVal = -2;
- int result = -1;
+ int result = 0;
cv::Mat output(1, kChineseNumber, CV_32FC1);
ann_->predict(feature, output);
@@ -129,14 +129,15 @@ std::pair AnnTrain::identifyChinese(cv::Mat input) {
std::pair AnnTrain::identify(cv::Mat input) {
cv::Mat feature = charFeatures2(input, kPredictSize);
float maxVal = -2;
- int result = -1;
+ int result = 0;
+ //std::cout << feature << std::endl;
cv::Mat output(1, kCharsTotalNumber, CV_32FC1);
ann_->predict(feature, output);
-
+ //std::cout << output << std::endl;
for (int j = 0; j < kCharsTotalNumber; j++) {
float val = output.at(j);
- // std::cout << "j:" << j << "val:" << val << std::endl;
+ //std::cout << "j:" << j << "val:" << val << std::endl;
if (val > maxVal) {
maxVal = val;
result = j;
@@ -177,6 +178,10 @@ void AnnTrain::test() {
for (auto file : chars_files) {
auto img = cv::imread(file, 0); // a grayscale image
+ if (!img.data) {
+ //cout << "Null pointer!" << endl;
+ continue;
+ }
std::pair ch;
if (type == 0) ch = identify(img);
@@ -186,8 +191,7 @@ void AnnTrain::test() {
++corrects;
++corrects_all;
} else {
- error_files.push_back(
- std::make_pair(utils::getFileName(file), ch.second));
+ error_files.push_back(std::make_pair(utils::getFileName(file), ch.second));
}
++sum;
++sum_all;