[~]rename

This commit is contained in:
n1ch1 2020-04-19 09:58:30 +05:00
parent e6f8098e3f
commit 6277a23570
31 changed files with 163 additions and 44 deletions

2
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
# Default ignored files
/workspace.xml

View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

7
.idea/misc.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Актуальный репозиторий курса.iml" filepath="$PROJECT_DIR$/.idea/Актуальный репозиторий курса.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>

View File

@ -51,7 +51,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_1/клетки_черепашки.png\" width=\"600\">" "<img src=\"img/Lesson_1/1.png\" width=\"600\">"
] ]
}, },
{ {
@ -65,7 +65,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_1/память.png\" width=\"600\">" "<img src=\"img/Lesson_1/5.png\" width=\"600\">"
] ]
}, },
{ {
@ -79,7 +79,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_1/клетки_черепашки_связь_с_переменной.png\" width=\"600\">" "<img src=\"img/Lesson_1/2.png\" width=\"600\">"
] ]
}, },
{ {
@ -107,7 +107,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_1/функция_шляпа.gif\" width=\"600\">" "<img src=\"img/Lesson_1/3.gif\" width=\"600\">"
] ]
}, },
{ {
@ -150,7 +150,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_1/input.png\" width=\"600\">" "<img src=\"img/Lesson_1/4.png\" width=\"600\">"
] ]
}, },
{ {
@ -378,8 +378,17 @@
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.7.4" "version": "3.7.4"
},
"pycharm": {
"stem_cell": {
"cell_type": "raw",
"source": [],
"metadata": {
"collapsed": false
}
}
} }
}, },
"nbformat": 4, "nbformat": 4,
"nbformat_minor": 2 "nbformat_minor": 2
} }

View File

@ -11,8 +11,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": 1,
"metadata": {}, "metadata": {
"pycharm": {
"is_executing": false
}
},
"outputs": [], "outputs": [],
"source": [ "source": [
"#Место для решения задачи\n", "#Место для решения задачи\n",
@ -46,8 +50,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": 2,
"metadata": {}, "metadata": {
"pycharm": {
"is_executing": false
}
},
"outputs": [], "outputs": [],
"source": [ "source": [
"#Самостоятельная задача 2\n" "#Самостоятельная задача 2\n"
@ -57,14 +65,27 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_4/присваивание!=равенстов.png\" width=\"400\">" "<img src=\"img/Lesson_4/1.png\" width=\"400\">"
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": 3,
"metadata": {}, "metadata": {
"outputs": [], "pycharm": {
"is_executing": false
}
},
"outputs": [
{
"data": {
"text/plain": "True"
},
"metadata": {},
"output_type": "execute_result",
"execution_count": 3
}
],
"source": [ "source": [
"#Про присваивание и проверку равенства\n", "#Про присваивание и проверку равенства\n",
"\"равно\" != \"равно\"*2" "\"равно\" != \"равно\"*2"
@ -81,18 +102,13 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": 4,
"metadata": {}, "metadata": {
"outputs": [ "pycharm": {
{ "is_executing": false
"name": "stdout",
"output_type": "stream",
"text": [
"Введите пароль23\n",
"False\n"
]
} }
], },
"outputs": [],
"source": [ "source": [
"#Самостоятельная задача 3\n", "#Самостоятельная задача 3\n",
"пароль = \"сложныйпароль\"\n", "пароль = \"сложныйпароль\"\n",
@ -129,8 +145,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": 5,
"metadata": {}, "metadata": {
"pycharm": {
"is_executing": false
}
},
"outputs": [], "outputs": [],
"source": [ "source": [
"#Место для решения задачи" "#Место для решения задачи"
@ -147,9 +167,25 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": 6,
"metadata": {}, "metadata": {
"outputs": [], "pycharm": {
"is_executing": false
}
},
"outputs": [
{
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mValueError\u001b[0m Traceback (most recent call last)",
"\u001b[0;32m<ipython-input-6-aa687f146bcf>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[0;31m#Пример программы с if\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 2\u001b[0m \u001b[0mвозраст\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0minput\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Введите свой возраст: \"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0;32mif\u001b[0m \u001b[0mint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mвозраст\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;34m>\u001b[0m \u001b[0;36m6\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 4\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Кажется вы ходите в школу:)\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 5\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n",
"\u001b[0;31mValueError\u001b[0m: invalid literal for int() with base 10: ''"
],
"ename": "ValueError",
"evalue": "invalid literal for int() with base 10: ''",
"output_type": "error"
}
],
"source": [ "source": [
"#Пример программы с if\n", "#Пример программы с if\n",
"возраст = input(\"Введите свой возраст: \")\n", "возраст = input(\"Введите свой возраст: \")\n",
@ -168,8 +204,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 2, "execution_count": null,
"metadata": {}, "metadata": {
"pycharm": {
"is_executing": false
}
},
"outputs": [], "outputs": [],
"source": [ "source": [
"#Самостоятельная задача 6" "#Самостоятельная задача 6"
@ -186,8 +226,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": null,
"metadata": {}, "metadata": {
"pycharm": {
"is_executing": false
}
},
"outputs": [], "outputs": [],
"source": [ "source": [
"#Самостоятельная задача 7" "#Самостоятельная задача 7"
@ -205,7 +249,11 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": {}, "metadata": {
"pycharm": {
"is_executing": false
}
},
"outputs": [], "outputs": [],
"source": [ "source": [
"#Самостоятельная задача 8" "#Самостоятельная задача 8"
@ -222,8 +270,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 1, "execution_count": null,
"metadata": {}, "metadata": {
"pycharm": {
"is_executing": false
}
},
"outputs": [], "outputs": [],
"source": [ "source": [
"#Самостоятельная задача 9" "#Самостоятельная задача 9"
@ -247,8 +299,17 @@
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.7.3" "version": "3.7.3"
},
"pycharm": {
"stem_cell": {
"cell_type": "raw",
"source": [],
"metadata": {
"collapsed": false
}
}
} }
}, },
"nbformat": 4, "nbformat": 4,
"nbformat_minor": 2 "nbformat_minor": 2
} }

View File

@ -11,7 +11,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"![title](img/Занятие_5/условие.png)" "![title](img/Lesson_5/1.png)"
] ]
}, },
{ {
@ -45,7 +45,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"![title](img/Занятие_5/условие_уровни.png)" "![title](img/Lesson_5/1.png)"
] ]
}, },
{ {
@ -113,7 +113,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_5/кощей_усл.png\" width=\"400\">" "<img src=\"img/Lesson_5/3.png\" width=\"400\">"
] ]
}, },
{ {
@ -127,7 +127,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_5/вложенное_условие.png\" width=\"600\">" "<img src=\"img/Lesson_5/4.png\" width=\"600\">"
] ]
}, },
{ {
@ -234,7 +234,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"<img src=\"img/Занятие_5/условие_иначеариант_2.png\" width=\"600\">" "<img src=\"img/Lesson_5/5.png\" width=\"600\">"
] ]
}, },
{ {
@ -339,8 +339,17 @@
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.7.3" "version": "3.7.3"
},
"pycharm": {
"stem_cell": {
"cell_type": "raw",
"source": [],
"metadata": {
"collapsed": false
}
}
} }
}, },
"nbformat": 4, "nbformat": 4,
"nbformat_minor": 4 "nbformat_minor": 4
} }

View File

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 205 KiB

View File

Before

Width:  |  Height:  |  Size: 182 KiB

After

Width:  |  Height:  |  Size: 182 KiB

View File

Before

Width:  |  Height:  |  Size: 416 KiB

After

Width:  |  Height:  |  Size: 416 KiB

View File

Before

Width:  |  Height:  |  Size: 213 KiB

After

Width:  |  Height:  |  Size: 213 KiB

View File

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

Before

Width:  |  Height:  |  Size: 675 KiB

After

Width:  |  Height:  |  Size: 675 KiB

View File

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 119 KiB

View File

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB