regex transforms for compar/superlatives

spencermountain · May 2, 2015 · 29e70c1 · 29e70c1
1 parent d04494d
commit 29e70c1
Show file tree

Hide file tree

Showing 5 changed files with 3,486 additions and 3,477 deletions.
diff --git a/index.js b/index.js
@@ -51,8 +51,3 @@ if (typeof module !== "undefined" && module.exports) {
 }
 // console.log( nlp.pos('she sells seashells by the seashore').sentences[0].negate().text() )
 // console.log( nlp.pos('i will slouch').to_past().text() );
-
-//TODAY
-// console.log(verb_conjugate("overtake"))
-// adjective conjugate("pretty")
-// upper-case months and demonyms
diff --git a/src/parents/adjective/conjugate/to_comparative.js b/src/parents/adjective/conjugate/to_comparative.js
@@ -63,6 +63,12 @@ var to_comparative = (function() {
       return null
     }
 
+    for (i = 0; i < transforms.length; i++) {
+      if (str.match(transforms[i].reg)) {
+        return str.replace(transforms[i].reg, transforms[i].repl)
+      }
+    }
+
     if (convertables.hasOwnProperty(str)) {
       if (str.match(/e$/)) {
         return str + "r"
@@ -71,6 +77,7 @@ var to_comparative = (function() {
       }
     }
 
+
     if (irregulars.hasOwnProperty(str)) {
       return irregulars[str]
     }
@@ -82,11 +89,6 @@ var to_comparative = (function() {
       }
     }
 
-    for (i = 0; i < transforms.length; i++) {
-      if (str.match(transforms[i].reg)) {
-        return str.replace(transforms[i].reg, transforms[i].repl)
-      }
-    }
 
     for (i = 0; i < matches.length; i++) {
       if (str.match(matches[i])) {

diff --git a/src/parents/adjective/conjugate/to_superlative.js b/src/parents/adjective/conjugate/to_superlative.js
@@ -61,6 +61,12 @@ var to_superlative = (function() {
       }
     }
 
+    for (i = 0; i < transforms.length; i++) {
+      if (str.match(transforms[i].reg)) {
+        return str.replace(transforms[i].reg, transforms[i].repl)
+      }
+    }
+
     if (convertables.hasOwnProperty(str)) {
       return generic_transformation(str)
     }
@@ -79,12 +85,6 @@ var to_superlative = (function() {
       }
     }
 
-    for (i = 0; i < transforms.length; i++) {
-      if (str.match(transforms[i].reg)) {
-        return str.replace(transforms[i].reg, transforms[i].repl)
-      }
-    }
-
     for (i = 0; i < matches.length; i++) {
       if (str.match(matches[i])) {
         return generic_transformation(str)

diff --git a/src/parents/verb/conjugate/conjugate.js b/src/parents/verb/conjugate/conjugate.js
@@ -231,3 +231,4 @@ var verb_conjugate = (function() {
 
 // console.log(verb_conjugate("swing"))
 // console.log(verb_conjugate("walking"))
+// console.log(verb_conjugate("overtook"))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -231,3 +231,4 @@ var verb_conjugate = (function() {

		// console.log(verb_conjugate("swing"))
		// console.log(verb_conjugate("walking"))
		// console.log(verb_conjugate("overtook"))