Skip to content

Commit a66d146

Browse files
spring-haruspring-haru
committed
_list -> _lst + typo
1 parent e49839c commit a66d146

File tree

2 files changed

+44
-54
lines changed

2 files changed

+44
-54
lines changed

‎18_ADAS-1.ipynb‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@
423423
"$$\n",
424424
"\\begin{aligned}\n",
425425
"&\\Downarrow\\quad\\text{上の定義を使う}\\\\\n",
426+
"\\\\\n",
426427
"p_t &= p_{t-1}+ay_t +v_t\n",
427428
"\\end{aligned}\n",
428429
"$$(eq:18-as_small)"
@@ -557,7 +558,8 @@
557558
{
558559
"cell_type": "markdown",
559560
"metadata": {
560-
"heading_collapsed": true
561+
"heading_collapsed": true,
562+
"jp-MarkdownHeadingCollapsed": true
561563
},
562564
"source": [
563565
"## 景気循環のデータ"
@@ -843,6 +845,7 @@
843845
"cell_type": "markdown",
844846
"metadata": {
845847
"editable": true,
848+
"jp-MarkdownHeadingCollapsed": true,
846849
"slideshow": {
847850
"slide_type": ""
848851
},

‎18_ADAS-2.ipynb‎

Lines changed: 40 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -280,20 +280,20 @@
280280
" y = -c*p0 \n",
281281
" \n",
282282
" # === yとpの値を格納するリスト ==========\n",
283-
" y_list = [y] # 初期値を格納\n",
284-
" p_list = [p] # 初期値を格納\n",
283+
" y_lst = [y] # 初期値を格納\n",
284+
" p_lst = [p] # 初期値を格納\n",
285285
"\n",
286286
" # === ショック後のループ計算 ==========\n",
287287
" for _ in range(n):\n",
288288
" \n",
289289
" p = price_func(p)\n",
290290
" y = -c*p\n",
291291
"\n",
292-
" y_list.append(y)\n",
293-
" p_list.append(p)\n",
292+
" y_lst.append(y)\n",
293+
" p_lst.append(p)\n",
294294
" \n",
295295
" # === 辞書の作成 ==========\n",
296-
" dic = {'y':y_list, 'p':p_list}\n",
296+
" dic = {'y':y_lst, 'p':p_lst}\n",
297297
" \n",
298298
" # === 戻り値としてのDataFrame ==========\n",
299299
" return pd.DataFrame(dic)"
@@ -438,8 +438,7 @@
438438
"cell_type": "markdown",
439439
"metadata": {
440440
"heading_collapsed": true,
441-
"hidden": true,
442-
"jp-MarkdownHeadingCollapsed": true
441+
"hidden": true
443442
},
444443
"source": [
445444
"### コード"
@@ -511,19 +510,19 @@
511510
" \n",
512511
" # === 結果を格納するリストの作成 ==========\n",
513512
" # 最初の３つの要素は定常状態に設定\n",
514-
" y_list = [0]*3\n",
515-
" p_list = [0]*3\n",
516-
" u_list = [0]*3\n",
517-
" v_list = [0]*3\n",
513+
" y_lst = [0]*3\n",
514+
" p_lst = [0]*3\n",
515+
" u_lst = [0]*3\n",
516+
" v_lst = [0]*3\n",
518517
"\n",
519518
" # === ショック発生時 ==========\n",
520519
" p = price_func(p, u, v) # 引数のu,vが使われる\n",
521520
" y = - c*p + u # 引数のuが使われる\n",
522521
" \n",
523-
" y_list.append(y)\n",
524-
" p_list.append(p)\n",
525-
" u_list.append(u) # 引数のuが使われる\n",
526-
" v_list.append(v) # 引数のvが使われる\n",
522+
" y_lst.append(y)\n",
523+
" p_lst.append(p)\n",
524+
" u_lst.append(u) # 引数のuが使われる\n",
525+
" v_lst.append(v) # 引数のvが使われる\n",
527526
" \n",
528527
" # === ショック後 ==========\n",
529528
" u, v = 0, 0 # ショックを0に戻す\n",
@@ -533,13 +532,13 @@
533532
" p = price_func(p, u, v)\n",
534533
" y = - c*p + u\n",
535534
"\n",
536-
" y_list.append(y)\n",
537-
" p_list.append(p)\n",
538-
" u_list.append(u)\n",
539-
" v_list.append(v)\n",
535+
" y_lst.append(y)\n",
536+
" p_lst.append(p)\n",
537+
" u_lst.append(u)\n",
538+
" v_lst.append(v)\n",
540539
" \n",
541540
" # === 変数の辞書 ==========\n",
542-
" dic = {'y':y_list, 'p':p_list, 'u':u_list, 'v':v_list}\n",
541+
" dic = {'y':y_lst, 'p':p_lst, 'u':u_lst, 'v':v_lst}\n",
543542
" \n",
544543
" # === DataFrameを返す ==========\n",
545544
" return pd.DataFrame(dic)"
@@ -549,8 +548,7 @@
549548
"cell_type": "markdown",
550549
"metadata": {
551550
"heading_collapsed": true,
552-
"hidden": true,
553-
"jp-MarkdownHeadingCollapsed": true
551+
"hidden": true
554552
},
555553
"source": [
556554
"### プロット"
@@ -559,8 +557,7 @@
559557
{
560558
"cell_type": "markdown",
561559
"metadata": {
562-
"hidden": true,
563-
"jp-MarkdownHeadingCollapsed": true
560+
"hidden": true
564561
},
565562
"source": [
566563
"#### 総供給ショック"
@@ -621,8 +618,7 @@
621618
{
622619
"cell_type": "markdown",
623620
"metadata": {
624-
"hidden": true,
625-
"jp-MarkdownHeadingCollapsed": true
621+
"hidden": true
626622
},
627623
"source": [
628624
"#### 総需要ショック"
@@ -674,8 +670,7 @@
674670
"cell_type": "markdown",
675671
"metadata": {
676672
"heading_collapsed": true,
677-
"hidden": true,
678-
"jp-MarkdownHeadingCollapsed": true
673+
"hidden": true
679674
},
680675
"source": [
681676
"#### 総供給・総需要ショックの同時発生"
@@ -764,8 +759,7 @@
764759
"cell_type": "markdown",
765760
"metadata": {
766761
"heading_collapsed": true,
767-
"hidden": true,
768-
"jp-MarkdownHeadingCollapsed": true
762+
"hidden": true
769763
},
770764
"source": [
771765
"### コード"
@@ -809,10 +803,10 @@
809803
" # yの初期値は必要ない\n",
810804
"\n",
811805
" # === 結果を格納するリストの作成 ==========\n",
812-
" y_list = []\n",
813-
" p_list = []\n",
814-
" u_list = []\n",
815-
" v_list = []\n",
806+
" y_lst = []\n",
807+
" p_lst = []\n",
808+
" u_lst = []\n",
809+
" v_lst = []\n",
816810
" \n",
817811
" # === ランダム変数の「種」==========\n",
818812
" rng = np.random.default_rng()\n",
@@ -828,13 +822,13 @@
828822
" p = price_func(p, u, v)\n",
829823
" y = -c*p + u\n",
830824
" \n",
831-
" y_list.append(y)\n",
832-
" p_list.append(p)\n",
833-
" u_list.append(u)\n",
834-
" v_list.append(v)\n",
825+
" y_lst.append(y)\n",
826+
" p_lst.append(p)\n",
827+
" u_lst.append(u)\n",
828+
" v_lst.append(v)\n",
835829
" \n",
836830
" # === 変数の辞書 ==========\n",
837-
" dic = {'y':y_list, 'p':p_list, 'u':u_list, 'v':v_list}\n",
831+
" dic = {'y':y_lst, 'p':p_lst, 'u':u_lst, 'v':v_lst}\n",
838832
"\n",
839833
" # === DataFrameを返す ==========\n",
840834
" return pd.DataFrame(dic)"
@@ -855,8 +849,7 @@
855849
"cell_type": "markdown",
856850
"metadata": {
857851
"heading_collapsed": true,
858-
"hidden": true,
859-
"jp-MarkdownHeadingCollapsed": true
852+
"hidden": true
860853
},
861854
"source": [
862855
"### プロット"
@@ -1043,8 +1036,7 @@
10431036
"cell_type": "markdown",
10441037
"metadata": {
10451038
"heading_collapsed": true,
1046-
"hidden": true,
1047-
"jp-MarkdownHeadingCollapsed": true
1039+
"hidden": true
10481040
},
10491041
"source": [
10501042
"### 自己相関係数"
@@ -1151,8 +1143,7 @@
11511143
"cell_type": "markdown",
11521144
"metadata": {
11531145
"heading_collapsed": true,
1154-
"hidden": true,
1155-
"jp-MarkdownHeadingCollapsed": true
1146+
"hidden": true
11561147
},
11571148
"source": [
11581149
"### `p`と`y`の％乖離の相関係数：同時期"
@@ -1251,8 +1242,7 @@
12511242
"cell_type": "markdown",
12521243
"metadata": {
12531244
"heading_collapsed": true,
1254-
"hidden": true,
1255-
"jp-MarkdownHeadingCollapsed": true
1245+
"hidden": true
12561246
},
12571247
"source": [
12581248
"### 結果のまとめと拡張"
@@ -1366,8 +1356,7 @@
13661356
"cell_type": "markdown",
13671357
"metadata": {
13681358
"heading_collapsed": true,
1369-
"hidden": true,
1370-
"jp-MarkdownHeadingCollapsed": true
1359+
"hidden": true
13711360
},
13721361
"source": [
13731362
"### ADASモデルの評価"
@@ -1863,8 +1852,7 @@
18631852
{
18641853
"cell_type": "markdown",
18651854
"metadata": {
1866-
"heading_collapsed": true,
1867-
"jp-MarkdownHeadingCollapsed": true
1855+
"heading_collapsed": true
18681856
},
18691857
"source": [
18701858
"### 価格水準の％乖離"
@@ -1873,8 +1861,7 @@
18731861
{
18741862
"cell_type": "markdown",
18751863
"metadata": {
1876-
"hidden": true,
1877-
"jp-MarkdownHeadingCollapsed": true
1864+
"hidden": true
18781865
},
18791866
"source": [
18801867
"#### 計算方法"

0 commit comments

Comments
 (0)