From ab1524175f414c0cd1fe336a5022591f49b8dc02 Mon Sep 17 00:00:00 2001 From: Artyom Date: Thu, 24 Sep 2015 22:15:02 -0400 Subject: [PATCH 1/4] Fix for bounty https://github.com/clips/pattern/issues/84 --- pattern/text/en/en-lexicon.txt | 4 ++-- test/test_en.py | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pattern/text/en/en-lexicon.txt b/pattern/text/en/en-lexicon.txt index 392ce94d..d2a3eb5f 100644 --- a/pattern/text/en/en-lexicon.txt +++ b/pattern/text/en/en-lexicon.txt @@ -428,7 +428,7 @@ $25 CD 17 CD 17th CD 1st JJ -2 IN +2 CD 20 CD 2008 CD 2010 CD @@ -443,7 +443,7 @@ $25 CD 3 CD 30 CD 31 CD -4 IN +4 CD 40 CD 48 CD 4th CD diff --git a/test/test_en.py b/test/test_en.py index 6430c8bc..a956f1be 100644 --- a/test/test_en.py +++ b/test/test_en.py @@ -559,6 +559,23 @@ def test_parsetree(self): self.assertTrue(isinstance(v, en.Text)) print("pattern.en.parsetree()") + def test_parsetree_cardinal_number(self): + """ Test that it correctly identified numbers as Cardinal Numbres + """ + for test_num in xrange(0, 10): + test_num = str(test_num) + v = en.parsetree("I am %s years old" % test_num) + found_num = v.words[2] + if found_num.type != 'CD': + import bpdb; bpdb.set_trace() + self.assertEquals(found_num.type, 'CD') + self.assertEquals(found_num.string, test_num) + + v = en.parsetree("I am 4 years old") + four = v.words[2] + self.assertEquals(four.type, 'CD') + self.assertEquals(four.string, u'4') + def test_split(self): # Assert split(parse(s)) == Text. v = en.split(en.parse("The cat purs.")) From cb683123917aa5acdeabb1184a02a151431d5aa3 Mon Sep 17 00:00:00 2001 From: abcht Date: Thu, 24 Sep 2015 22:19:27 -0400 Subject: [PATCH 2/4] Update test_en.py --- test/test_en.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_en.py b/test/test_en.py index a956f1be..938560ed 100644 --- a/test/test_en.py +++ b/test/test_en.py @@ -560,7 +560,7 @@ def test_parsetree(self): print("pattern.en.parsetree()") def test_parsetree_cardinal_number(self): - """ Test that it correctly identified numbers as Cardinal Numbres + """ Test that it correctly identified numbers as Cardinal Numbers """ for test_num in xrange(0, 10): test_num = str(test_num) From 95aa083c964fa734119813d9ce82d9b2c0a2ac32 Mon Sep 17 00:00:00 2001 From: Artyom Date: Fri, 25 Sep 2015 07:36:27 -0400 Subject: [PATCH 3/4] Removed redundant assertion --- test/test_en.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/test_en.py b/test/test_en.py index a956f1be..ea51c06d 100644 --- a/test/test_en.py +++ b/test/test_en.py @@ -571,11 +571,6 @@ def test_parsetree_cardinal_number(self): self.assertEquals(found_num.type, 'CD') self.assertEquals(found_num.string, test_num) - v = en.parsetree("I am 4 years old") - four = v.words[2] - self.assertEquals(four.type, 'CD') - self.assertEquals(four.string, u'4') - def test_split(self): # Assert split(parse(s)) == Text. v = en.split(en.parse("The cat purs.")) From 84f03ca3eafa38d25e37c1545e1e17e2fe446afb Mon Sep 17 00:00:00 2001 From: Artyom Date: Thu, 22 Oct 2015 21:39:15 -0400 Subject: [PATCH 4/4] Removed pdb statement --- test/test_en.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/test_en.py b/test/test_en.py index 0bafce21..4c323a8b 100644 --- a/test/test_en.py +++ b/test/test_en.py @@ -566,8 +566,6 @@ def test_parsetree_cardinal_number(self): test_num = str(test_num) v = en.parsetree("I am %s years old" % test_num) found_num = v.words[2] - if found_num.type != 'CD': - import bpdb; bpdb.set_trace() self.assertEquals(found_num.type, 'CD') self.assertEquals(found_num.string, test_num)