From 2a53ae884222eb87c265e0536c02eba962285760 Mon Sep 17 00:00:00 2001
From: luyishisi <543429245@qq.com>
Date: Thu, 12 Jan 2017 19:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../num\345\211\257\346\234\254/L.png"        | Bin 91 -> 102 bytes
 .../cat/1484219502.png"                       | Bin 0 -> 89 bytes
 .../cat/1484219536.png"                       | Bin 0 -> 89 bytes
 .../cat/1484219553.png"                       | Bin 0 -> 98 bytes
 .../cat/1484219554.png"                       | Bin 0 -> 100 bytes
 .../cat/1484219726.png"                       | Bin 0 -> 97 bytes
 .../cat/1484219763.png"                       | Bin 0 -> 97 bytes
 .../cat/1484219780.png"                       | Bin 0 -> 98 bytes
 .../cat/1484219781.png"                       | Bin 0 -> 100 bytes
 .../cat/1484219794.png"                       | Bin 0 -> 98 bytes
 .../cat/1484219795.png"                       | Bin 0 -> 100 bytes
 .../cat/1484219822.png"                       | Bin 0 -> 100 bytes
 .../cat/1484219894.png"                       | Bin 0 -> 100 bytes
 .../num\345\211\257\346\234\254/recognise.py" |  18 +++++++++++-------
 .../num\345\211\257\346\234\254/temp/1.png"   | Bin 107 -> 0 bytes
 15 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219502.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219536.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219553.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219554.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219726.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219763.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219780.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219781.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219794.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219795.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219822.png"
 create mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219894.png"
 delete mode 100644 "1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/temp/1.png"

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/L.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/L.png"
index e8126edf79fc2a00eaaee79a475a8be8ddf9879f..ec931580daf86c22796b5241c26278f4a554d22e 100644
GIT binary patch
delta 71
zcmaz}o1o&P>*?YcQZdK$%t1~D0|BOkhD-iWJF8r-v}wT%u3xcIT^3=%zSDl2%NQ!S
bY;Nbz{U^wLG$)~e0SG)@{an^LB{Ts5$u1f#

delta 60
zcmYd`o}gl`<muuVQZc9Zm?0yB0T0uLhWhhwRyM?Xy7dTM2+kGXmwcSrXc`;;l~MyH
P1|aZs^>bP0l+XkKkzf?T

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219502.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219502.png"
new file mode 100644
index 0000000000000000000000000000000000000000..dcdb50b83fb6ab6198afa5c5479e55816b062478
GIT binary patch
literal 89
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0VEhUr53ygQVO0fjv*CuT8}PdWH8`i+Hl~%
meX#NV87WCx7aH;c>TKDcA7c?rRIN@2>G5>+b6Mw<&;$UNgcwr*

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219536.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219536.png"
new file mode 100644
index 0000000000000000000000000000000000000000..dcdb50b83fb6ab6198afa5c5479e55816b062478
GIT binary patch
literal 89
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0VEhUr53ygQVO0fjv*CuT8}PdWH8`i+Hl~%
meX#NV87WCx7aH;c>TKDcA7c?rRIN@2>G5>+b6Mw<&;$UNgcwr*

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219553.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219553.png"
new file mode 100644
index 0000000000000000000000000000000000000000..3f433da0e783b72083dceeaa71c51e8438721f4a
GIT binary patch
literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+QktGFjv*CuTu*J}WN;KXd?51s
w{mu3t4r>ZB8Llh%R6gyj%4DCucdvhcWMo^<&R=<VStm%dr>mdKI;Vst0P+_frvLx|

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219554.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219554.png"
new file mode 100644
index 0000000000000000000000000000000000000000..d725a44c24797b18c6eb86942099396dd857301a
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+Qrey_jv*CuLeDsIF&OYL9rS$h
ye}4`?XDipcqppo96NRRHn-sXr-QoK7<Nso=c?kaM{l%F9((dW%=d#Wzp$P!-Q6G^2

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219726.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219726.png"
new file mode 100644
index 0000000000000000000000000000000000000000..a3a1cdc7a7ba47c21bad88eb8a2d547cd1f66acd
GIT binary patch
literal 97
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+QW~Bvjv*CuOiyiOWH8`qHaPnK
v{~JC}$ppuRwxuG<tW1k<o^bnfdG2ZE6-m6TJ8XYQf%JO1`njxgN@xNAX<Qr+

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219763.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219763.png"
new file mode 100644
index 0000000000000000000000000000000000000000..a3a1cdc7a7ba47c21bad88eb8a2d547cd1f66acd
GIT binary patch
literal 97
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+QW~Bvjv*CuOiyiOWH8`qHaPnK
v{~JC}$ppuRwxuG<tW1k<o^bnfdG2ZE6-m6TJ8XYQf%JO1`njxgN@xNAX<Qr+

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219780.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219780.png"
new file mode 100644
index 0000000000000000000000000000000000000000..3f433da0e783b72083dceeaa71c51e8438721f4a
GIT binary patch
literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+QktGFjv*CuTu*J}WN;KXd?51s
w{mu3t4r>ZB8Llh%R6gyj%4DCucdvhcWMo^<&R=<VStm%dr>mdKI;Vst0P+_frvLx|

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219781.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219781.png"
new file mode 100644
index 0000000000000000000000000000000000000000..d725a44c24797b18c6eb86942099396dd857301a
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+Qrey_jv*CuLeDsIF&OYL9rS$h
ye}4`?XDipcqppo96NRRHn-sXr-QoK7<Nso=c?kaM{l%F9((dW%=d#Wzp$P!-Q6G^2

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219794.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219794.png"
new file mode 100644
index 0000000000000000000000000000000000000000..3f433da0e783b72083dceeaa71c51e8438721f4a
GIT binary patch
literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+QktGFjv*CuTu*J}WN;KXd?51s
w{mu3t4r>ZB8Llh%R6gyj%4DCucdvhcWMo^<&R=<VStm%dr>mdKI;Vst0P+_frvLx|

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219795.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219795.png"
new file mode 100644
index 0000000000000000000000000000000000000000..d725a44c24797b18c6eb86942099396dd857301a
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+Qrey_jv*CuLeDsIF&OYL9rS$h
ye}4`?XDipcqppo96NRRHn-sXr-QoK7<Nso=c?kaM{l%F9((dW%=d#Wzp$P!-Q6G^2

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219822.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219822.png"
new file mode 100644
index 0000000000000000000000000000000000000000..d725a44c24797b18c6eb86942099396dd857301a
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+Qrey_jv*CuLeDsIF&OYL9rS$h
ye}4`?XDipcqppo96NRRHn-sXr-QoK7<Nso=c?kaM{l%F9((dW%=d#Wzp$P!-Q6G^2

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219894.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/cat/1484219894.png"
new file mode 100644
index 0000000000000000000000000000000000000000..d725a44c24797b18c6eb86942099396dd857301a
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L0VEh=mrGv+Qrey_jv*CuLeDsIF&OYL9rS$h
ye}4`?XDipcqppo96NRRHn-sXr-QoK7<Nso=c?kaM{l%F9((dW%=d#Wzp$P!-Q6G^2

literal 0
HcmV?d00001

diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/recognise.py" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/recognise.py"
index cee1d8ed..9d09418d 100644
--- "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/recognise.py"
+++ "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/recognise.py"
@@ -79,7 +79,7 @@ def magnitude(self,concordance):
                 else:
                     total += count ** 2
             except Exception,e:
-                print type(total),total,type(count),count
+                #print type(total),total,type(count),count
                 print e
         return math.sqrt(total)
 
@@ -89,9 +89,13 @@ def relation(self,concordance1, concordance2):
         topvalue = 0
         for word, count in concordance1.items():
             if word in concordance2:
-                print type(topvalue),topvalue,count,concordance2[word]
-                time.sleep(1)
-                topvalue += count * concordance2[word][0]
+                #print type(topvalue),topvalue,count,concordance2[word]
+                #time.sleep(1)
+                if(type(concordance2[word]) == type(())):
+                    topvalue += count * concordance2[word][0]
+                #print type(total),total,type(count),count ** 2
+                else:
+                    topvalue += count * concordance2[word]
                 #time.sleep(10)
         return topvalue / (self.magnitude(concordance1) * self.magnitude(concordance2))
 
@@ -127,7 +131,7 @@ def recognise(self,image):
             name = os.path.join(root,file)
             name_list.append(name)
 
-    print name_list
+    #print name_list
     for i in name_list:
         #name = '11'
         name = i
@@ -137,8 +141,8 @@ def recognise(self,image):
         # 设置图片路径
         image=Image.open(name)
         #image=Image.open('./temp/2.png')
-        print image.mode
+        #print image.mode
         result=imageRecognize.recognise(image)
         string=[''.join(item[1]) for item in result]
         print(string)
-        break
+        #break
diff --git "a/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/temp/1.png" "b/1.\351\252\214\350\257\201\347\240\201/num\345\211\257\346\234\254/temp/1.png"
deleted file mode 100644
index 701cec1ebb96d22a628a5d4160df81a7df44dd9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^96-#)!2~4PmUdhRQbwLGjv*Cu_Vzh)F&J<h4*LK9
zdDRVp<2JXWg*B$;GE86z>Gi8lS`vO^U8{S~O@Tl4d_FHP3vm|ZJ+KGrX7F_Nb6Mw<
G&;$VbrXmXf