From 0c67fa0c524ce4b5154dc384e55f3cd74cef3466 Mon Sep 17 00:00:00 2001 From: natalie-z Date: Sat, 5 Oct 2019 17:11:51 +0300 Subject: [PATCH 01/12] my first commit --- zelenova_start | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 zelenova_start diff --git a/zelenova_start b/zelenova_start new file mode 100644 index 0000000..e163c3a --- /dev/null +++ b/zelenova_start @@ -0,0 +1,3 @@ +print("sorry") +print("i'm late") + From 28b8b080eacac200027157f0e5e51138e0ca8522 Mon Sep 17 00:00:00 2001 From: natalie-z Date: Mon, 7 Oct 2019 22:42:14 +0300 Subject: [PATCH 02/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n1 zelenova_week02 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 zelenova_week02/n1 zelenova_week02 diff --git a/zelenova_week02/n1 zelenova_week02 b/zelenova_week02/n1 zelenova_week02 new file mode 100644 index 0000000..ed929ef --- /dev/null +++ b/zelenova_week02/n1 zelenova_week02 @@ -0,0 +1,11 @@ +# 1. Дано число n. С начала суток прошло n минут. +# Определите, сколько часов и минут будут показывать электронные часы в этот момент. +# Программа должна вывести два числа: количество часов (от 0 до 23) и количество минут (от 0 до 59). +# Учтите, что число n может быть больше, чем количество минут в сутках. (pythontutor.ru, 1 урок, электронные часы) +n= int(input ()) +minute= n % 60 +if n//60 <24: + hour =n//60 +else: hour=(n//60) % 24 +print (hour,':',minute) + From f78853d58a0793c7ced73a3cb28a52d33e46e2e4 Mon Sep 17 00:00:00 2001 From: natalie-z Date: Mon, 7 Oct 2019 22:47:24 +0300 Subject: [PATCH 03/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n1 zelenova_week02 | 1 + 1 file changed, 1 insertion(+) diff --git a/zelenova_week02/n1 zelenova_week02 b/zelenova_week02/n1 zelenova_week02 index ed929ef..c496291 100644 --- a/zelenova_week02/n1 zelenova_week02 +++ b/zelenova_week02/n1 zelenova_week02 @@ -2,6 +2,7 @@ # Определите, сколько часов и минут будут показывать электронные часы в этот момент. # Программа должна вывести два числа: количество часов (от 0 до 23) и количество минут (от 0 до 59). # Учтите, что число n может быть больше, чем количество минут в сутках. (pythontutor.ru, 1 урок, электронные часы) +print ('n=') n= int(input ()) minute= n % 60 if n//60 <24: From 641d91be2dab82e621886e818c2a44977a39c765 Mon Sep 17 00:00:00 2001 From: natalie-z Date: Mon, 7 Oct 2019 23:25:38 +0300 Subject: [PATCH 04/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n2 zelenova_week02 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 zelenova_week02/n2 zelenova_week02 diff --git a/zelenova_week02/n2 zelenova_week02 b/zelenova_week02/n2 zelenova_week02 new file mode 100644 index 0000000..7d0e144 --- /dev/null +++ b/zelenova_week02/n2 zelenova_week02 @@ -0,0 +1,9 @@ +# Напишете программу, которая на вход берет строку text и целое число n, и выводит в слово Hello, +# а также n раз через запятую и пробел строку text. В конце выхода запятая не ставится. +# Например, для text = MIPT Students и n = 5 результат будет следующим: +# Hello, MIPT Students, MIPT Students, MIPT Students, MIPT Students, MIPT Students +print('input your text') +text = str (input ()) +print('input n') +n= int (input ()) +print('Hello'+n*(', '+text)) From fc7e1f86a282a02b3583877521ccae39bfb0ecfe Mon Sep 17 00:00:00 2001 From: natalie-z Date: Mon, 7 Oct 2019 23:44:30 +0300 Subject: [PATCH 05/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n3 zelenova_week02 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 zelenova_week02/n3 zelenova_week02 diff --git a/zelenova_week02/n3 zelenova_week02 b/zelenova_week02/n3 zelenova_week02 new file mode 100644 index 0000000..174c3a6 --- /dev/null +++ b/zelenova_week02/n3 zelenova_week02 @@ -0,0 +1,14 @@ +#3. Даны три числа. Выведите значение наименьшего из них. (pythontutor.ru, 2 урок, минимум из трех чисел) +print('input first number') +first = int(input()) +print('input second number') +second = int(input()) +print('input third number') +third = int(input()) +print('The smallest number is') +if first <= second and first <= third: + print(first) +elif second <= first and second <= third: + print(second) +else: + print(third) From e36ec14c0df28ee4176c8e1bb738a25cd9cc4a8e Mon Sep 17 00:00:00 2001 From: natalie-z Date: Tue, 8 Oct 2019 00:06:36 +0300 Subject: [PATCH 06/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n4 zelenova_week02 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 zelenova_week02/n4 zelenova_week02 diff --git a/zelenova_week02/n4 zelenova_week02 b/zelenova_week02/n4 zelenova_week02 new file mode 100644 index 0000000..9711e95 --- /dev/null +++ b/zelenova_week02/n4 zelenova_week02 @@ -0,0 +1,9 @@ +#4. Длина Московской кольцевой автомобильной дороги —109 километров. +# Байкер Вася стартует с нулевого километра МКАД и едет со скоростью v километров в час. +# На какой отметке он остановится через t часов? Программа получает на вход значение v и t. +# Если v > 0, то Вася движется в положительном направлении по МКАД, если же значение v < 0, то в отрицательном. +# Программа должна вывести целое число от 0 до 108 — номер отметки, на которой остановится Вася. (pythontutor.ru, 3 урок, МКАД) +v=int(input()) +t=int(input()) +s=(v*t)%109 +print(s) From 1b48839e8c8a91851edfc341b0f398567708254d Mon Sep 17 00:00:00 2001 From: natalie-z Date: Tue, 8 Oct 2019 01:06:29 +0300 Subject: [PATCH 07/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n5 zelenova_week02 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 zelenova_week02/n5 zelenova_week02 diff --git a/zelenova_week02/n5 zelenova_week02 b/zelenova_week02/n5 zelenova_week02 new file mode 100644 index 0000000..6b830a7 --- /dev/null +++ b/zelenova_week02/n5 zelenova_week02 @@ -0,0 +1,10 @@ +#5. По данному натуральном n вычислите сумму 1! + 2! + 3! + ... + n!. +# В решении этой задачи можно использовать только один цикл. +# (pythontutor.ru, 4 урок, сумма факториалов) +n= int(input()) +sum = 0 +fact = 1 +for i in range(1, n + 1): + fact=fact*i + sum=fact+sum +print(sum) From 7aa8c4cc62522f3513e675a1e44ea7bb297e6733 Mon Sep 17 00:00:00 2001 From: natalie-z Date: Fri, 11 Oct 2019 21:27:39 +0300 Subject: [PATCH 08/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n6 zelenova_week02 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 zelenova_week02/n6 zelenova_week02 diff --git a/zelenova_week02/n6 zelenova_week02 b/zelenova_week02/n6 zelenova_week02 new file mode 100644 index 0000000..5503958 --- /dev/null +++ b/zelenova_week02/n6 zelenova_week02 @@ -0,0 +1,16 @@ +#6. Последовательность состоит из различных натуральных чисел и завершается числом 0. +# Определите значение второго по величине элемента в этой последовательности. +# Гарантируется, что в последовательности есть хотя бы два элемента. (pythontutor.ru, 6 урок, второй максимум) +lst=int(input()) +firstmax=0 +secmax=0 +while lst!=0: + + if firstmax Date: Fri, 11 Oct 2019 22:14:44 +0300 Subject: [PATCH 09/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n7 zelenova_week02 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 zelenova_week02/n7 zelenova_week02 diff --git a/zelenova_week02/n7 zelenova_week02 b/zelenova_week02/n7 zelenova_week02 new file mode 100644 index 0000000..fc3b5b7 --- /dev/null +++ b/zelenova_week02/n7 zelenova_week02 @@ -0,0 +1,5 @@ +#7. Выведите все элементы списка с четными индексами (то есть lst[0], lst[2], lst[4], ...). +# (pythontutor.ru, 7 урок, четные индексы) +a=input().split() +evena=a[::2] +print(' '.join(evena)) \ No newline at end of file From 05acda94c3a1cefe4ded3ae1363f7e7c098060ea Mon Sep 17 00:00:00 2001 From: natalie-z Date: Fri, 11 Oct 2019 22:42:52 +0300 Subject: [PATCH 10/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=208?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n8 zelenova_week02 | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 zelenova_week02/n8 zelenova_week02 diff --git a/zelenova_week02/n8 zelenova_week02 b/zelenova_week02/n8 zelenova_week02 new file mode 100644 index 0000000..97543cb --- /dev/null +++ b/zelenova_week02/n8 zelenova_week02 @@ -0,0 +1,8 @@ +#Выведите все четные элементы списка. При этом используйте цикл for, перебирающий элементы списка, а не их индексы! +#(pythontutor.ru, 7 урок, четные элементы) +a = [int(s) for s in input().split()] +evenelm=[] +for symbol in a: + if symbol%2==0: + evenelm.append(str(symbol)) +print(' '.join(evenelm)) \ No newline at end of file From adf0d2e5971e167cc150b3e4ac3dd633ce275109 Mon Sep 17 00:00:00 2001 From: natalie-z Date: Fri, 11 Oct 2019 23:26:54 +0300 Subject: [PATCH 11/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=9D=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=202,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zelenova_week02/n9 zelenova_week02 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 zelenova_week02/n9 zelenova_week02 diff --git a/zelenova_week02/n9 zelenova_week02 b/zelenova_week02/n9 zelenova_week02 new file mode 100644 index 0000000..c3a5434 --- /dev/null +++ b/zelenova_week02/n9 zelenova_week02 @@ -0,0 +1,16 @@ +#9. Даны четыре действительных числа: x1, y1, x2, y2. Напишите функцию distance(x1, y1, x2, y2), +# вычисляющая расстояние между точкой (x1,y1) и (x2,y2). +#Считайте четыре действительных числа и выведите результат работы этой функции. +#(pythontutor.ru, 8 урок, длина отрезка) +def distance(x1, y1, x2, y2): + import math + dist = math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2) + return dist + + +x1 = float(input()) +y1 = float(input()) +x2 = float(input()) +y2 = float(input()) + +print(distance(x1, y1, x2, y2)) \ No newline at end of file From 3e4941ecb3baa33a85b2a9944bb1e67068f9dc4f Mon Sep 17 00:00:00 2001 From: natalie-z Date: Fri, 11 Oct 2019 23:31:38 +0300 Subject: [PATCH 12/12] =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0,=20=D0=B4=D0=B7=20=D0=BD=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- week02/Intro.ipynb | 22 ++++++++++++++----- .../zelenova_week02}/n1 zelenova_week02 | 0 .../zelenova_week02}/n2 zelenova_week02 | 2 +- .../zelenova_week02}/n3 zelenova_week02 | 0 .../zelenova_week02}/n4 zelenova_week02 | 0 .../zelenova_week02}/n5 zelenova_week02 | 0 .../zelenova_week02}/n6 zelenova_week02 | 0 .../zelenova_week02}/n7 zelenova_week02 | 0 .../zelenova_week02}/n8 zelenova_week02 | 0 .../zelenova_week02}/n9 zelenova_week02 | 0 10 files changed, 17 insertions(+), 7 deletions(-) rename {zelenova_week02 => week02/zelenova_week02}/n1 zelenova_week02 (100%) rename {zelenova_week02 => week02/zelenova_week02}/n2 zelenova_week02 (95%) rename {zelenova_week02 => week02/zelenova_week02}/n3 zelenova_week02 (100%) rename {zelenova_week02 => week02/zelenova_week02}/n4 zelenova_week02 (100%) rename {zelenova_week02 => week02/zelenova_week02}/n5 zelenova_week02 (100%) rename {zelenova_week02 => week02/zelenova_week02}/n6 zelenova_week02 (100%) rename {zelenova_week02 => week02/zelenova_week02}/n7 zelenova_week02 (100%) rename {zelenova_week02 => week02/zelenova_week02}/n8 zelenova_week02 (100%) rename {zelenova_week02 => week02/zelenova_week02}/n9 zelenova_week02 (100%) diff --git a/week02/Intro.ipynb b/week02/Intro.ipynb index 63c7df6..294730c 100644 --- a/week02/Intro.ipynb +++ b/week02/Intro.ipynb @@ -788,7 +788,7 @@ }, { "cell_type": "code", - "execution_count": 62, + "execution_count": 1, "metadata": {}, "outputs": [ { @@ -804,7 +804,7 @@ "lst.append('Hello')\n", "lst += [5, 6]\n", "lst.remove(5)\n", - "print(lst)" + "print(lst)\n" ] }, { @@ -855,11 +855,21 @@ }, { "cell_type": "code", - "execution_count": 67, + "execution_count": 4, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "4\n" + ] + } + ], "source": [ - "a = int()" + "a = int()\n", + "a=4\n", + "print (a)" ] }, { @@ -1299,7 +1309,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.8" + "version": "3.7.3" } }, "nbformat": 4, diff --git a/zelenova_week02/n1 zelenova_week02 b/week02/zelenova_week02/n1 zelenova_week02 similarity index 100% rename from zelenova_week02/n1 zelenova_week02 rename to week02/zelenova_week02/n1 zelenova_week02 diff --git a/zelenova_week02/n2 zelenova_week02 b/week02/zelenova_week02/n2 zelenova_week02 similarity index 95% rename from zelenova_week02/n2 zelenova_week02 rename to week02/zelenova_week02/n2 zelenova_week02 index 7d0e144..7d14d2a 100644 --- a/zelenova_week02/n2 zelenova_week02 +++ b/week02/zelenova_week02/n2 zelenova_week02 @@ -6,4 +6,4 @@ print('input your text') text = str (input ()) print('input n') n= int (input ()) -print('Hello'+n*(', '+text)) +print('Hello'+n*(', '+text)) \ No newline at end of file diff --git a/zelenova_week02/n3 zelenova_week02 b/week02/zelenova_week02/n3 zelenova_week02 similarity index 100% rename from zelenova_week02/n3 zelenova_week02 rename to week02/zelenova_week02/n3 zelenova_week02 diff --git a/zelenova_week02/n4 zelenova_week02 b/week02/zelenova_week02/n4 zelenova_week02 similarity index 100% rename from zelenova_week02/n4 zelenova_week02 rename to week02/zelenova_week02/n4 zelenova_week02 diff --git a/zelenova_week02/n5 zelenova_week02 b/week02/zelenova_week02/n5 zelenova_week02 similarity index 100% rename from zelenova_week02/n5 zelenova_week02 rename to week02/zelenova_week02/n5 zelenova_week02 diff --git a/zelenova_week02/n6 zelenova_week02 b/week02/zelenova_week02/n6 zelenova_week02 similarity index 100% rename from zelenova_week02/n6 zelenova_week02 rename to week02/zelenova_week02/n6 zelenova_week02 diff --git a/zelenova_week02/n7 zelenova_week02 b/week02/zelenova_week02/n7 zelenova_week02 similarity index 100% rename from zelenova_week02/n7 zelenova_week02 rename to week02/zelenova_week02/n7 zelenova_week02 diff --git a/zelenova_week02/n8 zelenova_week02 b/week02/zelenova_week02/n8 zelenova_week02 similarity index 100% rename from zelenova_week02/n8 zelenova_week02 rename to week02/zelenova_week02/n8 zelenova_week02 diff --git a/zelenova_week02/n9 zelenova_week02 b/week02/zelenova_week02/n9 zelenova_week02 similarity index 100% rename from zelenova_week02/n9 zelenova_week02 rename to week02/zelenova_week02/n9 zelenova_week02