Исправлены главы

arithmetic.ipynb

@@ -303,7 +303,7 @@
    "source": [
     "a = 4\n",
     "b = 3\n",
-    "a ** b"
+    "a**b"
    ]
   },
   {
@@ -319,7 +319,7 @@
     "\n",
     "Для создания комплексного числа можно использовать функцию `complex(a, b)`, в\n",
     "которую, в качестве первого аргумента, передается действительная часть, в качестве\n",
-    "второго – мнимая. Либо записать число в виде `a + bj`.\n",
+    "второго – мнимая. Либо записать число в виде `a+bj`.\n",
     "\n",
     "Рассмотрим несколько примеров.\n",
     "\n",
@@ -334,7 +334,7 @@
    },
    "outputs": [],
    "source": [
-    "z = 1 + 2j\n",
+    "z = 1+2j\n",
     "print(z)"
    ]
   },
@@ -346,8 +346,8 @@
    },
    "outputs": [],
    "source": [
-    "x = complex ( 3 , 2 )\n",
+    "x = complex(3, 2)\n",
-    "print (x)"
+    "print(x)"
    ]
   },
   {
@@ -366,7 +366,7 @@
    },
    "outputs": [],
    "source": [
-    "x + z"
+    "x+z"
    ]
   },
   {
@@ -377,7 +377,7 @@
    },
    "outputs": [],
    "source": [
-    "x - z"
+    "x-z"
    ]
   },
   {
@@ -388,7 +388,7 @@
    },
    "outputs": [],
    "source": [
-    "x * z"
+    "x*z"
    ]
   },
   {
@@ -399,7 +399,7 @@
    },
    "outputs": [],
    "source": [
-    "x / z"
+    "x/z"
    ]
   },
   {
@@ -410,7 +410,7 @@
    },
    "outputs": [],
    "source": [
-    "x ** z"
+    "x**z"
    ]
   },
   {
@@ -421,7 +421,7 @@
    },
    "outputs": [],
    "source": [
-    "x ** 3"
+    "x**3"
    ]
   },
   {
@@ -439,7 +439,7 @@
    },
    "outputs": [],
    "source": [
-    "x = 3 + 2j\n",
+    "x = 3+2j\n",
     "x.real"
    ]
   },
@@ -687,7 +687,7 @@
    },
    "outputs": [],
    "source": [
-    "math.ceil( 3.2 )"
+    "math.ceil(3.2)"
    ]
   },
   {
@@ -747,7 +747,7 @@
    },
    "outputs": [],
    "source": [
-    "math.floor( 3.2 )"
+    "math.floor(3.2)"
    ]
   },
   {
@@ -766,7 +766,7 @@
    },
    "outputs": [],
    "source": [
-    "math.exp( 3 )"
+    "math.exp(3)"
    ]
   },
   {
@@ -805,7 +805,7 @@
    },
    "outputs": [],
    "source": [
-    "math.log10( 1000 )"
+    "math.log10(1000)"
    ]
   },
   {

src-datatype/quadratic.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+import cmath
+import math
+import sys
+
+# Start get_float
+def get_float(msg, allow_zero):
+    x = None
+    while x is None:
+        try:
+            x = float(input(msg))
+            if not allow_zero and abs(x) < sys.float_info.epsilon:
+                print("zero is not allowed")
+                x = None
+
+        except ValueError as err:
+            print(err)
+    return x
+# End get_float
+
+# Start 1st block
+print("ax\N{SUPERSCRIPT TWO} + bx + c = 0")
+a = get_float("enter a: ", False)
+b = get_float("enter b: ", False)
+c = get_float("enter c: ", False)
+# End 1st block
+
+# Start 2d block
+x1 = None
+x2 = None
+discriminant = (b ** 2) - (4 * a * c)
+if discriminant == 0:
+    x1 = -(b / (2 * a))
+else:
+    if discriminant > 0:
+        root = math.sqrt(discriminant)
+    else: # discriminant < 0
+        root = cmath.sqrt(discriminant)
+        x1 = (-b + root) / (2 * a)
+        x2 = (-b - root) / (2 * a)
+# End 2d block
+
+# Start 3d block
+equation = ("{0}x\N{SUPERSCRIPT TWO} + {1}x + {2} = 0"
+            " \N{RIGHTWARDS ARROW} x = {3}").format(a, b, c, x1)
+if x2 is not None:
+    equation += " or x = {0}".format(x2)
+print(equation)
+# End 3d block

src-intro/.ipynb_checkpoints/Untitled-checkpoint.ipynb

@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 2
+}

src-intro/Untitled.ipynb

@@ -0,0 +1,49 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Заголовок 1 уровня\n",
+    "## Заголовок 2 уровня\n",
+    "### Заголовок 3 уровня"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "> Этот текст печатается со сдвигом\n",
+    "> по отношению к основному тексту."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.1"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

src-intro/Untitled.ipynb~

@@ -0,0 +1,46 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Заголовок 1 уровня\n",
+    "## Заголовок 2 уровня\n",
+    "### Заголовок 3 уровня"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.1"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

src-intro/fib.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+def fib(n):
+    """
+    Возвращает список первых n чисел Фибоначи
+    """
+    f0, f1 = 0, 1
+    f = [1]*n
+    for i in range(1, n):
+        f[i] = f0 + f1
+        f0, f1 = f1, f[i]
+
+    return f
+
+print(fib(10))

src-intro/hello.py

@@ -0,0 +1 @@
+print("Hello from Python!")

src-intro/walkers.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+import numpy as np
+
+def random_walker_max_distance(M, N):
+    trajectories = [np.random.randn(M).cumsum() for _ in range(N)]
+    return np.max(np.abs(trajectories))