Merge branch 'development' into amydev

AmyOlex · Aug 1, 2018 · 6fa2069 · 6fa2069
2 parents eca416d + 4e8e0a9
commit 6fa2069
Show file tree

Hide file tree

Showing 19 changed files with 286 additions and 9 deletions.
diff --git a/Chrono/TimePhraseToChrono/DayOfWeek.py b/Chrono/TimePhraseToChrono/DayOfWeek.py
@@ -20,7 +20,7 @@ def buildDayOfWeek(s, chrono_id, chrono_list):
         chrono_list.append(my_entity)
         chrono_id = chrono_id + 1
         # check here to see if it has a modifier
-        hasMod, mod_type, mod_start, mod_end = Chrono.TimePhraseToChrono.Modifier.hasModifier(s)
+        hasMod, mod_type, mod_start, mod_end = Chrono.TimePhraseToChrono.Modifier.hasNextLastThis(s)
         if (hasMod):
             if mod_type == "This":
                 chrono_list.append(chrono.ChronoThisOperator(entityID=str(chrono_id) + "entity", start_span=abs_Sspan,

diff --git a/Chrono/TimePhraseToChrono/Modifier.py b/Chrono/TimePhraseToChrono/Modifier.py
@@ -96,7 +96,7 @@ def hasModifierText(tpentity):
 # @author Amy Olex
 # @param tpentity The TimePhrase entity object being parsed
 # @return Outputs 4 values: Boolean Flag, Value text, start index, end index
-def hasModifier(tpentity):
+def hasNextLastThis(tpentity):
     # convert to all lower
     text_lower = tpentity.getText().lower()
     # remove all punctuation

diff --git a/Chrono/TimePhraseToChrono/PeriodInterval.py b/Chrono/TimePhraseToChrono/PeriodInterval.py
@@ -2,7 +2,7 @@
 import string
 import numpy as np
 from Chrono import chronoEntities as chrono, utils
-from Chrono.TimePhraseToChrono.Modifier import hasModifier
+from Chrono.TimePhraseToChrono.Modifier import hasNextLastThis
 from Chrono.utils import calculateSpan
 from chronoML import ChronoKeras
 
@@ -86,7 +86,7 @@ def buildPeriodInterval(s, chrono_id, chrono_list, ref_list, classifier, feats):
 
             else:
                 # check for a Last Word
-                hasMod, mod_type, mod_start, mod_end = hasModifier(s)
+                hasMod, mod_type, mod_start, mod_end = hasNextLastThis(s)
 
                 if(hasMod):
                     if mod_type == "Next":
@@ -115,7 +115,7 @@ def buildPeriodInterval(s, chrono_id, chrono_list, ref_list, classifier, feats):
                 chrono_list.append(chrono_this_entity)
             else:
                 # check for a Last Word
-                hasMod, mod_type, mod_start, mod_end = hasModifier(s)
+                hasMod, mod_type, mod_start, mod_end = hasNextLastThis(s)
                 if(hasMod):
                     if mod_type == "Next":
                         chrono_list.append(chrono.ChronoNextOperator(entityID=str(chrono_id) + "entity", start_span=ref_Sspan+mod_start, end_span=ref_Sspan+mod_end, repeating_interval=my_entity.get_id()))

diff --git a/Chrono/TimePhraseToChrono/Season.py b/Chrono/TimePhraseToChrono/Season.py
@@ -1,7 +1,7 @@
 import re
 import string
 from Chrono import chronoEntities as chrono, utils
-from Chrono.TimePhraseToChrono.Modifier import hasModifier
+from Chrono.TimePhraseToChrono.Modifier import hasNextLastThis
 from Chrono.utils import calculateSpan
 
 
@@ -22,7 +22,7 @@ def buildSeasonOfYear(s, chrono_id, chrono_list, ref_list):
         chrono_id = chrono_id + 1
 
         #check here to see if it has a modifier
-        hasMod, mod_type, mod_start, mod_end = hasModifier(s)
+        hasMod, mod_type, mod_start, mod_end = hasNextLastThis(s)
         if(hasMod):
             if mod_type == "This":
                 chrono_list.append(chrono.ChronoThisOperator(entityID=str(chrono_id) + "entity", start_span=abs_Sspan, end_span=abs_Espan, repeating_interval=my_entity.get_id()))

diff --git a/Chrono/TimePhraseToChrono/TextMonthAndDay.py b/Chrono/TimePhraseToChrono/TextMonthAndDay.py
@@ -2,7 +2,7 @@
 import string
 from nltk import WhitespaceTokenizer
 from Chrono import chronoEntities as chrono, utils
-from Chrono.TimePhraseToChrono.Modifier import hasModifier
+from Chrono.TimePhraseToChrono.Modifier import hasNextLastThis
 from Chrono.utils import calculateSpan
 
 
@@ -125,7 +125,7 @@ def buildTextMonthAndDay(s, chrono_id, chrono_list, flags, dct=None, ref_list=No
         ## if the start of the month is not 0 then we have leading text to parse
         if(idxstart > 0):
             #substr = s.getText()[:idxstart].strip(",.").strip()
-            hasMod, mod_type, mod_start, mod_end = hasModifier(s)
+            hasMod, mod_type, mod_start, mod_end = hasNextLastThis(s)
             if(hasMod):
                 if mod_type == "This":
                     chrono_list.append(chrono.ChronoThisOperator(entityID=str(chrono_id) + "entity", start_span=ref_Sspan+mod_start, end_span=ref_Sspan+mod_end, repeating_interval=my_month_entity.get_id()))

diff --git a/dictionary/AbrDay.txt b/dictionary/AbrDay.txt
@@ -0,0 +1,7 @@
+Mon.
+Tues.
+Wed.
+Thurs.
+Fri.
+Sat.
+Sun.
diff --git a/dictionary/AbrMonth.txt b/dictionary/AbrMonth.txt
@@ -0,0 +1,45 @@
+Jan.
+Feb.
+Mar.
+Apr.
+Jun.
+Jul.
+Aug.
+Sept.
+Oct.
+Nov.
+Dec.
+jan.
+feb.
+mar.
+apr.
+jun.
+jul.
+aug.
+sept.
+oct.
+nov.
+dec.
+Jan
+Feb
+Mar
+Apr
+Jun
+Jul
+Aug
+Sept
+Oct
+Nov
+Dec
+jan
+feb
+mar
+apr
+jun
+jul
+aug
+sept
+oct
+nov
+dec
+
diff --git a/dictionary/After.txt b/dictionary/After.txt
@@ -0,0 +1,2 @@
+after
+later
diff --git a/dictionary/Before.txt b/dictionary/Before.txt
@@ -0,0 +1,6 @@
+before
+ago
+pre
+previously
+earlier
+until
diff --git a/dictionary/FullDay.txt b/dictionary/FullDay.txt
@@ -0,0 +1,7 @@
+Monday
+Tuesday
+Wednesday
+Thursday
+Friday
+Saturday
+Sunday
diff --git a/dictionary/FullMonth.txt b/dictionary/FullMonth.txt
@@ -0,0 +1,24 @@
+January
+February
+March
+April
+May
+June
+July
+August
+September
+October
+November
+December
+january
+february
+march
+april
+may
+june
+july
+august
+september
+october
+november
+december
diff --git a/dictionary/Last.txt b/dictionary/Last.txt
@@ -0,0 +1,14 @@
+last
+previously
+pre
+later
+earlier
+early
+previous
+past
+lately
+final
+latest
+prior
+recent
+recently
diff --git a/dictionary/Modifier.txt b/dictionary/Modifier.txt
@@ -0,0 +1,11 @@
+nearly
+almost
+<
+late
+mid
+fiscal
+fy
+over
+early
+approximately
+beginning
diff --git a/dictionary/PartOfDay.txt b/dictionary/PartOfDay.txt
@@ -0,0 +1,16 @@
+morning
+evening
+afternoon
+night
+dawn
+dusk
+tonight
+overnight
+nights
+mornings
+evening
+afternoons
+noon
+bedtime
+midnight
+eve
diff --git a/dictionary/Period-Interval.txt b/dictionary/Period-Interval.txt
@@ -0,0 +1,56 @@
+decades
+decade
+yesterday
+yesterdays
+today
+todays
+tomorrow
+tomorrows
+day
+week
+month
+year
+daily
+weekly
+monthly
+yearly
+century
+minute
+second
+hour
+hourly
+days
+weeks
+months
+years
+centuries
+century
+minutes
+seconds
+hours
+time
+shortly
+
+
+
+
+
+
+
+
+
+
+
+
+
+soon
+briefly
+awhile
+future
+lately
+annual
+hr
+hrs
+min
+mins
+quarter
diff --git a/dictionary/Period.txt b/dictionary/Period.txt
@@ -0,0 +1,56 @@
+decades
+decade
+yesterday
+yesterdays
+today
+todays
+tomorrow
+tomorrows
+day
+week
+month
+year
+daily
+weekly
+monthly
+yearly
+century
+minute
+second
+hour
+hourly
+days
+weeks
+months
+years
+centuries
+century
+minutes
+seconds
+hours
+time
+shortly
+
+
+
+
+
+
+
+
+
+
+
+
+
+soon
+briefly
+awhile
+future
+lately
+annual
+hr
+hrs
+min
+mins
+quarter
diff --git a/dictionary/Season.txt b/dictionary/Season.txt
@@ -0,0 +1,8 @@
+summer
+winter
+fall
+spring
+summers
+falls
+winters
+springs
diff --git a/dictionary/TimeZone3.txt b/dictionary/TimeZone3.txt
@@ -0,0 +1,19 @@
+AST
+EST
+EDT
+CST
+CDT
+MST
+MDT
+PST
+PDT
+HST
+SST
+SDT
+GMT
+UTC
+BST
+CET
+IST
+MSD
+MSK
diff --git a/dictionary/TimeZone4.txt b/dictionary/TimeZone4.txt
@@ -0,0 +1,6 @@
+AKST
+HAST
+HADT
+CHST
+CEST
+EEST