natural 0.5.6 → 0.6.3

package/lib/natural/brill_pos_tagger/lib/Lexicon.js

@@ -20,7 +20,7 @@ var fs = require('fs');
 
 // Parses a lexicon in JSON or text format
 function Lexicon(filename, defaultCategory, defaultCategoryCapitalised) {
-  this.lexicon = {};
+  this.lexicon = {}; //Object.create(null);
 
   if (filename) {
     this.defaultCategory = defaultCategory;
@@ -35,7 +35,7 @@ function Lexicon(filename, defaultCategory, defaultCategoryCapitalised) {
         // Lexicon is plain text
         this.parseLexicon(data);
       }
-      // console.log('Brill_POS_Tagger.read_lexicon: number of lexicon entries read: ' + Object.keys(that.lexicon).length);
+      //console.log('Brill_POS_Tagger.read_lexicon: number of lexicon entries read: ' + Object.keys(this.lexicon).length);
     }
     catch (error) {
       console.error(error);
@@ -53,7 +53,7 @@ function Lexicon(filename, defaultCategory, defaultCategoryCapitalised) {
 Lexicon.prototype.parseLexicon = function(data) {
   // Split into an array of non-empty lines
   var arrayOfLines = data.match(/[^\r\n]+/g);
-  this.lexicon = {};
+  this.lexicon = {}; //Object.create(null);
   var that = this;
   arrayOfLines.forEach(function(line) {
     // Split line by whitespace
@@ -64,21 +64,26 @@ Lexicon.prototype.parseLexicon = function(data) {
   });
 };
 
+Lexicon.prototype.tagWordWithDefaults = function(word) {
+  if (/[A-Z]/.test(word[0]) && this.defaultCategoryCapitalised) {
+    // Capitalised
+    return this.defaultCategoryCapitalised;
+  }
+  else {
+    // If not found assign default_category
+    return this.defaultCategory;
+  }
+};
+
 // Returns a list of categories for word
 Lexicon.prototype.tagWord = function(word) {
   var categories = this.lexicon[word];
-  if (!categories) {
+  //console.log(categories);
+  if (!categories || (typeof categories == "function")) {
     categories = this.lexicon[word.toLowerCase()];
   }
-  if (!categories) {
-    if (/[A-Z]/.test(word[0]) && this.defaultCategoryCapitalised) {
-      // Capitalised
-      categories = [this.defaultCategoryCapitalised];
-    }
-    else {
-      // If not found assign default_category
-      categories = [this.defaultCategory];
-    }
+  if (!categories || (typeof categories == "function")) {
+    categories = [this.tagWordWithDefaults(word)];
   }
   return(categories);
 };
@@ -105,6 +110,10 @@ Lexicon.prototype.nrEntries = function() {
   return Object.keys(this.lexicon).length;
 };
 
+Lexicon.prototype.size = function() {
+  return this.nrEntries();
+};
+
 Lexicon.prototype.setDefaultCategories = function(category, categoryCapitalised) {
   this.defaultCategory = category;
   if (categoryCapitalised) {

package/lib/natural/brill_pos_tagger/lib/Predicate.js

@@ -38,10 +38,10 @@ function Predicate(name, parameter1, parameter2) {
   //logger.debug('Predicate\n' + JSON.toString(this.meta, null, 2));
 }
 
-Predicate.prototype.evaluate = function(tagged_sentence, position) {
+Predicate.prototype.evaluate = function(sentence, position) {
   //logger.debug('Predicate.evalute ' + this.name);
   var predicate = this.meta.function;
-  return (predicate(tagged_sentence, position, this.parameter1, this.parameter2));
+  return (predicate(sentence, position, this.parameter1, this.parameter2));
 };
 
 module.exports = Predicate;

package/lib/natural/brill_pos_tagger/lib/RuleTemplate.js

@@ -23,9 +23,9 @@ function RuleTemplate(templateName, metadata) {
 
 RuleTemplate.prototype.windowFitsSite = function(sentence, i) {
   return ((i + this.meta.window[0] >= 0) &&
-    (i + this.meta.window[0] < sentence.length) &&
+    (i + this.meta.window[0] < sentence.taggedWords.length) &&
     (i + this.meta.window[1] >= 0) &&
-    (i + this.meta.window[1] < sentence.length));
+    (i + this.meta.window[1] < sentence.taggedWords.length));
 };
 
 module.exports = RuleTemplate;