diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8656114 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..d3980fb --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/Актуальный репозиторий курса.iml b/.idea/Актуальный репозиторий курса.iml new file mode 100644 index 0000000..6711606 --- /dev/null +++ b/.idea/Актуальный репозиторий курса.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Занятие_1.ipynb b/Lesson_1.ipynb similarity index 96% rename from Занятие_1.ipynb rename to Lesson_1.ipynb index cd4e6da..a57b47a 100644 --- a/Занятие_1.ipynb +++ b/Lesson_1.ipynb @@ -51,7 +51,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -65,7 +65,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -79,7 +79,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -107,7 +107,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -150,7 +150,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -378,8 +378,17 @@ "nbconvert_exporter": "python", "pygments_lexer": "ipython3", "version": "3.7.4" + }, + "pycharm": { + "stem_cell": { + "cell_type": "raw", + "source": [], + "metadata": { + "collapsed": false + } + } } }, "nbformat": 4, "nbformat_minor": 2 -} +} \ No newline at end of file diff --git a/Занятие_10.ipynb b/Lesson_10.ipynb similarity index 100% rename from Занятие_10.ipynb rename to Lesson_10.ipynb diff --git a/Занятие_11.ipynb b/Lesson_11.ipynb similarity index 100% rename from Занятие_11.ipynb rename to Lesson_11.ipynb diff --git a/Занятие_12.ipynb b/Lesson_12.ipynb similarity index 100% rename from Занятие_12.ipynb rename to Lesson_12.ipynb diff --git a/Занятие_13.ipynb b/Lesson_13.ipynb similarity index 100% rename from Занятие_13.ipynb rename to Lesson_13.ipynb diff --git a/Занятие_2.ipynb b/Lesson_2.ipynb similarity index 100% rename from Занятие_2.ipynb rename to Lesson_2.ipynb diff --git a/Занятие_3.ipynb b/Lesson_3.ipynb similarity index 100% rename from Занятие_3.ipynb rename to Lesson_3.ipynb diff --git a/Занятие_4.ipynb b/Lesson_4.ipynb similarity index 70% rename from Занятие_4.ipynb rename to Lesson_4.ipynb index e552e8f..8e39c6f 100644 --- a/Занятие_4.ipynb +++ b/Lesson_4.ipynb @@ -11,8 +11,12 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, + "execution_count": 1, + "metadata": { + "pycharm": { + "is_executing": false + } + }, "outputs": [], "source": [ "#Место для решения задачи\n", @@ -46,8 +50,12 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, + "execution_count": 2, + "metadata": { + "pycharm": { + "is_executing": false + } + }, "outputs": [], "source": [ "#Самостоятельная задача 2\n" @@ -57,14 +65,27 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 3, + "metadata": { + "pycharm": { + "is_executing": false + } + }, + "outputs": [ + { + "data": { + "text/plain": "True" + }, + "metadata": {}, + "output_type": "execute_result", + "execution_count": 3 + } + ], "source": [ "#Про присваивание и проверку равенства\n", "\"равно\" != \"равно\"*2" @@ -81,18 +102,13 @@ }, { "cell_type": "code", - "execution_count": 3, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Введите пароль23\n", - "False\n" - ] + "execution_count": 4, + "metadata": { + "pycharm": { + "is_executing": false } - ], + }, + "outputs": [], "source": [ "#Самостоятельная задача 3\n", "пароль = \"сложныйпароль\"\n", @@ -129,8 +145,12 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, + "execution_count": 5, + "metadata": { + "pycharm": { + "is_executing": false + } + }, "outputs": [], "source": [ "#Место для решения задачи" @@ -147,9 +167,25 @@ }, { "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], + "execution_count": 6, + "metadata": { + "pycharm": { + "is_executing": false + } + }, + "outputs": [ + { + "traceback": [ + "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", + "\u001b[0;31mValueError\u001b[0m Traceback (most recent call last)", + "\u001b[0;32m\u001b[0m in \u001b[0;36m\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": [ "#Пример программы с if\n", "возраст = input(\"Введите свой возраст: \")\n", @@ -168,8 +204,12 @@ }, { "cell_type": "code", - "execution_count": 2, - "metadata": {}, + "execution_count": null, + "metadata": { + "pycharm": { + "is_executing": false + } + }, "outputs": [], "source": [ "#Самостоятельная задача 6" @@ -186,8 +226,12 @@ }, { "cell_type": "code", - "execution_count": 3, - "metadata": {}, + "execution_count": null, + "metadata": { + "pycharm": { + "is_executing": false + } + }, "outputs": [], "source": [ "#Самостоятельная задача 7" @@ -205,7 +249,11 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "pycharm": { + "is_executing": false + } + }, "outputs": [], "source": [ "#Самостоятельная задача 8" @@ -222,8 +270,12 @@ }, { "cell_type": "code", - "execution_count": 1, - "metadata": {}, + "execution_count": null, + "metadata": { + "pycharm": { + "is_executing": false + } + }, "outputs": [], "source": [ "#Самостоятельная задача 9" @@ -247,8 +299,17 @@ "nbconvert_exporter": "python", "pygments_lexer": "ipython3", "version": "3.7.3" + }, + "pycharm": { + "stem_cell": { + "cell_type": "raw", + "source": [], + "metadata": { + "collapsed": false + } + } } }, "nbformat": 4, "nbformat_minor": 2 -} +} \ No newline at end of file diff --git a/Занятие_5.ipynb b/Lesson_5.ipynb similarity index 96% rename from Занятие_5.ipynb rename to Lesson_5.ipynb index 7f4385d..32e2fe9 100644 --- a/Занятие_5.ipynb +++ b/Lesson_5.ipynb @@ -11,7 +11,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "![title](img/Занятие_5/условие.png)" + "![title](img/Lesson_5/1.png)" ] }, { @@ -45,7 +45,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "![title](img/Занятие_5/условие_уровни.png)" + "![title](img/Lesson_5/1.png)" ] }, { @@ -113,7 +113,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -127,7 +127,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -234,7 +234,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "" + "" ] }, { @@ -339,8 +339,17 @@ "nbconvert_exporter": "python", "pygments_lexer": "ipython3", "version": "3.7.3" + }, + "pycharm": { + "stem_cell": { + "cell_type": "raw", + "source": [], + "metadata": { + "collapsed": false + } + } } }, "nbformat": 4, "nbformat_minor": 4 -} +} \ No newline at end of file diff --git a/Занятие_6.ipynb b/Lesson_6.ipynb similarity index 100% rename from Занятие_6.ipynb rename to Lesson_6.ipynb diff --git a/Занятие_7.ipynb b/Lesson_7.ipynb similarity index 100% rename from Занятие_7.ipynb rename to Lesson_7.ipynb diff --git a/Занятие_8.ipynb b/Lesson_8.ipynb similarity index 100% rename from Занятие_8.ipynb rename to Lesson_8.ipynb diff --git a/Занятие_9.ipynb b/Lesson_9.ipynb similarity index 100% rename from Занятие_9.ipynb rename to Lesson_9.ipynb diff --git a/img/Занятие_1/клетки_черепашки_связь_с_переменной.png b/img/Lesson_1/1.png similarity index 100% rename from img/Занятие_1/клетки_черепашки_связь_с_переменной.png rename to img/Lesson_1/1.png diff --git a/img/Занятие_1/клетки_черепашки.png b/img/Lesson_1/2.png similarity index 100% rename from img/Занятие_1/клетки_черепашки.png rename to img/Lesson_1/2.png diff --git a/img/Занятие_1/функция_шляпа.gif b/img/Lesson_1/3.gif similarity index 100% rename from img/Занятие_1/функция_шляпа.gif rename to img/Lesson_1/3.gif diff --git a/img/Занятие_1/input.png b/img/Lesson_1/4.png similarity index 100% rename from img/Занятие_1/input.png rename to img/Lesson_1/4.png diff --git a/img/Занятие_1/память.png b/img/Lesson_1/5.png similarity index 100% rename from img/Занятие_1/память.png rename to img/Lesson_1/5.png diff --git a/img/Занятие_1/foo b/img/Lesson_1/foo similarity index 100% rename from img/Занятие_1/foo rename to img/Lesson_1/foo diff --git a/img/Занятие_4/присваивание!=равенстов.png b/img/Занятие_4/1.png similarity index 100% rename from img/Занятие_4/присваивание!=равенстов.png rename to img/Занятие_4/1.png diff --git a/img/Занятие_5/условие.png b/img/Занятие_5/1.png similarity index 100% rename from img/Занятие_5/условие.png rename to img/Занятие_5/1.png diff --git a/img/Занятие_5/условие_уровни.png b/img/Занятие_5/2.png similarity index 100% rename from img/Занятие_5/условие_уровни.png rename to img/Занятие_5/2.png diff --git a/img/Занятие_5/кощей_усл.png b/img/Занятие_5/3.png similarity index 100% rename from img/Занятие_5/кощей_усл.png rename to img/Занятие_5/3.png diff --git a/img/Занятие_5/вложенное_условие.png b/img/Занятие_5/4.png similarity index 100% rename from img/Занятие_5/вложенное_условие.png rename to img/Занятие_5/4.png diff --git a/img/Занятие_5/условие_иначе_вариант_2.png b/img/Занятие_5/5.png similarity index 100% rename from img/Занятие_5/условие_иначе_вариант_2.png rename to img/Занятие_5/5.png