Skip to content

Commit

Permalink
Fix language family for two languages. (#4)
Browse files Browse the repository at this point in the history
* Fixing Glottocode

* cldf conversion after changing language families

* cldf validation
  • Loading branch information
MuffinLinwist authored Mar 7, 2024
1 parent a34faec commit de2c91b
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cldf-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6]
python-version: [3.9]

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Conceptlists in Concepticon:

[![CLDF validation](https://github.com/lexibank/castrozhuang/workflows/CLDF-validation/badge.svg)](https://github.com/lexibank/castrozhuang/actions?query=workflow%3ACLDF-validation)
![Glottolog: 100%](https://img.shields.io/badge/Glottolog-100%25-brightgreen.svg "Glottolog: 100%")
![Concepticon: 96%](https://img.shields.io/badge/Concepticon-96%25-green.svg "Concepticon: 96%")
![Concepticon: 97%](https://img.shields.io/badge/Concepticon-97%25-green.svg "Concepticon: 97%")
![Source: 100%](https://img.shields.io/badge/Source-100%25-brightgreen.svg "Source: 100%")
![BIPA: 100%](https://img.shields.io/badge/BIPA-100%25-brightgreen.svg "BIPA: 100%")
![CLTS SoundClass: 100%](https://img.shields.io/badge/CLTS%20SoundClass-100%25-brightgreen.svg "CLTS SoundClass: 100%")
Expand All @@ -34,7 +34,7 @@ Conceptlists in Concepticon:
- **Synonymy:** 1.03
- **Invalid lexemes:** 0
- **Tokens:** 47,110
- **Segments:** 209 (0 BIPA errors, 0 CTLS sound class errors, 208 CLTS modified)
- **Segments:** 209 (0 BIPA errors, 0 CLTS sound class errors, 208 CLTS modified)
- **Inventory size (avg):** 73.05

# Contributors
Expand Down
8 changes: 4 additions & 4 deletions cldf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ property | value
[dc:format](http://purl.org/dc/terms/format) | <ol><li>http://concepticon.clld.org/contributions/Castro-2010-511</li></ol>
[dc:license](http://purl.org/dc/terms/license) | https://creativecommons.org/licenses/by/4.0/
[dcat:accessURL](http://www.w3.org/ns/dcat#accessURL) | https://github.com/lexibank/castrozhuang
[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/lexibank/castrozhuang/tree/d0eeaf3">lexibank/castrozhuang d0eeaf3</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.4">Glottolog v4.4</a></li><li><a href="https://github.com/concepticon/concepticon-data/tree/v2.5.0">Concepticon v2.5.0</a></li><li><a href="https://github.com/cldf-clts/clts/tree/v2.1.0">CLTS v2.1.0</a></li></ol>
[prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) | <ol><li><strong>lingpy-rcParams</strong>: <a href="./lingpy-rcParams.json">lingpy-rcParams.json</a></li><li><strong>python</strong>: 3.8.10</li><li><strong>python-packages</strong>: <a href="./requirements.txt">requirements.txt</a></li></ol>
[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://github.com/lexibank/castrozhuang/tree/867adca">lexibank/castrozhuang v1.0.1-1-g867adca</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.8">Glottolog v4.8</a></li><li><a href="https://github.com/concepticon/concepticon-data/tree/v3.1.0">Concepticon v3.1.0</a></li><li><a href="https://github.com/cldf-clts/clts/tree/v2.2.0">CLTS v2.2.0</a></li></ol>
[prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) | <ol><li><strong>lingpy-rcParams</strong>: <a href="./lingpy-rcParams.json">lingpy-rcParams.json</a></li><li><strong>python</strong>: 3.9.6</li><li><strong>python-packages</strong>: <a href="./requirements.txt">requirements.txt</a></li></ol>
[rdf:ID](http://www.w3.org/1999/02/22-rdf-syntax-ns#ID) | castrozhuang
[rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution

Expand Down Expand Up @@ -72,8 +72,8 @@ Name/Property | Datatype | Description
`Glottolog_Name` | `string` |
[ISO639P3code](http://cldf.clld.org/v1.0/terms.rdf#iso639P3code) | `string` |
[Macroarea](http://cldf.clld.org/v1.0/terms.rdf#macroarea) | `string` |
[Latitude](http://cldf.clld.org/v1.0/terms.rdf#latitude) | `decimal` |
[Longitude](http://cldf.clld.org/v1.0/terms.rdf#longitude) | `decimal` |
[Latitude](http://cldf.clld.org/v1.0/terms.rdf#latitude) | `decimal`<br>&ge; -90<br>&le; 90 |
[Longitude](http://cldf.clld.org/v1.0/terms.rdf#longitude) | `decimal`<br>&ge; -180<br>&le; 180 |
`Family` | `string` |
`ChineseName` | `string` |
`SubGroup` | `string` |
Expand Down
17 changes: 7 additions & 10 deletions cldf/cldf-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
{
"rdf:about": "https://github.com/lexibank/castrozhuang",
"rdf:type": "prov:Entity",
"dc:created": "d0eeaf3",
"dc:created": "v1.0.1-1-g867adca",
"dc:title": "Repository"
},
{
"rdf:about": "https://github.com/glottolog/glottolog",
"rdf:type": "prov:Entity",
"dc:created": "v4.4",
"dc:created": "v4.8",
"dc:title": "Glottolog"
},
{
"rdf:about": "https://github.com/concepticon/concepticon-data",
"rdf:type": "prov:Entity",
"dc:created": "v2.5.0",
"dc:created": "v3.1.0",
"dc:title": "Concepticon"
},
{
"rdf:about": "https://github.com/cldf-clts/clts",
"rdf:type": "prov:Entity",
"dc:created": "v2.1.0",
"dc:created": "v2.2.0",
"dc:title": "CLTS"
}
],
Expand All @@ -45,7 +45,7 @@
},
{
"dc:title": "python",
"dc:description": "3.8.10"
"dc:description": "3.9.6"
},
{
"dc:title": "python-packages",
Expand All @@ -54,9 +54,6 @@
],
"rdf:ID": "castrozhuang",
"rdf:type": "http://www.w3.org/ns/dcat#Distribution",
"dialect": {
"commentPrefix": null
},
"tables": [
{
"dc:conformsTo": "http://cldf.clld.org/v1.0/terms.rdf#FormTable",
Expand Down Expand Up @@ -180,7 +177,7 @@
{
"datatype": "string",
"propertyUrl": "http://cldf.clld.org/v1.0/terms.rdf#glottocode",
"valueUrl": "http://glottolog.org/resource/languoid/id/{glottolog_id}",
"valueUrl": "http://glottolog.org/resource/languoid/id/{Glottocode}",
"name": "Glottocode"
},
{
Expand Down Expand Up @@ -258,7 +255,7 @@
{
"datatype": "string",
"propertyUrl": "http://cldf.clld.org/v1.0/terms.rdf#concepticonReference",
"valueUrl": "http://concepticon.clld.org/parameters/{concepticon_id}",
"valueUrl": "http://concepticon.clld.org/parameters/{Concepticon_ID}",
"name": "Concepticon_ID"
},
{
Expand Down
4 changes: 2 additions & 2 deletions cldf/languages.csv
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ DahuaYantan,Dahua Yantan,cent2009,Central Hongshuihe Zhuang,zch,Eurasia,24.02692
DahuaLiushui,Dahua Liushui,cent2009,Central Hongshuihe Zhuang,zch,Eurasia,23.75189,107.9715,Tai-Kadai,大化流水,Zhuang,大化县流水乡头水片
DuAnGaoling,Du'an Gaoling,cent2009,Central Hongshuihe Zhuang,zch,Eurasia,24.06382,108.079128,Tai-Kadai,都安高岭,Zhuang,都安县高岭镇弄池村
DuAnBaiwang,Du'an Baiwang,cent2009,Central Hongshuihe Zhuang,zch,Eurasia,24.11682,108.41675,Tai-Kadai,都安百旺,Zhuang,都安县百旺乡百旺村
XinchengBeigeng,Xincheng Beigeng,east2326,Salaca Livonian,zeh,Eurasia,23.775707,108.559842,Tai-Kadai,忻城北更,Zhuang,忻城县北更乡塘太村
XinchengGuosui,Xincheng Guosui,east2326,Salaca Livonian,zeh,Eurasia,23.879303,108.80687,Tai-Kadai,忻城果邃,Zhuang,忻城县果遂乡古楼村
XinchengBeigeng,Xincheng Beigeng,east2326,Salaca Livonian,zeh,Eurasia,23.775707,108.559842,Uralic,忻城北更,Zhuang,忻城县北更乡塘太村
XinchengGuosui,Xincheng Guosui,east2326,Salaca Livonian,zeh,Eurasia,23.879303,108.80687,Uralic,忻城果邃,Zhuang,忻城县果遂乡古楼村
4 changes: 2 additions & 2 deletions cldf/lingpy-rcParams.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
10,
10
],
"filename": "lingpy-2021-07-22",
"filename": "lingpy-2024-03-04",
"gap_symbol": "-",
"gap_weight": 0.5,
"gop": -2,
Expand Down Expand Up @@ -123,7 +123,7 @@
"scorer": {},
"sonar": true,
"stress": "\u02c8\u02cc'",
"timestamp": "2021-07-22 09:51",
"timestamp": "2024-03-04 15:48",
"tones": "\u00b9\u00b2\u00b3\u2074\u2075\u2076\u2077\u2078\u2079\u2070\u2081\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089\u20800123456789\u02e5\u02e6\u02e7\u02e8\u02e9\u02ea\u02eb-\ua708-\ua709-\ua70a-\ua70b-\ua70c-\ua70d-\ua70e-\ua70f-\ua710-\ua711-\ua712-\ua713-\ua714-\ua715-\ua716-\ua717-\ua718-\ua719-\ua71a-\ua700-\ua701-\ua702-\ua703-\ua704-\ua705-\ua706-\ua707",
"tree_calc": "neighbor",
"unique_sequences": true,
Expand Down
6 changes: 3 additions & 3 deletions cldf/parameters.csv
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Castro-2010-511-182,to give*,1447,GIVE,给
Castro-2010-511-183,"to take, hold*",2104,HOLD OR TAKE,拿
Castro-2010-511-184,to squeeze(oil)*,,,榨(油)
Castro-2010-511-185,to suqeeze(juice)*,,,榨(蔗)
Castro-2010-511-186,wipe*,,,擦
Castro-2010-511-186,wipe*,1454,WIPE,擦
Castro-2010-511-187,to wash(hands)*,1453,WASH,"洗(手,菜)"
Castro-2010-511-188,to wash(clothes)*,2503,LAUNDER (WASH CLOTHES),洗(衣服)
Castro-2010-511-189,"to pull, drag*",1455,PULL,拉(过来)
Expand Down Expand Up @@ -316,7 +316,7 @@ Castro-2010-511-315,rattan,2497,RATTAN,藤子
Castro-2010-511-316,board,1227,BOARD,板(木板)
Castro-2010-511-317,wok,2056,WOK,锅(炒菜锅)
Castro-2010-511-318,ladle,2657,LADLE,舀子
Castro-2010-511-319,to ladle,,,舀
Castro-2010-511-319,to ladle,2788,LADLE (WATER),舀
Castro-2010-511-320,mortar,224,MORTAR,臼
Castro-2010-511-321,pestle,225,PESTLE,杵
Castro-2010-511-322,knife,1352,KNIFE,刀
Expand Down Expand Up @@ -416,7 +416,7 @@ Castro-2010-511-415,fast,1631,FAST,快
Castro-2010-511-416,slow,701,SLOW,慢
Castro-2010-511-417,crooked,297,CROOKED,曲,弯曲
Castro-2010-511-418,rotten (wood),,,朽(腐朽)
Castro-2010-511-419,loose,,,松(土很松)
Castro-2010-511-419,loose,2506,LOOSE,松(土很松)
Castro-2010-511-420,slack,2506,LOOSE,松(捆得松)
Castro-2010-511-421,tight (tied),3053,TIGHT,紧(捆得紧)
Castro-2010-511-422,"hot, spicy",544,SPICY,辣
Expand Down
91 changes: 50 additions & 41 deletions cldf/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,57 @@
appdirs==1.4.4
bs4==0.0.1
certifi==2021.5.30
chardet==4.0.0
cldfbench==1.7.1
cldfcatalog==1.3.2
clldutils==3.9.0
colorlog==5.0.1
csvw==1.11.0
gitdb==4.0.7
greenlet==1.1.0
idna==2.10
iniconfig==1.1.1
isodate==0.6.0
lingpy==2.6.8
Markdown==3.3.4
networkx==2.6.1
newick==1.3.0
numpy==1.21.0
openpyxl==3.0.7
packaging==21.0
pluggy==0.13.1
attrs==23.2.0
Babel==2.14.0
bibtexparser==2.0.0b7
bs4==0.0.2
certifi==2024.2.2
cldfbench==1.14.0
cldfcatalog==1.5.1
cldfzenodo==2.1.0
clldutils==3.22.1
colorama==0.4.6
colorlog==6.8.2
csvw==3.3.0
exceptiongroup==1.2.0
gitdb==4.0.11
idna==3.6
iniconfig==2.0.0
isodate==0.6.1
jsonschema==4.21.1
lingpy==2.6.13
lxml==5.1.0
Markdown==3.5.2
nameparser==1.1.3
networkx==3.2.1
newick==1.9.0
numpy==1.26.4
openpyxl==3.1.2
packaging==23.2
pluggy==1.4.0
purl==1.6
py==1.10.0
pybtex==0.24.0
pycldf==1.22.0
pycldf==1.37.0
pyclts==3.1.1
pyconcepticon==2.8.0
pycountry==20.7.3
pyglottolog==3.6.0
pylexibank==3.2.0
pytest==6.2.4
regex==2021.7.6
requests==2.25.1
pyconcepticon==3.0.0
pycountry==23.12.11
pyglottolog==3.12.0
pylatexenc==2.10
pylexibank==3.4.0
pytest==8.1.0
python-dateutil==2.9.0.post0
rdflib==7.0.0
referencing==0.33.0
regex==2023.12.25
requests==2.31.0
rfc3986==1.5.0
scipy==1.7.0
segments==2.2.0
segments==2.2.1
six==1.16.0
smmap==4.0.0
soupsieve==2.2.1
SQLAlchemy==1.4.20
tabulate==0.8.9
termcolor==1.1.0
tqdm==4.61.2
uritemplate==3.0.1
urllib3==1.26.6
smmap==5.0.1
soupsieve==2.5
SQLAlchemy==1.4.52
tabulate==0.9.0
termcolor==2.4.0
tqdm==4.66.2
uritemplate==4.1.1
urllib3==2.2.1
xlrd==2.0.1
zenodoclient==0.4.1
zenodoclient==0.5.1
4 changes: 2 additions & 2 deletions etc/languages.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ DahuaYantan Dahua Yantan 大化岩滩 cent2009 Tai-Kadai zch Eurasia 大化县
DahuaLiushui Dahua Liushui 大化流水 cent2009 Tai-Kadai zch Eurasia 大化县流水乡头水片 23.75189 107.9715
DuAnGaoling Du'an Gaoling 都安高岭 cent2009 Tai-Kadai zch Eurasia 都安县高岭镇弄池村 24.06382 108.079128
DuAnBaiwang Du'an Baiwang 都安百旺 cent2009 Tai-Kadai zch Eurasia 都安县百旺乡百旺村 24.11682 108.41675
XinchengBeigeng Xincheng Beigeng 忻城北更 east2326 Tai-Kadai zeh Eurasia 忻城县北更乡塘太村 23.775707 108.559842
XinchengGuosui Xincheng Guosui 忻城果邃 east2326 Tai-Kadai zeh Eurasia 忻城县果遂乡古楼村 23.879303 108.80687
XinchengBeigeng Xincheng Beigeng 忻城北更 east2326 Uralic zeh Eurasia 忻城县北更乡塘太村 23.775707 108.559842
XinchengGuosui Xincheng Guosui 忻城果邃 east2326 Uralic zeh Eurasia 忻城县果遂乡古楼村 23.879303 108.80687

0 comments on commit de2c91b

Please sign in to comment.