From 1012b63a1a78cbe40d0b14d773340cffa5d5824c Mon Sep 17 00:00:00 2001 From: "John P. McCrae" Date: Mon, 6 Apr 2020 13:32:06 +0100 Subject: [PATCH] Revert "Merge senses of 'rural'" This reverts commit de93aaaf5c6b65178e80ee3ba67dbb4495d1e50a. --- scripts/validate.py | 4 ++-- src/wn-adj.all.xml | 44 ++++++++++++++++++++++++++++++--------- src/wn-adj.pert.xml | 14 ------------- src/wn-noun.attribute.xml | 2 +- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/scripts/validate.py b/scripts/validate.py index 0ebf6747..02b2c6b5 100644 --- a/scripts/validate.py +++ b/scripts/validate.py @@ -10,7 +10,7 @@ def check_symmetry(wn, fix): synset2 = wn.synset_by_id(rel.target) if not any(r for r in synset2.synset_relations if r.target == synset.id and r.rel_type == inverse_synset_rels[rel.rel_type]): if fix: - errors.append("python3 scripts/change-relation.py --add --new-relation %s %s %s" % (inverse_synset_rels[rel.rel_type].value, synset2.id, synset.id)) + errors.append("python scripts/change-relation.py --add --new-relation %s %s %s" % (inverse_synset_rels[rel.rel_type].value, synset2.id, synset.id)) else: errors.append("No symmetric relation for %s =%s=> %s" % (synset.id, rel.rel_type, synset2.id)) return errors @@ -24,7 +24,7 @@ def check_transitive(wn, fix): for rel2 in synset2.synset_relations: if any(r for r in synset.synset_relations if r.target == rel2.target and r.rel_type == SynsetRelType.HYPERNYM): if fix: - errors.append("python3 scripts/change-relation.py --delete %s %s" % (synset.id, rel2.target)) + errors.append("python scripts/change-relation.py --delete %s %s" % (synset.id, rel2.target)) else: errors.append("Transitive error for %s => %s => %s" %(synset.id, synset2.id, rel2.target)) return errors diff --git a/src/wn-adj.all.xml b/src/wn-adj.all.xml index db76fd9a..dc7fd444 100644 --- a/src/wn-adj.all.xml +++ b/src/wn-adj.all.xml @@ -64828,6 +64828,13 @@ + + + + + + + @@ -87637,7 +87644,7 @@ - + @@ -188501,24 +188508,41 @@ shaped like a cucumber + + + living in or characteristic of farming or country life + + + + + + + + + + "rural people" + "large rural households" + "unpaved rural roads" + "an economy that is basically rural" + relating to farming or agriculture - + "an agrarian (or agricultural) society" "farming communities" characteristic of the fields or country - + "agrestic simplicity" "rustic stone walls" (used with regard to idealized country life) idyllically rustic - + "a country life of arcadian contentment" "a pleasant bucolic scene" "charming in its pastoral setting" @@ -188526,40 +188550,40 @@ of fields or open country - + "living in campestral seclusion" characteristic of rural life - + "countrified clothes" "rustic awkwardness" rough and uncouth - + "This childhood memory will take country-bred readers back to the days of their youth" typical of the country - + "country-style sausage" "they can also work well for quaint and country-style kitchens" characteristic of country life - + "cracker-barrel philosophy" "the air of homespun country boys" marked by the wearing of heavy boots studded with hobnails - + "hobnailed laborers" diff --git a/src/wn-adj.pert.xml b/src/wn-adj.pert.xml index fb01adb8..ae854445 100644 --- a/src/wn-adj.pert.xml +++ b/src/wn-adj.pert.xml @@ -37399,22 +37399,8 @@ of or relating to the countryside as opposed to the city - living in or characteristic of farming or country life - - - - - - - - - "rural electrification" "rural free delivery" - "rural people" - "large rural households" - "unpaved rural roads" - "an economy that is basically rural" diff --git a/src/wn-noun.attribute.xml b/src/wn-noun.attribute.xml index f1fc5fa0..50e3c3d2 100644 --- a/src/wn-noun.attribute.xml +++ b/src/wn-noun.attribute.xml @@ -28821,7 +28821,7 @@ - +