Revert "Merge senses of 'rural'"

This reverts commit de93aaa.
globalwordnet · Apr 6, 2020 · 1012b63 · 1012b63
1 parent ee2419e
commit 1012b63
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git 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
@@ -64828,6 +64828,13 @@
       <Lemma writtenForm="apple-shaped" partOfSpeech="s"/>
       <Sense id="ewn-apple-shaped-s-02048554-01" n="0" synset="ewn-02048554-s" dc:identifier="apple-shaped%5:00:00:round:00"/>
     </LexicalEntry>
+    <LexicalEntry id="ewn-rural-a">
+      <Lemma writtenForm="rural" partOfSpeech="a"/>
+      <Sense id="ewn-rural-a-02057872-01" n="0" synset="ewn-02057872-a" dc:identifier="rural%3:00:00::">
+        <SenseRelation relType="derivation" target="ewn-rurality-n-04927414-01"/> <!-- ruralism, rurality -->
+        <SenseRelation relType="antonym" target="ewn-urban-a-02059737-01"/> <!-- urban -->
+        </Sense>
+    </LexicalEntry>
     <LexicalEntry id="ewn-nagging-s">
       <Lemma writtenForm="nagging" partOfSpeech="s"/>
       <Sense id="ewn-nagging-s-01142110-02" n="0" synset="ewn-01142110-s" dc:identifier="nagging%5:00:00:ill-natured:00"/>
@@ -87637,7 +87644,7 @@
         <SenseRelation relType="derivation" target="ewn-urbanize-v-00501136-01"/> <!-- urbanize, urbanise -->
         <SenseRelation relType="derivation" target="ewn-urbanize-v-00500893-01"/> <!-- urbanize, urbanise -->
         <SenseRelation relType="derivation" target="ewn-urbanity-n-04823533-01"/> <!-- urbanity -->
-        <SenseRelation relType="antonym" target="ewn-rural-a-02801550-01"/> <!-- rural -->
+        <SenseRelation relType="antonym" target="ewn-rural-a-02057872-01"/> <!-- rural -->
         </Sense>
     </LexicalEntry>
     <LexicalEntry id="ewn-illusory-s">
@@ -188501,65 +188508,82 @@
       <Definition>shaped like a cucumber</Definition>
       <SynsetRelation relType="similar" target="ewn-02057536-a"/> <!-- watermelon-shaped, prolate -->
     </Synset>
+    <!-- rural -->
+    <Synset id="ewn-02057872-a" ili="i11247" partOfSpeech="a" dc:subject="adj.all">
+      <Definition>living in or characteristic of farming or country life</Definition>
+      <SynsetRelation relType="similar" target="ewn-02058261-s"/> <!-- agrarian, farming, agricultural -->
+      <SynsetRelation relType="similar" target="ewn-02058442-s"/> <!-- agrestic, rustic -->
+      <SynsetRelation relType="similar" target="ewn-02058608-s"/> <!-- arcadian, bucolic, pastoral -->
+      <SynsetRelation relType="similar" target="ewn-02058929-s"/> <!-- campestral -->
+      <SynsetRelation relType="similar" target="ewn-02059045-s"/> <!-- countrified, countryfied, rustic -->
+      <SynsetRelation relType="similar" target="ewn-02059217-s"/> <!-- country-bred -->
+      <SynsetRelation relType="similar" target="ewn-02059310-s"/> <!-- country-style -->
+      <SynsetRelation relType="similar" target="ewn-02059434-s"/> <!-- cracker-barrel, homespun -->
+      <SynsetRelation relType="similar" target="ewn-02059601-s"/> <!-- hobnailed -->
+      <Example>&quot;rural people&quot;</Example>
+      <Example>&quot;large rural households&quot;</Example>
+      <Example>&quot;unpaved rural roads&quot;</Example>
+      <Example>&quot;an economy that is basically rural&quot;</Example>
+    </Synset>
     <!-- agrarian, farming, agricultural -->
     <Synset id="ewn-02058261-s" ili="i11248" partOfSpeech="s" dc:subject="adj.all">
       <Definition>relating to farming or agriculture</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;an agrarian (or agricultural) society&quot;</Example>
       <Example>&quot;farming communities&quot;</Example>
     </Synset>
     <!-- agrestic, rustic -->
     <Synset id="ewn-02058442-s" ili="i11249" partOfSpeech="s" dc:subject="adj.all">
       <Definition>characteristic of the fields or country</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;agrestic simplicity&quot;</Example>
       <Example>&quot;rustic stone walls&quot;</Example>
     </Synset>
     <!-- arcadian, bucolic, pastoral -->
     <Synset id="ewn-02058608-s" ili="i11250" partOfSpeech="s" dc:subject="adj.all">
       <Definition>(used with regard to idealized country life) idyllically rustic</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;a country life of arcadian contentment&quot;</Example>
       <Example>&quot;a pleasant bucolic scene&quot;</Example>
       <Example>&quot;charming in its pastoral setting&quot;</Example>
     </Synset>
     <!-- campestral -->
     <Synset id="ewn-02058929-s" ili="i11251" partOfSpeech="s" dc:subject="adj.all">
       <Definition>of fields or open country</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;living in campestral seclusion&quot;</Example>
     </Synset>
     <!-- countrified, countryfied, rustic -->
     <Synset id="ewn-02059045-s" ili="i11252" partOfSpeech="s" dc:subject="adj.all">
       <Definition>characteristic of rural life</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;countrified clothes&quot;</Example>
       <Example>&quot;rustic awkwardness&quot;</Example>
     </Synset>
     <!-- country-bred -->
     <Synset id="ewn-02059217-s" ili="i11253" partOfSpeech="s" dc:subject="adj.all">
       <Definition>rough and uncouth</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;This childhood memory will take country-bred readers back to the days of their youth&quot;</Example>
     </Synset>
     <!-- country-style -->
     <Synset id="ewn-02059310-s" ili="i11254" partOfSpeech="s" dc:subject="adj.all">
       <Definition>typical of the country</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;country-style sausage&quot;</Example>
       <Example>&quot;they can also work well for quaint and country-style kitchens&quot;</Example>
     </Synset>
     <!-- cracker-barrel, homespun -->
     <Synset id="ewn-02059434-s" ili="i11255" partOfSpeech="s" dc:subject="adj.all">
       <Definition>characteristic of country life</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;cracker-barrel philosophy&quot;</Example>
       <Example>&quot;the air of homespun country boys&quot;</Example>
     </Synset>
     <!-- hobnailed -->
     <Synset id="ewn-02059601-s" ili="i11256" partOfSpeech="s" dc:subject="adj.all">
       <Definition>marked by the wearing of heavy boots studded with hobnails</Definition>
-      <SynsetRelation relType="similar" target="ewn-02801550-a"/>
+      <SynsetRelation relType="similar" target="ewn-02057872-a"/> <!-- rural -->
       <Example>&quot;hobnailed laborers&quot;</Example>
     </Synset>
     <!-- urban -->

diff --git a/src/wn-adj.pert.xml b/src/wn-adj.pert.xml
@@ -37399,22 +37399,8 @@
     <!-- rural -->
     <Synset id="ewn-02801550-a" ili="i15789" partOfSpeech="a" dc:subject="adj.pert">
       <Definition>of or relating to the countryside as opposed to the city</Definition>
-      <Definition>living in or characteristic of farming or country life</Definition>
-      <SynsetRelation relType="similar" target="ewn-02058261-s"/> <!-- agrarian, farming, agricultural -->
-      <SynsetRelation relType="similar" target="ewn-02058442-s"/> <!-- agrestic, rustic -->
-      <SynsetRelation relType="similar" target="ewn-02058608-s"/> <!-- arcadian, bucolic, pastoral -->
-      <SynsetRelation relType="similar" target="ewn-02058929-s"/> <!-- campestral -->
-      <SynsetRelation relType="similar" target="ewn-02059045-s"/> <!-- countrified, countryfied, rustic -->
-      <SynsetRelation relType="similar" target="ewn-02059217-s"/> <!-- country-bred -->
-      <SynsetRelation relType="similar" target="ewn-02059310-s"/> <!-- country-style -->
-      <SynsetRelation relType="similar" target="ewn-02059434-s"/> <!-- cracker-barrel, homespun -->
-      <SynsetRelation relType="similar" target="ewn-02059601-s"/> <!-- hobnailed -->
       <Example>&quot;rural electrification&quot;</Example>
       <Example>&quot;rural free delivery&quot;</Example>
-      <Example>&quot;rural people&quot;</Example>
-      <Example>&quot;large rural households&quot;</Example>
-      <Example>&quot;unpaved rural roads&quot;</Example>
-      <Example>&quot;an economy that is basically rural&quot;</Example>
     </Synset>
     <!-- Ruritanian -->
     <Synset id="ewn-02801724-a" ili="i15790" partOfSpeech="a" dc:subject="adj.pert">

diff --git a/src/wn-noun.attribute.xml b/src/wn-noun.attribute.xml
@@ -28821,7 +28821,7 @@
       <Lemma writtenForm="rurality" partOfSpeech="n"/>
       <Sense id="ewn-rurality-n-04927414-01" n="0" synset="ewn-04927414-n" dc:identifier="rurality%1:07:00::">
         <SenseRelation relType="derivation" target="ewn-rural-a-02801550-01"/> <!-- rural -->
-        <SenseRelation relType="derivation" target="ewn-rural-a-02801550-01"/> <!-- rural -->
+        <SenseRelation relType="derivation" target="ewn-rural-a-02057872-01"/> <!-- rural -->
         </Sense>
     </LexicalEntry>
     <LexicalEntry id="ewn-regionalism-n">