Fix 0014-0016

Drake-Z · Drake-Z · commit 114e65faad06 · 2016-06-17T17:21:44.000+08:00
diff --git a/Drake-Z/0014/0014.py b/Drake-Z/0014/0014.py
@@ -36,8 +36,8 @@ def writeFlie(dictdata):
         worksheet.write(i, 0, label = num[i])
         for m in range(0, 4):
             worksheet.write(i, m+1, label = dictdata[num[i]][m])
-    workbook.save('0014/student.xls')
+    workbook.save('student.xls')
 
 if __name__ == '__main__':
-    file = open('0014/student.txt', 'r', encoding='utf-8')
+    file = open('student.txt', 'r', encoding='utf-8')
     read_data(file.read())
diff --git a/Drake-Z/0015/0015.py b/Drake-Z/0015/0015.py
@@ -35,12 +35,12 @@ def writeFlie(dictdata, hangshu, lieshu):
         worksheet.write(i, 0, label = num[i])
         for m in range(0, lieshu):
             worksheet.write(i, m+1, label = dictdata[num[i]][m])
-    workbook.save('0015/city.xls')
+    workbook.save('city.xls')
 
 
 
 if __name__ == '__main__':
-    file = open('0015/city.txt', 'r', encoding='utf-8')
+    file = open('city.txt', 'r', encoding='utf-8')
     hangshu = 3
     lieshu = 1
     re1 = '"(.*?)" :'
diff --git a/Drake-Z/0016/0016.py b/Drake-Z/0016/0016.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+'''&#31532; 0015 &#39064;&#65306; &#32431;&#25991;&#26412;&#25991;&#20214; city.txt&#20026;&#22478;&#24066;&#20449;&#24687;, &#37324;&#38754;&#30340;&#20869;&#23481;&#65288;&#21253;&#25324;&#33457;&#25324;&#21495;&#65289;&#22914;&#19979;&#25152;&#31034;&#65306;
+{
+    "1" : "&#19978;&#28023;",
+    "2" : "&#21271;&#20140;",
+    "3" : "&#25104;&#37117;"
+}
+&#35831;&#23558;&#19978;&#36848;&#20869;&#23481;&#20889;&#21040; city.xls &#25991;&#20214;&#20013;&#12290;'''
+
+__author__ = 'Drake-Z'
+
+import os
+import re
+from collections import OrderedDict
+import xlwt
+
+def shuju(data, re1, re2):
+    c = OrderedDict([])
+    re_xuhao = re.compile(r'%s' % re1)            
+    re_yuansu = re.compile(r'%s' % re2)            
+    a = re_xuhao.findall(data)                      #&#24471;&#21040;&#24207;&#21495;
+    if len(a)==0:
+        for d in range(0, hangshu):
+            a.append(d)
+    b = re_yuansu.findall(data)                 #&#24471;&#21040;&#20855;&#20307;&#25968;&#25454;
+    for m, n in zip(a, b):                          #&#23558;&#25968;&#25454;&#36716;&#20026;Dict
+        n = re.split(r',', n)
+        c[m] = n
+    writeFlie(c, hangshu, lieshu)
+
+def writeFlie(dictdata, hangshu, lieshu):
+    workbook = xlwt.Workbook(encoding = 'utf-8')                #&#21019;&#24314;&#24037;&#20316;&#34180;
+    worksheet = workbook.add_sheet('My Worksheet')              #&#21019;&#24314;&#34920;
+    num = list(dictdata.keys())                                                    #&#24471;&#21040;&#24207;&#21495;
+    for i in range(0, hangshu):
+        for m in range(0, lieshu):
+            worksheet.write(i, m, label = dictdata[num[i]][m])
+    workbook.save('numbers.xls')
+
+
+
+
+
+if __name__ == '__main__':
+    file = open('numbers.txt', 'r', encoding='utf-8')
+    hangshu = 3
+    lieshu = 3
+    re1 = '%'
+    re2 = '\[(.*?)\]'
+    shuju(file.read(), re1, re2)
