@sc-voice/tools 2.8.0 → 2.10.0

package/index.mjs

@@ -6,6 +6,7 @@ export const ScvMath = {
 };
 
 import { BilaraPath } from './src/text/bilara-path.mjs';
+import { Corpus } from './src/text/corpus.mjs';
 import { EbtDoc } from './src/text/ebt-doc.mjs';
 import { LegacyDoc } from './src/text/legacy-doc.mjs';
 import { MerkleJson } from './src/text/merkle-json.mjs';
@@ -18,6 +19,7 @@ import { LogEntry, Logger } from './src/text/logger.mjs';
 
 export const Text = {
   BilaraPath,
+  Corpus,
   EbtDoc,
   LegacyDoc,
   LogEntry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc-voice/tools",
-  "version": "2.8.0",
+  "version": "2.10.0",
   "description": "Utilities for SC-Voice",
   "main": "index.mjs",
   "files": [

package/src/text/corpus.mjs

@@ -0,0 +1,39 @@
+import { WordVector } from './word-vector.mjs';
+
+export class Corpus {
+  constructor(opts = {}) {
+    let { wordDocCount = new WordVector(), docMap = {} } = opts;
+
+    this._size = Object.keys(docMap).length;
+
+    Object.assign(this, {
+      wordDocCount,
+      docMap,
+    });
+  }
+
+  get size() {
+    return this._size;
+  }
+
+  addDocument(id, doc) {
+    this.deleteDocument(id);
+    this.docMap[id] = doc;
+    this._size++;
+  }
+
+  getDocument(id) {
+    return this.docMap[id];
+  }
+
+  deleteDocument(id) {
+    let { docMap } = this;
+    let doc = docMap[id];
+    if (doc) {
+      delete docMap[id];
+      this._size--;
+    }
+
+    return doc;
+  }
+}

package/src/text/tfidf-space.mjs

@@ -1,4 +1,5 @@
 import { DBG } from '../defines.mjs';
+import { Corpus } from './corpus.mjs';
 import { WordVector } from './word-vector.mjs';
 
 // The golden ratio is pretty.
@@ -10,8 +11,7 @@ export class TfidfSpace {
     const msg = 't8e.ctor:';
     let {
       lang = 'en', // 2-letter code: fr, en, es, pt
-      corpusBow = new WordVector(), // corpus bag of words
-      corpusSize = 0, // number of retrieval units (docs, segments, etc.)
+      corpus = new Corpus(),
       idfWeight = GOLDEN_FUDGE, // IDF dampening
       idfFunction = TfidfSpace.idfTunable,
       normalizeText,
@@ -41,8 +41,7 @@ export class TfidfSpace {
     // Serializable properties
     Object.assign(this, {
       lang,
-      corpusBow,
-      corpusSize,
+      corpus,
       idfWeight,
     });
   }
@@ -59,46 +58,65 @@ export class TfidfSpace {
   }
 
   static normalizeFR(s) {
-    let sAbbr = s.toLowerCase()
+    let sAbbr = s
+      .toLowerCase()
       .replace(/\bd[’']/gi, 'de ')
       .replace(/\bl[’']/gi, 'le ')
       .replace(/\bs[’']/gi, 's_')
       .replace(/\bj[’']/gi, 'j_')
       .replace(/\bm[’']/gi, 'm_')
       .replace(/\bn[’']/gi, 'n_')
-      .replace(/\bc[’']/gi, 'c_')
+      .replace(/\bc[’']/gi, 'c_');
     return TfidfSpace.removeNonWords(sAbbr);
   }
 
   static idfStandard(space, word) {
     const msg = 'w7e.idfStandard:';
-    let { corpusBow, corpusSize } = space;
-    let wordDocs = corpusBow[word] || 0;
-    return Math.log((corpusSize + 1) / (wordDocs+1));
+    let { corpus } = space;
+    let wordDocs = corpus.wordDocCount[word] || 0;
+    return Math.log((corpus.size + 1) / (wordDocs + 1));
   }
 
-  static idfTunable(space, word, idfWeight = this.idfWeight) {
+  static idfTunable(space, word, idfWeight) {
     const msg = 'w7e.idf:';
-    let { corpusBow, corpusSize } = space;
-    let wordDocs = corpusBow[word] || 0;
+    let { corpus } = space;
+    let wordDocs = corpus.wordDocCount[word] || 0;
     // NOTE: This is NOT the usual formula
     // Map to [0:ignore..1:important]
-    return corpusSize
-      ? 1 - Math.exp(((wordDocs - corpusSize) / wordDocs) * idfWeight)
+    return corpus.size
+      ? 1 -
+          Math.exp(((wordDocs - corpus.size) / wordDocs) * idfWeight)
       : 1;
   }
 
-  idf(word, idfWeight) {
+  idf(word, idfWeight = this.idfWeight) {
     return this.idfFunction(this, word, idfWeight);
   }
 
-  addDocument(doc) {
-    let { corpusBow } = this;
-    this.corpusSize += 1;
-    let { bow } = this.countWords(doc, 1); // one-hot
-    corpusBow.increment(bow);
+  addCorpusDocument(id, bow, nWords) {
+    const msg = 't8w.addCorpusDocument:';
+    let { corpus } = this;
+    if (id == null) {
+      throw new Error(`${msg} id?`);
+    }
+    if (bow == null) {
+      throw new Error(`${msg} bow?`);
+    }
+    if (nWords == null) {
+      throw new Error(`${msg} nWords?`);
+    }
+    let docInfo = { id, bow, nWords };
+    corpus.addDocument(id, docInfo);
 
-    return this;
+    return docInfo;
+  }
+
+  addDocument(id, doc) {
+    let { corpus } = this;
+    let { bow, words } = this.countWords(doc);
+    corpus.wordDocCount.increment(bow.oneHot());
+    
+    return this.addCorpusDocument(id, bow, words.length);
   }
 
   termFrequency(word, document) {
@@ -113,7 +131,7 @@ export class TfidfSpace {
 
   tfidf(doc) {
     const msg = 'w7e.tfidf:';
-    let { corpusBow, corpusSize, idfWeight } = this;
+    let { corpus, idfWeight } = this;
 
     // More efficient implementation of tf * idf
     let { bow, words } = this.countWords(doc);
@@ -122,9 +140,9 @@ export class TfidfSpace {
     let vTfIdf = words.reduce((a, word) => {
       let wd = bow[word] || 0;
       let tf = wd ? wd / nWords : 0;
-      let wc = corpusBow[word] || 0;
-      let idf = corpusSize
-        ? 1 - Math.exp(((wc - corpusSize) / wc) * idfWeight)
+      let wc = corpus.wordDocCount[word] || 0;
+      let idf = corpus.size
+        ? 1 - Math.exp(((wc - corpus.size) / wc) * idfWeight)
         : 1;
       let tfidf = tf * idf;
       if (tfidf) {
@@ -136,7 +154,7 @@ export class TfidfSpace {
     return vTfIdf;
   }
 
-  countWords(str, maxCount) {
+  countWords(str) {
     const msg = 'w7e.countWords:';
     if (str == null) {
       throw new Error(`${msg} str?`);
@@ -145,8 +163,7 @@ export class TfidfSpace {
     let sNorm = this.normalizeText(str);
     let words = sNorm.split(' ');
     let bow = words.reduce((a, w) => {
-      let count = (a[w] || 0) + 1;
-      a[w] = maxCount ? Math.min(maxCount, count) : count;
+      a[w] = (a[w] || 0) + 1;
       return a;
     }, new WordVector());
 

package/src/text/word-space.mjs

@@ -102,7 +102,6 @@ class Vector extends Object {
     let den = norm1 * norm2;
     return den ? d / den : 0;
   }
-
 } // Vector
 
 export class WordMapTransformer {

package/src/text/word-vector.mjs

@@ -79,7 +79,7 @@ export class WordVector extends Object {
   }
 
   scale(c) {
-    return Object.keys(this).reduce((a,k)=>{
+    return Object.keys(this).reduce((a, k) => {
       a[k] *= c;
       return a;
     }, this);
@@ -111,7 +111,7 @@ export class WordVector extends Object {
   }
 
   oneHot() {
-    return Object.keys(this).reduce((a,k)=>{
+    return Object.keys(this).reduce((a, k) => {
       if (this[k] > 0) {
         a[k] = 1;
       }