Skip to content

Commit f943edb

Browse files
committed
Resolve merge conflict in _toc.yml
2 parents ecae37f + 6f2510b commit f943edb

30 files changed

+754103
-52
lines changed

.Rhistory

Whitespace-only changes.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ share/python-wheels/
2727
*.egg
2828
MANIFEST
2929
.vscode/
30+
.DS_Store
3031

3132
# PyInstaller
3233
# Usually these files are written by a python script from a template
@@ -135,3 +136,4 @@ _build/
135136

136137
# poetry files
137138
pyproject.toml
139+

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ class CollaborationFramework:
4242
| 2 | 9/14 || | | |
4343
| 3 | 9/21 || | | |
4444
| 4 | 9/28 || | 권명석 | |
45-
| 5 | 10/5 || | 김정현 | |
46-
| 6 | 10/12 || | 조해창 | 강산아 |
47-
| 7 | 10/19 || | 장성은 | |
45+
| 5 | 10/5 || 강민석(가족여행_비행기 탑승) | 김정현 | |
46+
| 6 | 10/12 || | 조해창 | |
47+
| 7 | 10/19 || | 장성은 | 강민석 |
4848
| 8 | 10/26 | ||||
49-
| 9 | 11/2 || 장성은 (학회) | 김시은 | 전소영 |
50-
| 10 | 11/9 || 권명석, 강산아, 장성은 (학회) | | |
51-
| 11 | 11/16 | || ||
52-
| 12 | 11/23 || | 조해창 | 김시은 |
53-
| 13 | 11/30 || | 김정현 | 강산아 |
54-
| 14 | 12/7 || | 전소영 | |
55-
| 15 | 12/14 || 전소영 (학회) | 장성은 | |
49+
| 9 | 11/2 || 장성은 (학회), 조해창 (회사 워크샵) | 김시은 | |
50+
| 10 | 11/9 || 권명석, 장성은 (학회) | | |
51+
| 11 | 11/16 | || 전소영 ||
52+
| 12 | 11/23 || | 김시은 | |
53+
| 13 | 11/30 || | 김정현 | |
54+
| 14 | 12/7 || | 강민석 | 전소영 |
55+
| 15 | 12/14 || 전소영 (학회) | 장성은 | 조해창 |
5656
| 16 | 12/21 || |||
5757

Binary file not shown.

book/_toc.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ parts:
2020
- file: cate_and_policy/nonparametric_cate.ipynb
2121
- file: cate_and_policy/policy_learning.ipynb
2222
- file: cate_and_policy/iv.ipynb
23-
title: CATE with Instrumental Variables
2423
- file: cate_and_policy/cate_with_nn.ipynb
25-
title: CATE with Neural Networks
2624
- file: cate_and_policy/interpretability.ipynb
27-
title: CATE Interpretability
25+
- file: scm/overview.md
26+
sections:
27+
- file: scm/backdoor_criterion.ipynb
28+
- file: scm/frontdoor_criterion.ipynb
29+
- file: scm/causal_discovery.ipynb

0 commit comments

Comments
 (0)