Rename celexlexicon to prevent wrong imports

UUDigitalHumanitieslab · Jan 31, 2023 · b74a984 · b74a984 · oktaal · Jun 2, 2023
1 parent 0447434
commit b74a984
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/celexlexicon.py b/celexlexicon.py
@@ -5,7 +5,7 @@
 * DML (dmlcd.txt): lemmas and their morphological properties
 * DSL (dslcd.txt): lemmas and their syntactic properties
 
-These files can be found in the folder celexlexicon/dutch in the code folder.
+These files can be found in the folder celexlexicondata/dutch in the code folder.
 
 We store these in the celexlexicon module in python dictionaries:
 
@@ -52,7 +52,7 @@
 
 # initialisation
 # read the celex lexicon
-inputfolder = os.path.join(SD_DIR, 'celexlexicon', 'dutch')
+inputfolder = os.path.join(SD_DIR, 'celexlexicondata', 'dutch')
 
 dmwfilename = 'DMWCDOK.txt'
 dmwfullname = os.path.join(inputfolder, dmwfilename)

diff --git a/celexlexicon/__init__.py → celexlexicondata/__init__.py b/celexlexicon/__init__.py → celexlexicondata/__init__.py
diff --git a/celexlexicon/dutch/DMLCD.txt → celexlexicondata/dutch/DMLCD.txt b/celexlexicon/dutch/DMLCD.txt → celexlexicondata/dutch/DMLCD.txt
diff --git a/celexlexicon/dutch/DMWCDOK.txt → celexlexicondata/dutch/DMWCDOK.txt b/celexlexicon/dutch/DMWCDOK.txt → celexlexicondata/dutch/DMWCDOK.txt
diff --git a/celexlexicon/dutch/DSLCD.txt → celexlexicondata/dutch/DSLCD.txt b/celexlexicon/dutch/DSLCD.txt → celexlexicondata/dutch/DSLCD.txt
diff --git a/celexlexicon/dutch/__init__.py → celexlexicondata/dutch/__init__.py b/celexlexicon/dutch/__init__.py → celexlexicondata/dutch/__init__.py
diff --git a/top3000.py b/top3000.py
@@ -42,26 +42,28 @@
 from typing import Dict, List, Tuple
 from sastatypes import SynTree, DCOIPt
 
+
 def ishuman(node: SynTree) -> bool:
     '''
     The function ishuman determines whether the node node is human
     '''
     lemma = getattval(node, 'lemma')
     pt = getattval(node, 'pt')
     vwtype = getattval(node, 'vwtype')
-    result = (lemma, pt ) in semlexicon and 'human' in semlexicon[(lemma, pt)]
+    result = (lemma, pt) in semlexicon and 'human' in semlexicon[(lemma, pt)]
     result = result or vwtype == 'pers'
     result = result or namepart_isa_namepart(lemma)
     return result
 
+
 def isanimate(node: SynTree) -> bool:
     '''
     The function isanimate determines whether the nde node is animate
     '''
 
     lemma = getattval(node, 'lemma')
     pt = getattval(node, 'pt')
-    result = (lemma, pt ) in semlexicon and 'animate' in semlexicon[(lemma, pt)]
+    result = (lemma, pt) in semlexicon and 'animate' in semlexicon[(lemma, pt)]
     return result
 
 
@@ -71,15 +73,17 @@ def transitivity(node: SynTree, tr: str) -> bool:
     '''
     lemma = getattval(node, 'lemma')
     pt = getattval(node, 'pt')
-    result = (lemma, pt ) in semlexicon and tr in trlexicon[(lemma, pt)]
+    result = (lemma, pt) in semlexicon and tr in trlexicon[(lemma, pt)]
     return result
 
+
 def transitive(node: SynTree) -> bool:
     '''
     The function transitive determines whether node is transitive
     '''
     return transitivity(node, 'tr')
 
+
 def pseudotr(node: SynTree) -> bool:
     '''
     The function pseudotr determines whether node is pseudotransitive
@@ -93,9 +97,10 @@ def intransitive(node: SynTree) -> bool:
     '''
     return transitivity(node, 'intr')
 
+
 semicolon = ';'
 
-filename = os.path.join(SD_DIR, r'top3000\Woordenlijsten Current.xlsx')
+filename = os.path.join(SD_DIR, 'top3000', 'Woordenlijsten Current.xlsx')
 
 
 lexiconheader, lexicondata = getxlsxdata(filename)
@@ -120,4 +125,4 @@ def intransitive(node: SynTree) -> bool:
     genlexicon[(lemma, pt)] = gens
 
 #next statement for debugging purposes
-junk = 0
+junk = 0