From 49056c3d3a8d03e69de773db3b410b062ff7833b Mon Sep 17 00:00:00 2001 From: longfei-tu <53812206+longfei-tu@users.noreply.github.com> Date: Tue, 13 Aug 2019 00:01:48 +0800 Subject: [PATCH 1/7] Create 1901100259 --- exercises/1901100259 | 1 + 1 file changed, 1 insertion(+) create mode 100644 exercises/1901100259 diff --git a/exercises/1901100259 b/exercises/1901100259 new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/exercises/1901100259 @@ -0,0 +1 @@ + From a24a7555b38a9b91fd83b5a7be0c2c3a411c2c78 Mon Sep 17 00:00:00 2001 From: longfei-tu <53812206+longfei-tu@users.noreply.github.com> Date: Tue, 13 Aug 2019 00:10:32 +0800 Subject: [PATCH 2/7] Delete 1901100259 --- exercises/1901100259 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 exercises/1901100259 diff --git a/exercises/1901100259 b/exercises/1901100259 deleted file mode 100644 index 8b1378917..000000000 --- a/exercises/1901100259 +++ /dev/null @@ -1 +0,0 @@ - From 5932cb617b1ca7ba9dc789d07a926947c489ee9f Mon Sep 17 00:00:00 2001 From: Your Name <1287859612@qq.com> Date: Tue, 13 Aug 2019 11:21:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exercises/1901100259/1001S02E01_helloworld.txt | 2 ++ exercises/1901100259/README.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 exercises/1901100259/1001S02E01_helloworld.txt create mode 100644 exercises/1901100259/README.md diff --git a/exercises/1901100259/1001S02E01_helloworld.txt b/exercises/1901100259/1001S02E01_helloworld.txt new file mode 100644 index 000000000..97ace913d --- /dev/null +++ b/exercises/1901100259/1001S02E01_helloworld.txt @@ -0,0 +1,2 @@ +不乱于心，不困于情。 +不畏将来，不念过往。 \ No newline at end of file diff --git a/exercises/1901100259/README.md b/exercises/1901100259/README.md new file mode 100644 index 000000000..7cd4d3d87 --- /dev/null +++ b/exercises/1901100259/README.md @@ -0,0 +1,14 @@ + +Day1: +瀛︿範鍐呭锛欸ithub鐔熸倝鏈哄簲鐢紝鎺屾彙Github鐨勫熀纭搴旂敤 + +瀛︿範鏃堕棿锛16灏忔椂锛岀┖闂叉椂闂磋繘琛屽涔狅紝鍘嗘椂6澶 +鎬荤粨锛 + 1.鎵撳紑Github鏁欑▼鐨勬寚寮曪紝椤哄埄瀹屾垚浜嗚处鍙风殑娉ㄥ唽锛岀綉椤垫墦寮鍚庡叏閮ㄦ槸鑻辨枃锛岀灛闂存劅鍒版嚨鍦堜簡锛屽浜庡ぇ瀛﹁嫳璇彧鍕夊己閫氳繃鑻辫鍥涚骇鐨勬垜鏉ヨ鍐呭績鎰熻鍘嬪姏涓嶅皬锛屼絾鏄緢蹇彂鐜颁簡璋锋瓕娴忚鍣ㄧ殑涓涓濂囧姛鑳斤紝娴忚鍣ㄤ富椤甸潰鍙充笂瑙掔珶鐒舵湁涓涓叏椤电炕璇戠殑鍔熻兘锛岄〉闈㈠彲浠ュ疄鐜颁腑鑻辨枃瀹炴椂鍒囨崲锛屼簬鏄緢蹇畬鎴愪簡Github璐﹀彿鐨勬敞鍐岋紝鎸夌潃鑷浠诲姟鐨勬楠わ紝寰堝揩鍒涘缓浜嗕竴涓猦ello-world浠撳簱锛屾牴鎹瓽ithub鐨勬暀绋嬪張閫愭浜嗚В骞跺簲鐢ㄤ簡鍒嗘敮鍒涘缓涓庡悎骞躲丳ull Request銆乮ssue鍒涘缓绛夊姛鑳姐 + + 2.瀹夎Github Desktop,鐢变簬鐢佃剳绯荤粺鏄疻in7 32浣嶇郴缁燂紝閫氳繃鍚戞暀缁冩眰鍔╋紝骞跺湪缃戜笂鎼滃涓澶у湀锛屽缁堟棤娉曟壘鍒版敮鎸佽繍琛岀殑Github-Desktop杞欢锛屾渶鍚庝笉寰椾笉閲囩撼鏁欑粌鐨勫缓璁紝鍦ㄤ笉閲嶈绯荤粺鐨勬儏鍐典笅鍏堜笅杞戒竴涓狦it杞欢锛岄氳繃浠ｇ爜杈撳叆瀹炵幇鏈湴浠撳簱涓嶨ithub鏂囨湰搴撶殑杩炴帴鍙婂悓姝ユ洿鏂帮紝鍥犱负浠ヤ笅鐨勪綔涓氬唴瀹瑰繀椤荤敤Git杞欢鏉ヤ唬鏇縂ithub-Desktop鏉ュ畬鎴愶紝浜庢槸閫氳繃璋锋瓕鎼滅储鍙堝皢git鐨勫熀纭搴旂敤缁撳悎浣滀笟瀛︿範浜嗕竴閬嶏紝瀛︿細閲岃繍鐢╣it瀹炵幇clone,commit鎻愪氦銆佸彉鏇存帹閫佺瓑鍩虹鍔熻兘锛屽涔犵殑杩囩▼涓敤鏃惰緝澶氥 + + 3.鍏叡浣滀笟搴揷lone鍒版湰鍦颁粨搴擄紝鎵цclone杩欎竴椤规椂鍙皳鏄竴娉笁鎶橈紝鎸夌収git鐨勮繍琛屾楠や竴姝ユ杩涜杩愯锛岀敱浜庡叕鍏变綔涓氬簱鍐呮枃浠跺す澶锛屽鑷磋繍琛岃繃绋嬩腑棰戠箒涓柇澶辫触锛屽弽鍙嶅澶嶈繍琛屼笉涓10娆★紝鍚戞暀缁冪粌鍙婂鍛樿繘琛屾眰鍔╋紝鍙嶉鏄綉缁滀笉绋冲畾瀵艰嚧锛屼簬鐢ㄦ垜鏂紑鐢佃剳缃戠粶锛岀敤鎵嬫満寮鐑偣杩涜杩炴帴锛岃繍琛屼粛鐒跺け璐ワ紝浜庢槸鍙堝鍒堕摼鎺ョ敤闆蜂細鍛樿繘琛屼笅杞斤紝渚濇棫娌℃湁瑙ｅ喅锛屽洜涓鸿繖涓棶棰樺湪杩欓噷鍗′簡涓ゅぉ锛屽綋鏃剁‘瀹炴湁鐐规厡浜嗭紝涓搴︽湁鏀惧純鐨勫康澶淬備絾鏄兂鍒拌繖娆″涔犵紪绋嬬殑鐩殑锛屾兂鍒扳滆嚜瀛︽槸闂ㄦ墜鑹衡滐紝杩樻槸鍧氭寔瀵绘壘瑙ｅ喅鍔炴硶锛屾渶缁堟兂鍒版妸涓嬭浇閾炬帴鍙戝埌鎵嬫満涓婄殑杩呴浄App涓婅繘琛屼笅杞斤紝绔熺劧涓娆″氨鎴愬姛浜嗭紝閭ｄ竴鍒荤殑鎰熻锛屽垎鏄庡氨鏄ソ涔呴兘娌′綋浼氬埌鐨勬垚鍔熺殑鎰熻锛岃鑷繁鏇村姞鍧氫俊鍧氭寔鐨勫姏閲忥紝浣嗚濂戒簨鑾棶鍓嶇▼锛岃剼韪忓疄鍦扮殑鍧氭寔璺佃锛屾湭鏉ュ彲鏈燂紒 + + + From 59412d1ae45aa18401f09f5cfed0663b36410067 Mon Sep 17 00:00:00 2001 From: Your Name <1287859612@qq.com> Date: Wed, 14 Aug 2019 19:51:42 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exercises/1901100259/1001S02E02_hello_python.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 exercises/1901100259/1001S02E02_hello_python.py diff --git a/exercises/1901100259/1001S02E02_hello_python.py b/exercises/1901100259/1001S02E02_hello_python.py new file mode 100644 index 000000000..47d3e1c44 --- /dev/null +++ b/exercises/1901100259/1001S02E02_hello_python.py @@ -0,0 +1,2 @@ +msg = "Hello world" +print(msg) \ No newline at end of file From 526bc670cb971675dc1b17cfe9a06458f15acf30 Mon Sep 17 00:00:00 2001 From: longfei-tu <53812206+longfei-tu@users.noreply.github.com> Date: Thu, 22 Aug 2019 10:14:55 +0800 Subject: [PATCH 5/7] Create 1001S02E03_calculator.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Day3 浣滀笟鎻愪氦锛岃鍗忓姪妫鏌liujiayi0042 --- exercises/1901100259/1001S02E03_calculator.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 exercises/1901100259/1001S02E03_calculator.py diff --git a/exercises/1901100259/1001S02E03_calculator.py b/exercises/1901100259/1001S02E03_calculator.py new file mode 100644 index 000000000..445a4c902 --- /dev/null +++ b/exercises/1901100259/1001S02E03_calculator.py @@ -0,0 +1,10 @@ +a,b=[4,3] +A=a+b +B=a-b +C=a*b +D=a/b +E=a//b +F=a%b +G=a**b +W=[A,B,C,D,E,F,G] +print(W) \ No newline at end of file From a40d2fcee766fee0d4b96f9b3dd91bc8a8652d46 Mon Sep 17 00:00:00 2001 From: longfei-tu <53812206+longfei-tu@users.noreply.github.com> Date: Thu, 22 Aug 2019 16:41:23 +0800 Subject: [PATCH 6/7] Revert "Create 1001S02E03_calculator.py" This reverts commit 526bc670cb971675dc1b17cfe9a06458f15acf30. --- exercises/1901100259/1001S02E03_calculator.py | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/exercises/1901100259/1001S02E03_calculator.py b/exercises/1901100259/1001S02E03_calculator.py index 445a4c902..daea02e18 100644 --- a/exercises/1901100259/1001S02E03_calculator.py +++ b/exercises/1901100259/1001S02E03_calculator.py @@ -1,10 +1,33 @@ -a,b=[4,3] -A=a+b -B=a-b -C=a*b -D=a/b -E=a//b -F=a%b -G=a**b -W=[A,B,C,D,E,F,G] -print(W) \ No newline at end of file +operator=input("杈撳嚭绗竴涓瓧绗(+銆-銆*銆/銆//銆%銆**)锛") +number_1=input("杈撳叆绗1涓暟瀛楋細") +number_2=input("杈撳叆绗2涓暟瀛楋細") +a=int(number_1) +b=int(number_2) +#print(operator,type(operator),) +#print(number_1,type(number_1),type(a)) +#print(number_2,type(number_2),type(b)) +#print(a*b) + +if operator =="+": + print(a,"+",b,"=",a+b) + +elif operator =="-": + print(a,"-",b,"=",a-b) + +elif operator =="*": + print(a,"*",b,"=",a*b) + +elif operator =="/": + print(a,"/",b,"=",a/b) + +elif operator =="//": + print(a,"//",b,"=",a//b) + +elif operator =="%": + print(a,"%",b,"=",a%b) + +elif operator =="**": + print(a,"**",b,"=",a**b) + +else: + print("error") \ No newline at end of file From 9d7b61fb041cd6881cd4de9cf1b99e6e2255c7d5 Mon Sep 17 00:00:00 2001 From: longfei-tu <53812206+longfei-tu@users.noreply.github.com> Date: Tue, 27 Aug 2019 00:10:15 +0800 Subject: [PATCH 7/7] Create 1001S02E04_contral_flow.py --- .../1901100259/1001S02E04_contral_flow.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 exercises/1901100259/1001S02E04_contral_flow.py diff --git a/exercises/1901100259/1001S02E04_contral_flow.py b/exercises/1901100259/1001S02E04_contral_flow.py new file mode 100644 index 000000000..1aa4c77b5 --- /dev/null +++ b/exercises/1901100259/1001S02E04_contral_flow.py @@ -0,0 +1,29 @@ +#1.浣跨敤 for...in 寰幆鎵撳嵃涔濅節涔樻硶琛. +for a in [1,2,3,4,5,6,7,8,9]: + for b in range (1,a+1): + print(a,"*",b,"=",a*b,"\t" ,end="") + print("") + + + +#2.浣跨敤 while 寰幆鎵撳嵃涔濅節涔樻硶琛ㄥ苟鐢ㄦ潯浠跺垽鏂妸鍋舵暟琛屽幓闄ゆ帀. +a=1 +while a<=9: + for b in range(1,a+1): + print(a,"*",b,"=",a*b,"\t" ,end="", ) + a=a+2 + print("") +else: + print("very gond!") + + + +#3.浣跨敤 while 寰幆鎵撳嵃涔濅節涔樻硶琛ㄥ苟鐢ㄦ潯浠跺垽鏂妸濂囨暟琛屽幓闄ゆ帀. +a=0 +while a<9: + for b in range(1,a+1): + print(a,"*",b,"=",a*b,"\t" ,end="", ) + a=a+2 + print("") +else: + print("very gond!")