Merge pull request selfteaching#1905 from yangbisheng/master

19100401dsay4

Author: shengzhulst

19100401/yangbisheng/d3_exercise_calculator.py

@@ -5,18 +5,3 @@
 
 @author: yangbisheng
 """
-def cal():
-    numA = float(raw_input('Please enter a number: '))
-    op = raw_input('Please enter a operator: ')
-    numB = float(raw_input('Please enter another number: '))
-    if op == '+':
-        print "result: ",numA+numB
-    elif op == '-':
-        print "result: ",numA-numB
-    elif op == '*':
-        print "result: ",numA*numB
-    elif op == '/':
-        print "result: ",numA/numB
-    else:
-        print "Unknown operator ",op
-cal()

19100401/yangbisheng/d4_exercise_control_flow.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+"""
+Spyder Editor
+
+This is a temporary script file.
+"""
+
+for i in range (1,10):
+    for j in range(1,10):
+        print(i,"*",j,"=",i*j,"\t",end="")
+        if i==j:
+            print("")
+            break
+
+i=0
+j=0
+while i<9:
+    i+=1
+    if i%2==0:#i等于偶数不执行后续代码
+        continue
+    while j<9:
+        j+=1
+        print(i,"*",j,"=",i*j,"\t",end="")
+        if i==j:
+            j=0
+            print("")
+            break
+
+
+