Skip to content

Commit aefd36e

Browse files
authored
Merge pull request #184 from chvmvd/fix-typos
Fix typos
2 parents 3cbac04 + 9b2abee commit aefd36e

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

docs/02algorithms/11dp/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ $3$ 行 $j$ 列は、$\{a_1,a_2,a_3\}=\{3,4,6\}$ の中からいくつかを使
174174
$i$ 行目を考える時、$a_i$ を入れるか入れないかの二択になります。
175175

176176
- $a_i$ を入れないときは、何も変わらないので一個上のセルの値の真偽値そのままです。つまり、$i$ 行 $j$ 列の真偽値は、$i-1$ 行 $j$ 列の真偽値となります。
177-
- $a_i$ を入れるときは、$a_k(1\leq k\leq i-1)$ を使って、**$j-a_i$** を作ることができていれば、それに $a_i$ を加えることで $j$ を作れそうです。
177+
- $a_i$ を入れるときは、$\{a_k\}(1\leq k\leq i-1)$ を使って、**$j-a_i$** を作ることができていれば、それに $a_i$ を加えることで $j$ を作れそうです。
178178
例えば、$3$ と $4$ を使って、$10-6=4$ が作れていれば、それに $6$ を加えることで $10$ を作ることができます。
179179
そうすると、$i$ 行 $j$ 列の真偽値は、$i-1$ 行 $j-a_i$ 列の真偽値となります。
180180

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
{
2-
"nbformat": 4,
3-
"nbformat_minor": 2,
4-
"metadata": {},
5-
"cells": [
6-
{
7-
"metadata": {},
8-
"source": [
9-
"def gausu_jordan_elimination(a):\n",
10-
" # 前進消去\n",
11-
" for i in range(len(a)):\n",
12-
" # 部分ピボット選択\n",
13-
" for j in range(i + 1, len(a)):\n",
14-
" if abs(a[i][i]) < abs(a[j][i]):\n",
15-
" tmp = a[i]\n",
16-
" a[i] = a[j]\n",
17-
" a[j] = tmp\n",
18-
" # pivot倍で行を割る\n",
19-
" pivot = a[i][i]\n",
20-
" for j in range(i, len(a[i])):\n",
21-
" a[i][j] /= pivot\n",
22-
" # 掃き出す\n",
23-
" for j in range(len(a)):\n",
24-
" if j != i:\n",
25-
" factor = a[j][i]\n",
26-
" for k in range(i, len(a[i])):\n",
27-
" a[j][k] -= factor * a[i][k]\n",
28-
" x = []\n",
29-
" for i in range(len(a)):\n",
30-
" x.append(a[i][len(a[i]) - 1])\n",
31-
" return x\n",
32-
"\n",
33-
"\n",
34-
"print(gausu_jordan_elimination([[0, -2, 3, 2], [-1, 3, -2, 1], [1, -1, 6, 11]]))"
35-
],
36-
"cell_type": "code",
37-
"outputs": [
2+
"nbformat": 4,
3+
"nbformat_minor": 2,
4+
"metadata": {},
5+
"cells": [
386
{
39-
"output_type": "stream",
40-
"name": "stdout",
41-
"text": [
42-
"[1.0, 2.0, 2.0]\n"
43-
]
7+
"metadata": {},
8+
"source": [
9+
"def gauss_jordan_elimination(a):\n",
10+
" # \u524d\u9032\u6d88\u53bb\n",
11+
" for i in range(len(a)):\n",
12+
" # \u90e8\u5206\u30d4\u30dc\u30c3\u30c8\u9078\u629e\n",
13+
" for j in range(i + 1, len(a)):\n",
14+
" if abs(a[i][i]) < abs(a[j][i]):\n",
15+
" tmp = a[i]\n",
16+
" a[i] = a[j]\n",
17+
" a[j] = tmp\n",
18+
" # pivot\u500d\u3067\u884c\u3092\u5272\u308b\n",
19+
" pivot = a[i][i]\n",
20+
" for j in range(i, len(a[i])):\n",
21+
" a[i][j] /= pivot\n",
22+
" # \u6383\u304d\u51fa\u3059\n",
23+
" for j in range(len(a)):\n",
24+
" if j != i:\n",
25+
" factor = a[j][i]\n",
26+
" for k in range(i, len(a[i])):\n",
27+
" a[j][k] -= factor * a[i][k]\n",
28+
" x = []\n",
29+
" for i in range(len(a)):\n",
30+
" x.append(a[i][len(a[i]) - 1])\n",
31+
" return x\n",
32+
"\n",
33+
"\n",
34+
"print(gauss_jordan_elimination([[0, -2, 3, 2], [-1, 3, -2, 1], [1, -1, 6, 11]]))"
35+
],
36+
"cell_type": "code",
37+
"outputs": [
38+
{
39+
"output_type": "stream",
40+
"name": "stdout",
41+
"text": [
42+
"[1.0, 2.0, 2.0]\n"
43+
]
44+
}
45+
],
46+
"execution_count": null
4447
}
45-
],
46-
"execution_count": null
47-
}
48-
]
48+
]
4949
}

0 commit comments

Comments
 (0)