natural 6.10.0 → 6.10.3

package/lib/natural/classifiers/maxent/POS/POS_Element.js

@@ -23,152 +23,147 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
 'use strict'
 
-const util = require('util')
 const Element = require('../Element')
 const Feature = require('../Feature')
 
-function POSElement (a, b) {
-  POSElement.super_.call(this, a, b)
-}
-
-util.inherits(POSElement, Element)
-
-POSElement.prototype.generateFeatures = function (featureSet) {
-  const context = this.b.data
-  const tag = this.a
-  const token = context.wordWindow['0']
+class POSElement extends Element {
+  generateFeatures (featureSet) {
+    const context = this.b.data
+    const tag = this.a
+    const token = context.wordWindow['0']
 
-  // Feature for the current word
-  function currentWord (x) {
-    if ((x.b.data.wordWindow['0'] === token) &&
-        (x.a === tag)) {
-      return 1
-    }
-    return 0
-  }
-  featureSet.addFeature(new Feature(currentWord, 'wordFeature', ['0', token, '0', tag]))
-
-  // Feature for previous bigram (previous two tags), positions -2, -1
-  if (context.tagWindow['-2']) {
-    const prevPrevTag = context.tagWindow['-2']
-    const prevTag = context.tagWindow['-1']
-    function prevBigram (x) {
-      if ((x.a === tag) &&
-          (x.b.data.tagWindow['-2'] === prevPrevTag) &&
-          (x.b.data.tagWindow['-1'] === prevTag)) {
+    // Feature for the current word
+    function currentWord (x) {
+      if ((x.b.data.wordWindow['0'] === token) &&
+          (x.a === tag)) {
         return 1
       }
       return 0
     }
-    featureSet.addFeature(new Feature(prevBigram, 'prevBigram', ['0', tag, '-2', prevPrevTag, '-1', prevTag]))
-  }
-
-  /*
-  // Feature for left bigram, positions -1, 0
-  if (context.tagWindow["-1"]) {
-    var prevTag = context.tagWindow["-1"];
-    function leftBigram(x) {
-      if ((x.b.data.tagWindow["-1"] === prevTag) &&
-          (x.a === tag)) {
-          return 1;
+    featureSet.addFeature(new Feature(currentWord, 'wordFeature', ['0', token, '0', tag]))
+
+    // Feature for previous bigram (previous two tags), positions -2, -1
+    if (context.tagWindow['-2']) {
+      const prevPrevTag = context.tagWindow['-2']
+      const prevTag = context.tagWindow['-1']
+      function prevBigram (x) {
+        if ((x.a === tag) &&
+            (x.b.data.tagWindow['-2'] === prevPrevTag) &&
+            (x.b.data.tagWindow['-1'] === prevTag)) {
+          return 1
         }
-      return 0;
+        return 0
+      }
+      featureSet.addFeature(new Feature(prevBigram, 'prevBigram', ['0', tag, '-2', prevPrevTag, '-1', prevTag]))
     }
-    featureSet.addFeature(new Feature(leftBigram, "leftBigram", ["0", tag, "-1", prevTag]));
-  }
-*/
 
-  /*
-
-  // Feature for right bigram, positions 0, 1
-  if (context.tagWindow["1"]) {
-    var nextTag = context.tagWindow["1"];
-    function rightBigram(x) {
-      if ((x.a === tag) &&
-          (x.b.data.tagWindow["1"] === nextTag)) {
-          return 1;
-        }
-      return 0;
+    /*
+    // Feature for left bigram, positions -1, 0
+    if (context.tagWindow["-1"]) {
+      var prevTag = context.tagWindow["-1"];
+      function leftBigram(x) {
+        if ((x.b.data.tagWindow["-1"] === prevTag) &&
+            (x.a === tag)) {
+            return 1;
+          }
+        return 0;
+      }
+      featureSet.addFeature(new Feature(leftBigram, "leftBigram", ["0", tag, "-1", prevTag]));
     }
-    featureSet.addFeature(new Feature(rightBigram, "rightBigram", ["0", tag, "1", nextTag]));
-  }
-*/
-  /*
-  // Feature for next bigram (next two tags), positions 1 and 2
-  if (context.tagWindow["2"]) {
-    var nextTag = context.tagWindow["1"];
-    var nextNextTag = context.tagWindow["2"];
-    function nextBigram(x) {
-      if ((x.a === tag) &&
-          (x.b.data.tagWindow["1"] === nextTag) &&
-          (x.b.data.tagWindow["2"] === nextNextTag)) {
-          return 1;
-        }
-      return 0;
+  */
+
+    /*
+
+    // Feature for right bigram, positions 0, 1
+    if (context.tagWindow["1"]) {
+      var nextTag = context.tagWindow["1"];
+      function rightBigram(x) {
+        if ((x.a === tag) &&
+            (x.b.data.tagWindow["1"] === nextTag)) {
+            return 1;
+          }
+        return 0;
+      }
+      featureSet.addFeature(new Feature(rightBigram, "rightBigram", ["0", tag, "1", nextTag]));
     }
-    featureSet.addFeature(new Feature(nextBigram, "nextBigram", ["0", tag, "1", nextTag, "2", nextNextTag]));
-  }
-
-  // Feature that looks at the left bigram words
-  if (context.wordWindow["-1"]) {
-    var prevWord = context.wordWindow["-1"];
-    function leftBigramWords(x) {
-      if ((x.a === tag) &&
-          (x.b.data.wordWindow["0"] === token) &&
-          (x.b.data.wordWindow["-1"] === prevWord)) {
-          return 1;
-        }
-      return 0;
+  */
+    /*
+    // Feature for next bigram (next two tags), positions 1 and 2
+    if (context.tagWindow["2"]) {
+      var nextTag = context.tagWindow["1"];
+      var nextNextTag = context.tagWindow["2"];
+      function nextBigram(x) {
+        if ((x.a === tag) &&
+            (x.b.data.tagWindow["1"] === nextTag) &&
+            (x.b.data.tagWindow["2"] === nextNextTag)) {
+            return 1;
+          }
+        return 0;
+      }
+      featureSet.addFeature(new Feature(nextBigram, "nextBigram", ["0", tag, "1", nextTag, "2", nextNextTag]));
     }
-    featureSet.addFeature(new Feature(leftBigramWords, "leftBigramWords", ["0", tag, "0", token, "-1", prevWord]));
-  }
 
-  // Feature that looks at the right bigram words
-  if (context.wordWindow["1"]) {
-    var nextWord = context.wordWindow["1"];
-    function rightBigramWords(x) {
-      if ((x.a === tag) &&
-          (x.b.data.wordWindow["0"] === token) &&
-          (x.b.data.wordWindow["1"] === nextWord)) {
-          return 1;
-        }
-      return 0;
+    // Feature that looks at the left bigram words
+    if (context.wordWindow["-1"]) {
+      var prevWord = context.wordWindow["-1"];
+      function leftBigramWords(x) {
+        if ((x.a === tag) &&
+            (x.b.data.wordWindow["0"] === token) &&
+            (x.b.data.wordWindow["-1"] === prevWord)) {
+            return 1;
+          }
+        return 0;
+      }
+      featureSet.addFeature(new Feature(leftBigramWords, "leftBigramWords", ["0", tag, "0", token, "-1", prevWord]));
     }
-    featureSet.addFeature(new Feature(rightBigramWords, "rightBigramWords", ["0", tag, "0", token, "1", nextWord]));
-  }
-*/
 
-  // Feature that looks at the previous word and its category
-  if (context.wordWindow['-1']) {
-    const prevWord = context.wordWindow['-1']
-    const prevTag = context.tagWindow['-1']
-    function prevWordAndCat (x) {
-      if ((x.a === tag) &&
-          (x.b.data.wordWindow['-1'] === prevWord) &&
-          (x.b.data.tagWindow['-1'] === prevTag)) {
-        return 1
+    // Feature that looks at the right bigram words
+    if (context.wordWindow["1"]) {
+      var nextWord = context.wordWindow["1"];
+      function rightBigramWords(x) {
+        if ((x.a === tag) &&
+            (x.b.data.wordWindow["0"] === token) &&
+            (x.b.data.wordWindow["1"] === nextWord)) {
+            return 1;
+          }
+        return 0;
       }
-      return 0
+      featureSet.addFeature(new Feature(rightBigramWords, "rightBigramWords", ["0", tag, "0", token, "1", nextWord]));
     }
-    featureSet.addFeature(new Feature(prevWordAndCat, 'prevWordAndCat', ['0', tag, '-1', prevWord, '-1', prevTag]))
-  }
-
-/*
-  // Feature that looks at the next word and its category
-  if (context.wordWindow["1"]) {
-    var nextWord = context.wordWindow["1"];
-    var nextTag = context.tagWindow["1"];
-    function nextWordAndCat(x) {
-      if ((x.a === tag) &&
-          (x.b.data.wordWindow["1"] === nextWord) &&
-          (x.b.data.tagWindow["1"] === nextTag)) {
-          return 1;
+  */
+
+    // Feature that looks at the previous word and its category
+    if (context.wordWindow['-1']) {
+      const prevWord = context.wordWindow['-1']
+      const prevTag = context.tagWindow['-1']
+      function prevWordAndCat (x) {
+        if ((x.a === tag) &&
+            (x.b.data.wordWindow['-1'] === prevWord) &&
+            (x.b.data.tagWindow['-1'] === prevTag)) {
+          return 1
         }
-      return 0;
+        return 0
+      }
+      featureSet.addFeature(new Feature(prevWordAndCat, 'prevWordAndCat', ['0', tag, '-1', prevWord, '-1', prevTag]))
     }
-    featureSet.addFeature(new Feature(nextWordAndCat, "nextWordAndCat", ["0", tag, "1", nextWord, "1", nextTag]));
+
+  /*
+    // Feature that looks at the next word and its category
+    if (context.wordWindow["1"]) {
+      var nextWord = context.wordWindow["1"];
+      var nextTag = context.tagWindow["1"];
+      function nextWordAndCat(x) {
+        if ((x.a === tag) &&
+            (x.b.data.wordWindow["1"] === nextWord) &&
+            (x.b.data.tagWindow["1"] === nextTag)) {
+            return 1;
+          }
+        return 0;
+      }
+      featureSet.addFeature(new Feature(nextWordAndCat, "nextWordAndCat", ["0", tag, "1", nextWord, "1", nextTag]));
+    }
+  */
   }
-*/
 }
 
 module.exports = POSElement

package/lib/natural/classifiers/maxent/Sample.js

@@ -27,117 +27,119 @@ const Context = require('./Context')
 
 const fs = require('fs')
 
-function Sample (elements) {
-  this.frequencyOfContext = {}
-  this.frequency = {}
-  this.classes = []
-  if (elements) {
-    this.elements = elements
-    this.analyse()
-  } else {
-    this.elements = []
+class Sample {
+  constructor (elements) {
+    this.frequencyOfContext = {}
+    this.frequency = {}
+    this.classes = []
+    if (elements) {
+      this.elements = elements
+      this.analyse()
+    } else {
+      this.elements = []
+    }
   }
-}
 
-// Extracts classes and frequencies
-Sample.prototype.analyse = function () {
-  const that = this
-  this.elements.forEach(function (x) {
-    if (this.classes.indexOf(x.a) === -1) {
-      this.classes.push(x.a)
+  // Extracts classes and frequencies
+  analyse () {
+    const that = this
+    this.elements.forEach(function (x) {
+      if (this.classes.indexOf(x.a) === -1) {
+        this.classes.push(x.a)
+      }
+      if (!that.frequencyOfContext[x.b.toString()]) {
+        that.frequencyOfContext[x.b.toString()] = 0
+      }
+      that.frequencyOfContext[x.b.toString()]++
+      if (!that.frequency[x.toString()]) {
+        that.frequency[x.toString()] = 0
+      }
+      that.frequency[x.toString()]++
+    })
+  }
+
+  addElement (x) {
+    this.elements.push(x)
+    // Update frequencies
+    if (!this.frequencyOfContext[x.b.toString()]) {
+      this.frequencyOfContext[x.b.toString()] = 0
     }
-    if (!that.frequencyOfContext[x.b.toString()]) {
-      that.frequencyOfContext[x.b.toString()] = 0
+    this.frequencyOfContext[x.b.toString()]++
+    if (!this.frequency[x.toString()]) {
+      this.frequency[x.toString()] = 0
     }
-    that.frequencyOfContext[x.b.toString()]++
-    if (!that.frequency[x.toString()]) {
-      that.frequency[x.toString()] = 0
+    this.frequency[x.toString()]++
+    // Update classes
+    if (this.classes.indexOf(x.a) === -1) {
+      this.classes.push(x.a)
     }
-    that.frequency[x.toString()]++
-  })
-}
-
-Sample.prototype.addElement = function (x) {
-  this.elements.push(x)
-  // Update frequencies
-  if (!this.frequencyOfContext[x.b.toString()]) {
-    this.frequencyOfContext[x.b.toString()] = 0
-  }
-  this.frequencyOfContext[x.b.toString()]++
-  if (!this.frequency[x.toString()]) {
-    this.frequency[x.toString()] = 0
   }
-  this.frequency[x.toString()]++
-  // Update classes
-  if (this.classes.indexOf(x.a) === -1) {
-    this.classes.push(x.a)
-  }
-}
 
-Sample.prototype.observedProbabilityOfContext = function (context) {
-  if (this.frequencyOfContext[context.toString()]) {
-    return this.frequencyOfContext[context.toString()] / this.elements.length
-  } else {
-    return 0
+  observedProbabilityOfContext (context) {
+    if (this.frequencyOfContext[context.toString()]) {
+      return this.frequencyOfContext[context.toString()] / this.elements.length
+    } else {
+      return 0
+    }
   }
-}
 
-Sample.prototype.observedProbability = function (x) {
-  if (this.frequency[x.toString()]) {
-    return this.frequency[x.toString()] / this.elements.length
-  } else {
-    return 0
+  observedProbability (x) {
+    if (this.frequency[x.toString()]) {
+      return this.frequency[x.toString()] / this.elements.length
+    } else {
+      return 0
+    }
   }
-}
-
-Sample.prototype.size = function () {
-  return this.elements.length
-}
 
-Sample.prototype.getClasses = function () {
-  return this.classes
-}
+  size () {
+    return this.elements.length
+  }
 
-Sample.prototype.generateFeatures = function (featureSet) {
-  this.elements.forEach(function (x) {
-    x.generateFeatures(featureSet)
-  })
-}
+  getClasses () {
+    return this.classes
+  }
 
-Sample.prototype.save = function (filename, callback) {
-  const sample = this
-  const data = JSON.stringify(this, null, 2)
-  fs.writeFile(filename, data, 'utf8', function (err) {
-    // console.log('Sample written')
-    if (callback) {
-      callback(err, err ? null : sample)
-    }
-  })
-}
+  generateFeatures (featureSet) {
+    this.elements.forEach(function (x) {
+      x.generateFeatures(featureSet)
+    })
+  }
 
-// Loads a sample from file and revives the right classes, i.e. Sample and
-// Element classes.
-Sample.prototype.load = function (filename, ElementClass, callback) {
-  fs.readFile(filename, 'utf8', function (err, data) {
-    if (!err) {
-      const sampleData = JSON.parse(data)
-      const sample = new Sample()
-      sampleData.elements.forEach(function (elementData) {
-        const elt = new ElementClass(elementData.a, new Context(elementData.b.data))
-        sample.addElement(elt)
-      })
-      if (!sample.frequency || !sample.frequencyOfContext) {
-        sample.analyse()
-      }
+  save (filename, callback) {
+    const sample = this
+    const data = JSON.stringify(this, null, 2)
+    fs.writeFile(filename, data, 'utf8', function (err) {
+      // console.log('Sample written')
       if (callback) {
-        callback(err, sample)
+        callback(err, err ? null : sample)
       }
-    } else {
-      if (callback) {
-        callback(err)
+    })
+  }
+
+  // Loads a sample from file and revives the right classes, i.e. Sample and
+  // Element classes.
+  load (filename, ElementClass, callback) {
+    fs.readFile(filename, 'utf8', function (err, data) {
+      if (!err) {
+        const sampleData = JSON.parse(data)
+        const sample = new Sample()
+        sampleData.elements.forEach(function (elementData) {
+          const elt = new ElementClass(elementData.a, new Context(elementData.b.data))
+          sample.addElement(elt)
+        })
+        if (!sample.frequency || !sample.frequencyOfContext) {
+          sample.analyse()
+        }
+        if (callback) {
+          callback(err, sample)
+        }
+      } else {
+        if (callback) {
+          callback(err)
+        }
       }
-    }
-  })
+    })
+  }
 }
 
 module.exports = Sample

package/lib/natural/classifiers/maxent/SimpleExample/SE_Element.js

@@ -23,33 +23,27 @@ THE SOFTWARE.
 
 'use strict'
 
-const util = require('util')
-
 const Element = require('../Element')
 const Feature = require('../Feature')
 
-function SEElement (a, b) {
-  SEElement.super_.call(this, a, b)
-}
-
-util.inherits(SEElement, Element)
-
-SEElement.prototype.generateFeatures = function (featureSet) {
-  function isZero (x) {
-    if ((x.a === 'x') && (x.b.data === '0')) {
-      return 1
+class SEElement extends Element {
+  generateFeatures (featureSet) {
+    function isZero (x) {
+      if ((x.a === 'x') && (x.b.data === '0')) {
+        return 1
+      }
+      return 0
     }
-    return 0
-  }
-  featureSet.addFeature(new Feature(isZero, 'isZero', ['0']))
+    featureSet.addFeature(new Feature(isZero, 'isZero', ['0']))
 
-  function isOne (x) {
-    if ((x.a === 'y') && (x.b.data === '1')) {
-      return 1
+    function isOne (x) {
+      if ((x.a === 'y') && (x.b.data === '1')) {
+        return 1
+      }
+      return 0
     }
-    return 0
+    featureSet.addFeature(new Feature(isOne, 'isOne', ['1']))
   }
-  featureSet.addFeature(new Feature(isOne, 'isOne', ['1']))
 }
 
 module.exports = SEElement

package/lib/natural/inflectors/fr/count_inflector.js

@@ -26,7 +26,7 @@ THE SOFTWARE.
  * Numeral inflector for French.
  * @see http://fr.wikipedia.org/wiki/Ier_si%C3%A8cle
  *
- * Also handles roman numerals as a bonus. The rules are the same than for their
+ * Also handles roman numerals as a bonus. The rules are the same as for their
  * arabic numerals equivalent.
  *
  * \@todo Add inflector for gender and number. Ex: