fix 0006 and commit 0007

starlightme · starlightme · commit 5c9bdffc6483 · 2015-02-19T22:15:23.000+08:00
diff --git a/Jimmy66/0006/0006.py b/Jimmy66/0006/0006.py
@@ -19,16 +19,22 @@ def most_word_number(word_list):
     str_dict = {}
     for item in word_list:
         if item in str_dict:
-            str_dict[item] +=1
+            str_dict[item] += 1
         else:
-            str_dict[item] =1
-
+            str_dict[item] = 1
+#非常漂亮的写法，来自于别人的代码，下面那个是我看到这个后自己写的，但是这个有一个比较奇怪的问题，在sublime中少打一行或者略作修改，保存的结果会不同，我也解释不清楚为什么            
     str_dict = {str_dict[key]:key for key in str_dict}
     return (max(str_dict),str_dict[max(str_dict)])
+#   temp = {}
+#   for key in str_dict:
+#   	temp[str_dict[key]] = key
+#   return max(temp),temp[max(temp)]
+
 
 
 if __name__ == '__main__':
 	string = file_read('GitHub.txt')
 	words = list1(string)
-	print (most_word_number(words))
+	times,word = most_word_number(words)
+	print '出现最多的单词为' + str(word) + '，出现了' + str(times) + '次'
 	
diff --git a/Jimmy66/0007/0007.py b/Jimmy66/0007/0007.py
@@ -0,0 +1,23 @@
+#!/bin/env python
+# -*- coding: utf-8 -*- 
+
+#完成了一部分，还没有找出空行和注释行数
+
+import os
+import glob
+
+def get_file_list():
+	return glob.glob('*')
+
+def file_read(filename):
+	with open(filename,'r') as fp:
+		linelist = fp.readlines()
+		return len(linelist)
+
+if __name__ == '__main__':
+	n1 = 0
+	os.chdir('./code')
+	file_list = get_file_list()
+	for name in file_list:
+		n1 += file_read(name)
+	print '文件夹中的文件总行数为' + str(n1) + '行'
diff --git a/Jimmy66/0007/code/sketch_140913a.pde b/Jimmy66/0007/code/sketch_140913a.pde
@@ -0,0 +1,11 @@
+void setup()
+{
+size(800,800);
+}
+void draw()
+{
+background(0);
+float r=random(0,mouseX);
+println(r);
+ellipse(400,400,r,r);
+}
diff --git a/Jimmy66/0007/code/sketch_140930a.pde b/Jimmy66/0007/code/sketch_140930a.pde
@@ -0,0 +1,28 @@
+int []x={200,400};
+int i;
+void round(int a, int b){
+ ellipse(a,b,100,100); 
+}
+void setup(){          
+  size(600,600);
+  smooth();
+  ellipseMode(RADIUS);
+  
+}
+void draw(){
+  background(255);
+  /*
+  if(mousePressed==true) 
+  {  
+    fill(0); 
+  }  
+  */
+  for(i=0;i<2;i++)
+  {
+    if(dist(mouseX,mouseY,x[i],x[i])<100) fill(255,128,0);
+  else fill(255);
+   round(x[i],x[i]);
+  
+  }
+ 
+}
diff --git a/Jimmy66/0007/code/sketch_141005a.pde b/Jimmy66/0007/code/sketch_141005a.pde
@@ -0,0 +1,21 @@
+int i=0;
+void setup(){          
+  size(600,800);        
+  smooth();          
+  ellipseMode(RADIUS);    
+}
+void draw(){
+  i++;
+  background(255);
+  if(i==1) fill(255,0,0);
+  else fill(0);
+  ellipse(300,150,80,80);
+  if(i==2)  fill(255,255,0);
+  else fill(0);
+  ellipse(300,350,80,80); 
+  if(i==3) fill(0,255,0);
+  else fill(0);
+  ellipse(300,550,80,80); 
+  i=i%3;
+  delay(1000);
+}
