natural 6.11.1 → 7.0.0

package/.env

@@ -1,12 +1,13 @@
+NODE_PATH=.
 # Storage backend you want to use
 NATURAL_STORAGE=PG
 # Settings for Postgres
-PG_USER=user
-PG_PASSWORD=password
-PG_DATABASE=naturaldb
-PG_HOST=localhost
-PG_PORT=5432
-PG_TABLE=naturaltable
+POSTGRES_USER=user
+POSTGRES_PASSWORD=password
+POSTGRES_DB=naturaldb
+POSTGRES_HOST=localhost
+POSTGRES_PORT=5432
+POSTGRES_TABLE=naturaltable
 # Settings for Redis
 REDIS_HOST=localhost
 REDIS_PORT=6379
@@ -18,5 +19,6 @@ MEM_EXPIRES = 3600
 MONGO_HOST=localhost
 MONGO_PORT=27017
 MONGO_DATABASE=naturaldb
+MONGO_OBJECTMODEL=NaturalObjectModel
 # Path to the folder writing files 
-FS_PATH=.
+FS_PATH=./io_spec/tmp

package/.eslintrc.json

@@ -0,0 +1,13 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es2021": true
+    },
+    "extends": "standard-with-typescript",
+    "parserOptions": {
+        "ecmaVersion": "latest"
+    },
+    "rules": {
+    }
+}

package/.github/workflows/node.js.yml

@@ -1,35 +1,73 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
+# This workflow will do a clean install of node dependencies, 
+# build the source code and run tests across different versions of node
+# For more information see: 
+# https://help.github.com/actions/language-and-framework-guides/
+# using-nodejs-with-github-actions
+---
 name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
+    services:
+      redis:
+        image: redis:latest
+        ports:
+          - 6379:6379
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: naturaldb
+          POSTGRES_HOST: localhost
+          POSTGRES_PORT: 5432
+          POSTGRES_TABLE: naturaltable
+        ports:
+          - 5432:5432  
+      memcached:
+        image: memcached:latest
+        ports:
+          - 11211:11211
+      mongodb:
+        image: mongo:latest
+        ports:
+          - 27017:27017
+
     strategy:
       matrix:
         node-version: [16.x, 18.x, 20.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        # See supported Node.js release schedule at 
+        #https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm run build --if-present
-    - run: npm run coverage
-    # Save coverage report in Coveralls
-    - name: Coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Clean install
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+    
+      - name: Run Istanbul coverage
+        run: npm run coverage
+
+      # Save coverage report in Coveralls
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

package/lib/natural/analyzers/SenType.ts

@@ -0,0 +1,30 @@
+/*
+Copyright (c) 2024,
+Hugo W.L. ter Doest <https://github.com/Hugo-ter-Doest>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+export const enum SenType {
+  Unknown = 'UNKNOWN',
+  Command = 'COMMAND',
+  Interrogative = 'INTERROGATIVE',
+  Exclamatory = 'EXCLAMATORY',
+  Declarative = 'DECLARATIVE'
+}

package/lib/natural/analyzers/index.d.ts

@@ -21,15 +21,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+import type { SenType } from './SenType'
+
 declare interface TaggedWord {
   token: string
   pos: string
   pp?: boolean
   spos?: string
   added?: boolean
+  [key: string]: any
 }
 
-declare type PunctuationFunction = () => string[] | ''
+declare type PunctuationMapping = Array<Record<string, string>> | ''
+declare type PunctuationFunction = () => PunctuationMapping
 
 declare interface TaggedSentence {
   tags: TaggedWord[]
@@ -38,14 +42,6 @@ declare interface TaggedSentence {
 
 declare type CallbackFunction = (obj: SentenceAnalyzer) => void
 
-declare enum SenType {
-  Unknown = 'UNKNOWN',
-  Command = 'COMMAND',
-  Interrogative = 'INTERROGATIVE',
-  Exclamatory = 'EXCLAMATORY',
-  Declarative = 'DECLARATIVE',
-}
-
 export class SentenceAnalyzer {
   posObj: TaggedSentence
   senType: SenType | null
@@ -57,5 +53,5 @@ export class SentenceAnalyzer {
   predicateToString (): string
   implicitYou (): boolean
   toString (): string
-  type (cbf: CallbackFunction): SenType
+  type (cbf: CallbackFunction): string
 }

package/lib/natural/brill_pos_tagger/index.d.ts

@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-import { Feature } from '../classifiers'
+import type { Feature } from '../classifiers'
 
 declare interface RuleTemplatesItem {
   function: (sentence: Sentence, i: number, parameter1?: string, parameter2?: string) => boolean
@@ -33,9 +33,8 @@ declare interface RuleTemplatesItem {
   parameter2Values?: (sentence: Sentence, i: number) => string[]
 }
 
-export interface RuleTemplates {
-  [key: string]: RuleTemplatesItem | undefined
-}
+export type RuleTemplates = Record<string, RuleTemplatesItem>
+export let ruleTemplates: RuleTemplates
 
 export class RuleTemplate {
   constructor (templateName: string, metadata: RuleTemplatesItem)
@@ -82,7 +81,7 @@ export class RuleSet {
 
 export class Lexicon {
   constructor (language: string, defaultCategory: string, defaultCategoryCapitalised?: string)
-  lexicon: { [key: string]: string[] | undefined }
+  lexicon: Record<string, string[] | undefined>
   defaultCategory: string
   defaultCategoryCapitalised: string | undefined
   parseLexicon (data: string): void
@@ -96,11 +95,11 @@ export class Lexicon {
 }
 
 declare class Corpus {
-  constructor (data: string | Corpus, typeOfCorpus: number, SentenceClass: typeof Sentence)
+  constructor (data: string | TaggedCorpus, typeOfCorpus: number, SentenceClass: typeof Sentence)
   private readonly wordCount: number
   private readonly sentences: Sentence[]
-  private readonly tagFrequencies: { [key: string]: string[] | undefined }
-  private readonly posTags: { [key: string]: string[] | undefined }
+  private readonly tagFrequencies: Record<string, Record<string, number> | undefined>
+  private readonly posTags: Record<string, boolean | undefined>
   parseBrownCorpus (data: string, SentenceClass: typeof Sentence): void
   getTags (): string[]
   splitInTrainAndTest (percentageTrain: number): [Corpus, Corpus]
@@ -119,6 +118,15 @@ declare interface BrillPOSTaggedWord {
   tag: string
 }
 
+declare interface BrillPOSTaggedSentence {
+  taggedWords: BrillPOSTaggedWord[]
+}
+
+declare interface TaggedCorpus {
+  wordCount: number
+  sentences: BrillPOSTaggedSentence[]
+}
+
 export class Sentence {
   constructor (data?: string[])
   taggedWords: BrillPOSTaggedWord[]
@@ -136,9 +144,6 @@ export class BrillPOSTagger {
 }
 
 export class BrillPOSTester {
-  constructor (lexicon: Lexicon, ruleSet: RuleSet)
-  private readonly lexicon: Lexicon
-  private readonly ruleSet: RuleSet
   test (corpus: Corpus, tagger: BrillPOSTagger): [number, number]
 }
 
@@ -148,8 +153,8 @@ export class BrillPOSTrainer {
   private readonly corpus: Corpus
   private readonly templates: RuleTemplates
   private readonly positiveRules: RuleSet
-  private readonly mapRuleToSites: { [key: string]: { [key: number ]: { [key: number ]: boolean | undefined } | undefined } | undefined }
-  private readonly mapSiteToRules: { [key: number]: { [key: number ]: { [key: string ]: TransformationRule | undefined } | undefined } | undefined }
+  private readonly mapRuleToSites: Record<string, Record<number, Record< number, boolean | undefined> | undefined> | undefined>
+  private readonly mapSiteToRules: Record<number, Record<number, Record<string, boolean | undefined> | undefined> | undefined>
   private selectHighRule (): TransformationRule
   private mapRuleToSite (rule: TransformationRule, i: number, j: number): void
   private mapSiteToRule (i: number, j: number, rule: TransformationRule): void
@@ -163,6 +168,10 @@ export class BrillPOSTrainer {
   private scanForPositiveRules (): void
   private scanForSites (): void
   private neighbourhood (i: number, j: number): Array<[number, number]>
-  train (corpus: Corpus, templates: RuleTemplates, lexicon: Lexicon): RuleSet
+  train (corpus: Corpus, templates: RuleTemplate[], lexicon: Lexicon): RuleSet
   printRulesWithScores (): string
 }
+
+export interface TagResults {
+  results: string[][][]
+}

package/lib/natural/brill_pos_tagger/index.js

@@ -27,7 +27,7 @@ exports.BrillPOSTrainer = require('./lib/Brill_POS_Trainer')
 exports.BrillPOSTester = require('./lib/Brill_POS_Tester')
 exports.Lexicon = require('./lib/Lexicon')
 exports.RuleSet = require('./lib/RuleSet')
-exports.RuleTemplates = require('./lib/RuleTemplates')
+exports.ruleTemplates = require('./lib/RuleTemplates')
 exports.RuleTemplate = require('./lib/RuleTemplate')
 exports.Corpus = require('./lib/Corpus')
 exports.Sentence = require('./lib/Sentence')

package/lib/natural/classifiers/bayes_classifier.js

@@ -44,7 +44,7 @@ class BayesClassifier extends Classifier {
   }
 
   static load (filename, stemmer, callback) {
-    Classifier.load(filename, function (err, classifier) {
+    Classifier.load(filename, stemmer, function (err, classifier) {
       if (err) {
         return callback(err)
       } else {
@@ -52,6 +52,11 @@ class BayesClassifier extends Classifier {
       }
     })
   }
+
+  static async loadFrom (key, stemmer, storageBackend) {
+    const classifier = await Classifier.loadFrom(key, storageBackend)
+    return BayesClassifier.restore(classifier, stemmer)
+  }
 }
 
 module.exports = BayesClassifier

package/lib/natural/classifiers/classifier.js

@@ -21,6 +21,7 @@ THE SOFTWARE.
 */
 
 'use strict'
+const fs = require('fs')
 
 const EventEmitter = require('events')
 const PorterStemmer = require('../stemmers/porter_stemmer')
@@ -34,6 +35,12 @@ class Classifier extends EventEmitter {
     this.features = {}
     this.stemmer = stemmer || PorterStemmer
     this.lastAdded = 0
+
+    // Add methods for parallel training
+    this.Threads = parallelTrainer.Threads
+    this.trainParallel = parallelTrainer.trainParallel
+    this.retrainParallel = parallelTrainer.retrainParallel
+    this.trainParallelBatches = parallelTrainer.trainParallelBatches
   }
 
   addDocument (text, classification) {
@@ -54,7 +61,7 @@ class Classifier extends EventEmitter {
 
     this.docs.push({
       label: classification,
-      text: text
+      text
     })
 
     for (let i = 0; i < text.length; i++) {
@@ -114,8 +121,8 @@ class Classifier extends EventEmitter {
       this.emit('trainedWithDocument', { index: i, total: totalDocs, doc: this.docs[i] })
       this.lastAdded++
     }
-    this.emit('doneTraining', true)
     this.classifier.train()
+    this.emit('doneTraining', true)
   }
 
   retrain () {
@@ -139,7 +146,6 @@ class Classifier extends EventEmitter {
 
   save (filename, callback) {
     const data = JSON.stringify(this)
-    const fs = require('fs')
     const classifier = this
     fs.writeFile(filename, data, 'utf8', function (err) {
       if (callback) {
@@ -148,9 +154,7 @@ class Classifier extends EventEmitter {
     })
   }
 
-  static load (filename, callback) {
-    const fs = require('fs')
-
+  static load (filename, stemmer, callback) {
     if (!callback) {
       return
     }
@@ -159,40 +163,23 @@ class Classifier extends EventEmitter {
         callback(err, null)
       } else {
         const classifier = JSON.parse(data)
-        callback(err, classifier)
+        callback(err, Classifier.restore(classifier, stemmer))
       }
     })
   }
 
-  setOptions (options) {
-    this.keepStops = !!(options.keepStops)
+  async saveTo (storageBackend) {
+    return await storageBackend.store(this)
   }
 
-  ClassifiertrainParallel (numThreads, callback) {
-    if (parallelTrainer.Threads) {
-      return parallelTrainer.trainParallel(numThreads, callback)
-    } else {
-      this.emit('No threads available')
-      return this.train()
-    }
+  static async loadFrom (key, storageBackend) {
+    const obj = await storageBackend.retrieve(key)
+    Object.setPrototypeOf(obj, Classifier.prototype)
+    return obj
   }
 
-  trainParallelBatches (options) {
-    if (parallelTrainer.Threads) {
-      return parallelTrainer.trainParallelBatches(options)
-    } else {
-      this.emit('No threads available')
-      return this.train()
-    }
-  }
-
-  retrainParallel (numThreads, callback) {
-    if (parallelTrainer.Threads) {
-      return parallelTrainer.trainParallel(numThreads, callback)
-    } else {
-      this.emit('No threads available')
-      return this.retrain()
-    }
+  setOptions (options) {
+    this.keepStops = !!(options.keepStops)
   }
 }
 

package/lib/natural/classifiers/classifier_train_parallel.js

@@ -5,8 +5,8 @@ let Threads = null
 try {
   Threads = require('webworker-threads')
 } catch (e) {
-  // Since webworker-threads are optional, only thow if the module is found
-  if (e.code !== 'MODULE_NOT_FOUND') throw e
+  // Silently set Threads to null
+  Threads = null
 }
 
 function checkThreadSupport () {
@@ -27,7 +27,7 @@ function docsToFeatures (docs) {
 
     parsedDocs.push({
       index: docs[i].index,
-      features: features
+      features
     })
   }
 
@@ -44,7 +44,7 @@ function docsToObs (docs, lastAdded, stemmer, keepStops) {
     }
     obsDocs.push({
       index: i,
-      observation: observation
+      observation
     })
   }
   return obsDocs
@@ -181,7 +181,7 @@ function trainParallelBatches (options) {
     if (typeof observation === 'string') { observation = this.stemmer.tokenizeAndStem(observation, this.keepStops) }
     obsDocs.push({
       index: i,
-      observation: observation
+      observation
     })
   }
 
@@ -266,6 +266,8 @@ function trainParallelBatches (options) {
 }
 
 function retrainParallel (numThreads, callback) {
+  checkThreadSupport()
+
   this.classifier = new (this.classifier.constructor)()
   this.lastAdded = 0
   this.trainParallel(numThreads, callback)

package/lib/natural/classifiers/index.d.ts

@@ -1,6 +1,7 @@
 import events from 'events'
-import { Corpus, Sentence } from '../brill_pos_tagger'
-import { Stemmer } from '../stemmers'
+import type { Corpus, Sentence } from '../brill_pos_tagger'
+import type { Stemmer } from '../stemmers'
+import type { StorageBackend } from '../util'
 
 // Start apparatus declarations
 
@@ -19,7 +20,8 @@ declare interface ApparatusClassification {
   value: number
 }
 
-declare type ApparatusObservation = number[] | { [key: string]: number | string | boolean | undefined }
+// Observations are either array of numbers or a sparse vector in the form of a map
+declare type ApparatusObservation = number[] | Record<string, number | string | boolean>
 
 declare class ApparatusClassifier {
   addExample (observation: ApparatusObservation, label: string): void
@@ -31,8 +33,8 @@ declare class ApparatusClassifier {
 // TODO: Not needed for natural repository, but could be moved to
 // aparatus repository. Temporarily leaving here for copypasta.
 declare class ApparatusBayesClassifier extends ApparatusClassifier {
-  classFeatures: { [key: string]: { [key: number]: number | undefined } | undefined }
-  classTotals: { [key: string]: number | undefined }
+  classFeatures: Record<string, Record<number, number>>
+  classTotals: Record<string, number>
   totalExamples: number
   smoothing: number
 
@@ -45,8 +47,8 @@ declare class ApparatusBayesClassifier extends ApparatusClassifier {
 // TODO: Not needed for natural repository, but could be moved to
 // aparatus repository. Temporarily leaving here for copypasta.
 declare class ApparatusLogisticRegressionClassifier extends ApparatusClassifier {
-  examples: { [key: string]: number[] | undefined }
-  // TODO: These appear used
+  examples: Record<string, ApparatusObservation>
+  // TODO: These appear unused
   // features: any[]
   // featurePositions: { [key: string]: any | undefined }
   maxFeaturePosition: number
@@ -71,11 +73,12 @@ declare interface ClassifierOptions {
 }
 
 declare type ClassifierCallback = (err: NodeJS.ErrnoException | null, classifier?: ClassifierBase) => void
+declare type ParallelTrainerCallback = (err: NodeJS.ErrnoException | null) => void
 
 declare class ClassifierBase extends events.EventEmitter {
   classifier: ApparatusClassifier
   docs: ClassifierDoc[]
-  features: { [key: string]: number | undefined }
+  features: Record<string, number>
   stemmer: Stemmer
   lastAdded: number
 
@@ -89,14 +92,26 @@ declare class ClassifierBase extends events.EventEmitter {
   classify (observation: string | string[]): string
   setOptions (options: ClassifierOptions): void
   save (filename: string, callback?: ClassifierCallback): void
+  static load (filename: string, stemmer: Stemmer | null | undefined, callback: ClassifierCallback): void
+  saveTo (storage: StorageBackend): string
+  static loadFrom (storage: StorageBackend): ClassifierBase
+
+  Threads: any
+  trainParallel (numThreads: number, callback: ParallelTrainerCallback): void
+  trainParallelBatches (options: { numThreads: number, batchSize: number }): void
+  retrainParallel (numThreads: number, callback: ParallelTrainerCallback): void
 }
 
 declare type BayesClassifierCallback = (err: NodeJS.ErrnoException | null, classifier?: BayesClassifier) => void
 
 export class BayesClassifier extends ClassifierBase {
+  classifier: ApparatusBayesClassifier
+
   constructor (stemmer?: Stemmer, smoothing?: number)
   static load (filename: string, stemmer: Stemmer | null | undefined, callback: BayesClassifierCallback): void
-  static restore (classifier: BayesClassifier, stemmer?: Stemmer): BayesClassifier
+  static restore (classifier: Record<string, unknown>, stemmer?: Stemmer): BayesClassifier
+  saveTo (storage: StorageBackend): string
+  static loadFrom (storage: StorageBackend): ClassifierBase
 }
 
 declare type LogisticRegressionClassifierCallback = (err: NodeJS.ErrnoException | null, classifier?: LogisticRegressionClassifier) => void
@@ -104,19 +119,22 @@ declare type LogisticRegressionClassifierCallback = (err: NodeJS.ErrnoException
 export class LogisticRegressionClassifier extends ClassifierBase {
   constructor (stemmer?: Stemmer)
   static load (filename: string, stemmer: Stemmer | null | undefined, callback: LogisticRegressionClassifierCallback): void
-  static restore (classifier: LogisticRegressionClassifier, stemmer?: Stemmer): LogisticRegressionClassifier
+  static restore (classifier: Record<string, unknown>, stemmer?: Stemmer): LogisticRegressionClassifier
+  saveTo (storage: StorageBackend): string
+  static loadFrom (storage: StorageBackend): ClassifierBase
 }
 
-declare type MaxEntClassifierCallback = (err: NodeJS.ErrnoException | null, classifier?: MaxEntClassifier | null) => void
+declare type MaxEntClassifierCallback = (err: NodeJS.ErrnoException | null, classifier?: MaxEntClassifier) => void
 
 export class MaxEntClassifier {
   sample: Sample
   features: FeatureSet
+  scaler: GISScaler
 
   constructor (features: FeatureSet, sample: Sample)
   addElement (x: Element): void
   addDocument (context: Context, classification: string, elementClass: Element): void
-  train (maxIterations: number, minImprovement: number, unused: any): void
+  train (maxIterations: number, minImprovement: number): void
   getClassifications (b: Context): ApparatusClassification[]
   classify (b: Context): string
   // These are not static like in other Classifier classes
@@ -160,7 +178,7 @@ export class Feature {
 
 export class FeatureSet {
   features: Feature[]
-  map: { [key: string]: boolean | undefined }
+  map: Record<string, boolean>
 
   addFeature (feature: Feature): boolean
   featureExists (feature: Feature): boolean
@@ -172,8 +190,8 @@ export class FeatureSet {
 declare type SampleCallback = (err: NodeJS.ErrnoException | null, sample?: Sample | null) => void
 
 export class Sample {
-  frequencyOfContext: { [key: string]: number | undefined }
-  frequency: { [key: string]: number | undefined }
+  frequencyOfContext: Record<string, number>
+  frequency: Record<string, number>
   classes: string[]
 
   constructor (elements?: Element[])
@@ -215,6 +233,9 @@ export class POSElement extends Element {
 }
 
 export class GISScaler {
+  iteration: number
+  improvement: number
+
   constructor (featureSet: FeatureSet, sample: Sample)
   calculateMaxSumOfFeatures (): boolean
   addCorrectionFeature (): void

package/lib/natural/classifiers/logistic_regression_classifier.js

@@ -42,15 +42,20 @@ class LogisticRegressionClassifier extends Classifier {
   }
 
   static load (filename, stemmer, callback) {
-    Classifier.load(filename, function (err, classifier) {
+    Classifier.load(filename, (err, classifier) => {
       if (err) {
         callback(err)
       } else {
-        callback(err, this.restore(classifier, stemmer))
+        callback(err, LogisticRegressionClassifier.restore(classifier, stemmer))
       }
     })
   }
 
+  static async loadFrom (key, stemmer, storageBackend) {
+    const classifier = await Classifier.loadFrom(key, storageBackend)
+    return LogisticRegressionClassifier.restore(classifier, stemmer)
+  }
+
   train () {
     // we need to reset the training state because logistic regression
     // needs its matricies to have their widths synced, etc.

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

@@ -32,6 +32,8 @@ const Sample = require('./Sample')
 const Scaler = require('./GISScaler')
 const FeatureSet = require('./FeatureSet')
 
+const DEBUG = false
+
 class Classifier {
   constructor (features, sample) {
     if (features) {
@@ -77,7 +79,7 @@ class Classifier {
     const classifier = this
     fs.writeFile(filename, data, 'utf8', function (err) {
       if (callback) {
-        console.log('Saved classifier to ' + filename)
+        DEBUG && console.log('Saved classifier to ' + filename)
         callback(err, err ? null : classifier)
       }
     })
@@ -91,9 +93,9 @@ class Classifier {
     Classifier.prototype.addElement(new ElementClass(classification, context))
   }
 
-  train (maxIterations, minImprovement, approxExpectation) {
+  train (maxIterations, minImprovement) {
     this.scaler = new Scaler(this.features, this.sample)
-    this.p = this.scaler.run(maxIterations, minImprovement, approxExpectation)
+    this.p = this.scaler.run(maxIterations, minImprovement)
   }
 
   getClassifications (b) {