@sc-voice/tools 3.27.0 → 3.29.0

package/package.json

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

package/src/math/activation.mjs

@@ -1,7 +1,7 @@
 export class Activation {
   constructor(opts = {}) {
     const msg = 'A8n.ctor';
-    let { a, b, c, d, fEval, dEval} = opts;
+    let { a, b, c, d, fEval, dEval } = opts;
     if (fEval == null) {
       throw new Error(`${msg} fEval?`);
     }
@@ -10,11 +10,19 @@ export class Activation {
       throw new Error(`${msg} dEval?`);
     }
     this.dEval = dEval;
-    
-    if (a != null) { this.a = a; }
-    if (b != null) { this.b = b; }
-    if (c != null) { this.c = c; }
-    if (d != null) { this.d = d; }
+
+    if (a != null) {
+      this.a = a;
+    }
+    if (b != null) {
+      this.b = b;
+    }
+    if (c != null) {
+      this.c = c;
+    }
+    if (d != null) {
+      this.d = d;
+    }
   }
 
   f(x) {
@@ -31,31 +39,36 @@ export class Activation {
   static createSoboleva(a = 1, b = 1, c = 1, d = 1) {
     const msg = 'a8n.createSoboleva';
     let fEval = (x, a, b, c, d) => {
-      return (Math.exp(a * x) - Math.exp(-b * x)) /
+      return (
+        (Math.exp(a * x) - Math.exp(-b * x)) /
         (Math.exp(c * x) + Math.exp(-d * x))
-    }
+      );
+    };
     let dEval = (x, a, b, c, d) => {
-      console.log(msg, "UNTESTED");
-      return (a*Math.exp(a * x) + b*Math.exp(-b * x)) /
-        (Math.exp(c * x) + Math.exp(-d * x)) -
-        fEval(x,a,b,c,d) * 
-        (c*Math.exp(c * x) - d*Math.exp(-d * x)) /
-        (Math.exp(c * x) + Math.exp(-d * x));
-    }
-      
+      console.log(msg, 'UNTESTED');
+      return (
+        (a * Math.exp(a * x) + b * Math.exp(-b * x)) /
+          (Math.exp(c * x) + Math.exp(-d * x)) -
+        (fEval(x, a, b, c, d) *
+          (c * Math.exp(c * x) - d * Math.exp(-d * x))) /
+          (Math.exp(c * x) + Math.exp(-d * x))
+      );
+    };
+
     return new Activation({ a, b, c, d, fEval, dEval });
   }
 
-  static createRareN(a=100,b=1) {
-    let fEval = (x,a) => (x < 1 ? 1 : 1 - Math.exp(((x - a)/x) * b));
-    let dEval = (x,a) => 
-      (x < 1 ? 0 : - ( a * b * fEval(x,a,b)) / (x*x));
-    return new Activation({ a, b, fEval, dEval});
+  static createRareN(a = 100, b = 1) {
+    let fEval = (x, a) =>
+      x < 1 ? 1 : 1 - Math.exp(((x - a) / x) * b);
+    let dEval = (x, a) =>
+      x < 1 ? 0 : -(a * b * fEval(x, a, b)) / (x * x);
+    return new Activation({ a, b, fEval, dEval });
   }
 
-  static createElu(a=0) {
-    let fEval = (x) => (x >= 0 ? x : (a * (Math.exp(x) - 1)));
-    let dEval = (x) => "TBD";
+  static createElu(a = 0) {
+    let fEval = (x) => (x >= 0 ? x : a * (Math.exp(x) - 1));
+    let dEval = (x) => 'TBD';
     //let dEval = (x) => (x >= 0 ? 1 : fEval(x,a)+a);
     return new Activation({ a, fEval, dEval });
   }

package/src/math/interval.mjs

@@ -3,11 +3,14 @@ const { EMPTY_SET, INFINITY } = Unicode;
 import { ColorConsole } from '../text/color-console.mjs';
 const { cc } = ColorConsole;
 import { DBG } from '../defines.mjs';
+import util from 'node:util';
 
 const MINUS_INFINITY = `-${INFINITY}`;
 const PLUS_INFINITY = `+${INFINITY}`;
 
 export class Interval {
+  styleText = (text)=>text; 
+
   constructor(a, b, opts = {}) {
     const msg = 'i6l.ctor';
     let hi = null;
@@ -65,6 +68,10 @@ export class Interval {
     return INFINITY;
   }
 
+  get size(){
+    return this.hi - this.lo;
+  }
+
   get isOpen() {
     return this.leftOpen || this.rightOpen || this.isEmpty;
   }
@@ -127,25 +134,28 @@ export class Interval {
 
   toString() {
     let { lo, hi, leftOpen, rightOpen, isEmpty } = this;
-    if (isEmpty) {
-      return EMPTY_SET;
-    }
-    if (lo === hi) {
-      return [
-        leftOpen ? '(' : '[',
-        lo === INFINITY ? MINUS_INFINITY : lo,
-        lo == null ? '' : ',',
-        hi === INFINITY ? PLUS_INFINITY : hi,
-        rightOpen ? ')' : ']',
-      ].join('');
-    }
-    return [
-      leftOpen ? '(' : '[',
-      lo === INFINITY ? MINUS_INFINITY : lo,
-      lo === hi ? '' : ',',
-      hi === INFINITY ? PLUS_INFINITY : hi,
-      rightOpen ? ')' : ']',
-    ].join('');
+    let result = EMPTY_SET;
+    if (!isEmpty) {
+      if (lo === hi) {
+        result = [
+          leftOpen ? '(' : '[',
+          lo === INFINITY ? MINUS_INFINITY : lo,
+          lo == null ? '' : ',',
+          hi === INFINITY ? PLUS_INFINITY : hi,
+          rightOpen ? ')' : ']',
+        ].join('');
+      } else {
+        result = [
+          leftOpen ? '(' : '[',
+          lo === INFINITY ? MINUS_INFINITY : lo,
+          lo === hi ? '' : ',',
+          hi === INFINITY ? PLUS_INFINITY : hi,
+          rightOpen ? ')' : ']',
+        ].join('');
+      }
+    }
+
+    return Interval.styleText ? Interval.styleText(result) : result;
   }
 
   overlaps(iv2) {
@@ -185,4 +195,4 @@ export class Interval {
     dbg && cc.fyi1(msg + 0.1, false);
     return false;
   }
-}
+} // Interval