Skip to content

Commit e77f149

Browse files
authored
Acled areas of control (#119)
* Add areas of control map with improved legend * add vornois for areas of control * add cell tags * Merge main: resolve conflicts and add credentials to gitignore
1 parent 6e98265 commit e77f149

File tree

9 files changed

+2530
-0
lines changed

9 files changed

+2530
-0
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,5 @@ _build/
9595
.python_version
9696
data/
9797
notebooks/hsos-survey/Figures
98+
training-253313-c905674c1ca0.json
99+
*.json
93.6 KB
Loading
101 KB
Loading

notebooks/conflict/acled_post_assad.ipynb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,15 @@
12571257
"cell_type": "code",
12581258
"execution_count": 263,
12591259
"id": "4a4ebb88",
1260+
<<<<<<< HEAD
1261+
"metadata": {
1262+
"tags": [
1263+
"remove-cell"
1264+
]
1265+
},
1266+
=======
12601267
"metadata": {},
1268+
>>>>>>> 6e98265b8740b0e92f75d1421c0d1f4434dab01f
12611269
"outputs": [],
12621270
"source": [
12631271
"areas_of_control['2026-01-01'].replace({'US And NSAGs': 'US and NSAGs'}, inplace=True)"
@@ -1523,6 +1531,8 @@
15231531
},
15241532
{
15251533
"cell_type": "code",
1534+
<<<<<<< HEAD
1535+
=======
15261536
"execution_count": 270,
15271537
"id": "acd95bdf",
15281538
"metadata": {},
@@ -1720,6 +1730,7 @@
17201730
},
17211731
{
17221732
"cell_type": "code",
1733+
>>>>>>> 6e98265b8740b0e92f75d1421c0d1f4434dab01f
17231734
"execution_count": 265,
17241735
"id": "e05d0697",
17251736
"metadata": {

notebooks/conflict/conflict_visuals.py

Whitespace-only changes.

0 commit comments

Comments
 (0)