Skip to content

Commit

Permalink
update Vanya's features
Browse files Browse the repository at this point in the history
  • Loading branch information
agricolamz committed Mar 21, 2024
1 parent 173044f commit 299b620
Show file tree
Hide file tree
Showing 1,094 changed files with 111,673 additions and 109,337 deletions.
110 changes: 110 additions & 0 deletions 215_Co-occurrence_of_conjunction_markers.Rmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
---
title: Co-occurrence of conjunction markers
author: Ivan Netkachev
date: 'Last update: `r lubridate::make_datetime(year = 2024, month = 1, day = 10)`'
output:
html_document:
number_sections: false
anchor_sections: true
pandoc_args: --shift-heading-level-by=-1
---

```{r, include=FALSE}
knitr::opts_chunk$set(echo = FALSE, message = FALSE, warning=FALSE, fig.width = 9.5)
library(tidyverse)
library(lingtypology)
read_csv('data/database.csv', show_col_types = FALSE) |>
filter(feature_id == 215) ->
db
read_csv('data/villages.csv') |>
filter(!(village %in% c('Kazankulak', 'Novyy Borch', 'Vrush', 'Aran', 'Khnyukh'))) ->
villages
villages |>
filter(!(village %in% c('Tsudik', 'Borch'))) ->
villages4map
```



## {.tabset .tabset-fade .tabset-pills}

### Map

```{r}
db |>
filter(!is.na(value),
value != 'NO DATA') |>
mutate(value = str_split(value, ' ; ')) |>
unnest_longer(value) |>
distinct(settlement, value) |>
mutate(n = 1) |>
pivot_wider(names_from = value, values_from = n, values_fill = 0) |>
left_join(villages[,c('village', 'lat', 'lon')], c('settlement' = 'village')) |>
mutate(language = 'Rutul') ->
for_map
if(length(for_map) == 5){
map.feature(languages = 'Rutul',
latitude = villages4map$lat,
longitude = villages4map$lon,
label = villages4map$village,
label.position = 'top',
label.hide = FALSE,
width = 10,
color = 'gray',
tile = 'OpenStreetMap.HOT',
opacity = 0.4) |>
map.feature(languages = for_map$language,
latitude = for_map$lat,
longitude = for_map$lon,
label = for_map$settlement,
label.position = 'top',
label.hide = FALSE,
width = 10,
tile = 'OpenStreetMap.HOT',
features = colnames(for_map)[2],
pipe.data = _)
} else {
map.feature(languages = 'Rutul',
latitude = villages4map$lat,
longitude = villages4map$lon,
label = villages4map$village,
label.position = 'top',
label.hide = FALSE,
width = 10,
color = 'gray',
tile = 'OpenStreetMap.HOT',
opacity = 0.4) |>
map.feature(languages = for_map$language,
latitude = for_map$lat,
longitude = for_map$lon,
minichart.data = for_map |> select(-settlement, -lat, -lon, -language),
minichart = 'pie',
width = 3,
tile = 'OpenStreetMap.HOT',
pipe.data = _)
}
```

### Data

```{r}
db |>
select(settlement, value, stimuli, answer, collected) |>
DT::datatable(class = 'cell-border stripe',
rownames = FALSE,
filter = 'top',
extensions = 'Buttons',
options = list(pageLength = 42,
autoWidth = TRUE,
info = FALSE,
dom = 'fBltp',
buttons = list(list(extend = 'collection',
buttons = c('csv', 'excel', 'pdf'),
text = '<i class="fas fa-download"></i>')),
paginate = TRUE))
```


111 changes: 0 additions & 111 deletions 215_Concessive_marking.Rmd

This file was deleted.

111 changes: 111 additions & 0 deletions 216_Combination_of_the_disjunctive_marker_and_the_additive.Rmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
---
title: Combination of the disjunctive marker and the additive
author: Ivan Netkachev
date: 'Last update: `r lubridate::make_datetime(year = 2024, month = 1, day = 10)`'
output:
html_document:
number_sections: false
anchor_sections: true
pandoc_args: --shift-heading-level-by=-1
---

```{r, include=FALSE}
knitr::opts_chunk$set(echo = FALSE, message = FALSE, warning=FALSE, fig.width = 9.5)
library(tidyverse)
library(lingtypology)
read_csv('data/database.csv', show_col_types = FALSE) |>
filter(feature_id == 216) ->
db
read_csv('data/villages.csv') |>
filter(!(village %in% c('Kazankulak', 'Novyy Borch', 'Vrush', 'Aran', 'Khnyukh'))) ->
villages
villages |>
filter(!(village %in% c('Tsudik', 'Borch'))) ->
villages4map
```

This feature maps the selectional propeties of the additive particle: can the additive particle attach directly to the disjunction marker or not?


## {.tabset .tabset-fade .tabset-pills}

### Map

```{r}
db |>
filter(!is.na(value),
value != 'NO DATA') |>
mutate(value = str_split(value, ' ; ')) |>
unnest_longer(value) |>
distinct(settlement, value) |>
mutate(n = 1) |>
pivot_wider(names_from = value, values_from = n, values_fill = 0) |>
left_join(villages[,c('village', 'lat', 'lon')], c('settlement' = 'village')) |>
mutate(language = 'Rutul') ->
for_map
if(length(for_map) == 5){
map.feature(languages = 'Rutul',
latitude = villages4map$lat,
longitude = villages4map$lon,
label = villages4map$village,
label.position = 'top',
label.hide = FALSE,
width = 10,
color = 'gray',
tile = 'OpenStreetMap.HOT',
opacity = 0.4) |>
map.feature(languages = for_map$language,
latitude = for_map$lat,
longitude = for_map$lon,
label = for_map$settlement,
label.position = 'top',
label.hide = FALSE,
width = 10,
tile = 'OpenStreetMap.HOT',
features = colnames(for_map)[2],
pipe.data = _)
} else {
map.feature(languages = 'Rutul',
latitude = villages4map$lat,
longitude = villages4map$lon,
label = villages4map$village,
label.position = 'top',
label.hide = FALSE,
width = 10,
color = 'gray',
tile = 'OpenStreetMap.HOT',
opacity = 0.4) |>
map.feature(languages = for_map$language,
latitude = for_map$lat,
longitude = for_map$lon,
minichart.data = for_map |> select(-settlement, -lat, -lon, -language),
minichart = 'pie',
width = 3,
tile = 'OpenStreetMap.HOT',
pipe.data = _)
}
```

### Data

```{r}
db |>
select(settlement, value, stimuli, answer, collected) |>
DT::datatable(class = 'cell-border stripe',
rownames = FALSE,
filter = 'top',
extensions = 'Buttons',
options = list(pageLength = 42,
autoWidth = TRUE,
info = FALSE,
dom = 'fBltp',
buttons = list(list(extend = 'collection',
buttons = c('csv', 'excel', 'pdf'),
text = '<i class="fas fa-download"></i>')),
paginate = TRUE))
```


Loading

0 comments on commit 299b620

Please sign in to comment.