Expose more API from the index

Author: Maarten

package.json

@@ -1,6 +1,6 @@
 {
   "name": "semiring-src",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "index.js",
   "types": "index.d.ts",
   "repository": "[email protected]:digitalheir/semiring-js.git",

readme.md

@@ -31,10 +31,15 @@ I have two uses for this library:
 
 # Usage
 ````js
-import {LogSemiring, makeDeferrable, BooleanSemiring} from "semiring";
-import {fromProbability, toProbability} from "semiring/semirings/log";
-import {Atom} from "semiring/abstract-expression/atom";
-import {Bool} from "semiring/abstract-expression/atom/boolean";
+import {
+    LogSemiring,
+    makeDeferrable,
+    BooleanSemiring,
+    fromProbabilityToMinusLog as fromProbability,
+    toProbabilityFromMinusLog as toProbability,
+    Atom,
+    Bool
+} from "semiring";
 
 let minLogProb = fromProbability(1)
 

src/index.ts

@@ -3,6 +3,8 @@
  */
 import {Expression} from "./abstract-expression/expression";
 import {Atom as AtomClass} from "./abstract-expression/atom";
+import {Bool as BoolClass} from "./abstract-expression/atom/boolean";
+import {Num as NumClass} from "./abstract-expression/atom/number";
 import {wrapBinaryFunction} from "./expression/binary-function";
 import {LogSemiring as ls, fromProbability, toProbability} from "./semirings/log";
 import {BooleanSemiring as bs} from "./semirings/boolean";
@@ -33,7 +35,10 @@ export const BooleanSemiring: Semiring<boolean> = bs;
 export const FloatingPointSemiring: Semiring<number> = fs;
 export const TropicalSemiring: Semiring<number> = ts;
 
-export const fromProbabilityToMinusLog: (x: number)=>number = fromProbability;
-export const toProbabilityFromMinusLog: (x: number)=>number = toProbability;
+export const Bool = BoolClass;
+export const Num = NumClass;
+
+export const fromProbabilityToMinusLog: (x: number) => number = fromProbability;
+export const toProbabilityFromMinusLog: (x: number) => number = toProbability;
 
 export const Atom = AtomClass;

test/example.spec.ts

@@ -1,13 +1,16 @@
-import {toProbability, fromProbability} from "../src/semirings/log";
-
-//import * as Mocha from 'mocha'
+import {
+    LogSemiring,
+    makeDeferrable,
+    BooleanSemiring,
+    fromProbabilityToMinusLog as fromProbability,
+    toProbabilityFromMinusLog as toProbability,
+    Atom,
+    Bool, Num, FloatingPointSemiring, TropicalSemiring
+} from "../src/index";
 import {expect} from 'chai';
-import {Bool} from "../src/abstract-expression/atom/boolean";
-import { BooleanExpressionSemiring} from "../src/semirings/boolean";
-import {FloatingPointSemiring, FloatingPointTreeSemiring} from "../src/semirings/floating-point";
-import {Num} from "../src/abstract-expression/atom/number";
-import {makeDeferrable, TropicalSemiring, LogSemiring, BooleanSemiring} from "../src/index";
-import {Atom} from "../src/abstract-expression/atom/atom";
+
+import * as Mocha from 'mocha'
+const BooleanExpressionSemiring = makeDeferrable(BooleanSemiring);
 
 
 
@@ -19,7 +22,7 @@ describe('FloatingPointSemiring', () => {
     });
     it('should calculate values - deferred', () => {
         let changeMe = new Num(5);
-        const times = FloatingPointTreeSemiring.times(
+        const times = makeDeferrable(FloatingPointSemiring).times(
             changeMe,
             new Num(30)
         );

version.js

@@ -1 +1 @@
-exports.default = "1.2.1";
+exports.default = "1.2.2";