nerdamer 1.1.13 → 2.0.0-rc.1

package/spec/extra.spec.js

@@ -1,54 +0,0 @@
-/* global expect */
-
-'use strict';
-
-var nerdamer = require('../nerdamer.core.js');
-require('../Extra');
-
-describe('Extra Calculus', function () {
-
-    it('should transform Laplace correctly', function () {
-        expect(nerdamer('laplace(5, t, s)').toString()).toEqual('5*s^(-1)');
-        expect(nerdamer('laplace(a*t, t, s)').toString()).toEqual('a*s^(-2)');
-        expect(nerdamer('laplace(cos(a*t), t, s)').toString()).toEqual('(a^2+s^2)^(-1)*s');
-        expect(nerdamer('laplace(cos(x), t, s)').toString()).toEqual('cos(x)*s^(-1)');
-        expect(nerdamer('laplace(sinh(a*t), t, s)').toString()).toEqual('(-a^2+s^2)^(-1)*a');
-        expect(nerdamer('laplace(a*t^2, t, s)').toString()).toEqual('2*a*s^(-3)');
-        expect(nerdamer('laplace(2*sqrt(t), t, s)').toString()).toEqual('s^(-3/2)*sqrt(pi)');
-        expect(nerdamer('laplace(x*e^(a*t), t, s)').toString()).toEqual('(-a+s)^(-1)*x');
-        expect(nerdamer('laplace(x*(sin(a*t)-a*t*cos(a*t)), t, s)').toString()).toEqual('((a^2+s^2)^(-1)*a-((1+a^2*s^(-2))^(-2)*s^(-2)-(1+a^2*s^(-2))^(-2)*a^2*s^(-4))*a)*x');
-        expect(nerdamer('laplace(sin(a*t), t, s)').toString()).toEqual('(a^2+s^2)^(-1)*a');
-        expect(nerdamer('laplace(t*sin(a*t), t, s)').toString()).toEqual('2*(1+a^2*s^(-2))^(-2)*a*s^(-3)');
-        expect(nerdamer('laplace(sin(a*t+b), t, s)').toString()).toEqual('(1+a^2*s^(-2))^(-1)*a*cos(b)*s^(-2)+(1+a^2*s^(-2))^(-1)*s^(-1)*sin(b)');
-        expect(nerdamer('laplace(t^2*e^(a*t), t, s)').toString()).toEqual('-2*(-s+a)^(-3)');
-        expect(nerdamer('laplace(6*t*e^(-9*t)*sin(6*t), t, s)').toString()).toEqual('-72*(-9-s)^(-3)*(1+36*(-9-s)^(-2))^(-2)');
-        expect(nerdamer('laplace(sinh(t)*e^t, t, s)').toString()).toEqual('(-1/2)*(-s+2)^(-1)+(-1/2)*s^(-1)');
-    });
-
-    it('should invert a Laplace transform correctly', function () {
-        expect(nerdamer('ilt(a/(b*x), x, t)').toString()).toEqual('a*b^(-1)');
-        expect(nerdamer('ilt(a*6/(b*s^6),s,t)').toString()).toEqual('(1/20)*a*b^(-1)*t^5');
-        expect(nerdamer('ilt(3*s/(4*s^2+5),s,t)').toString()).toEqual('(3/4)*cos((1/2)*sqrt(5)*t)');
-        expect(nerdamer('ilt(2/(3*s^2+1),s,t)').toString()).toEqual('2*sin((1/3)*sqrt(3)*t)*sqrt(3)^(-1)');
-        expect(nerdamer('ilt(5*sqrt(pi)/(3*s^(3/2)),s,t)').toString()).toEqual('(10/3)*sqrt(t)');
-        expect(nerdamer('ilt(3/(7*s^2+1)^2, s, t)').toString()).toEqual('(-3/14)*cos((1/7)*sqrt(7)*t)*t+(3/2)*sin((1/7)*sqrt(7)*t)*sqrt(7)^(-1)');
-        expect(nerdamer('ilt(5*s/(s^2+4)^2, s, t)').toString()).toEqual('(5/4)*sin(2*t)*t');
-        expect(nerdamer('ilt(8*s^2/(2*s^2+3)^2, s, t)').toString()).toEqual('2*sin((1/2)*sqrt(6)*t)*sqrt(6)^(-1)+cos((1/2)*sqrt(6)*t)*t');
-        expect(nerdamer('ilt((6*s^2-1)/(4*s^2+1)^2, s, t)').toString()).toEqual('(1/8)*sin((1/2)*t)+(5/16)*cos((1/2)*t)*t');
-        expect(nerdamer('ilt((5*(sin(1)*s+3*cos(1)))/(s^2+9),s, t)').toString()).toEqual('5*cos(1)*sin(3*t)+5*cos(3*t)*sin(1)');
-        expect(nerdamer('ilt(((s+1)*(s+2)*(s+3))^(-1), s, t)').toString()).toEqual('(1/2)*e^(-3*t)+(1/2)*e^(-t)-e^(-2*t)');
-        expect(nerdamer('ilt(1/(s^2+s+1),s,t)').toString()).toEqual('2*e^((-1/2)*t)*sin((1/2)*sqrt(3)*t)*sqrt(3)^(-1)');
-        expect(nerdamer('ilt(1/(s^2+2s+1),s,t)').toString()).toEqual('e^(-t)*t');
-    });
-
-    it('should calculate mode correctly', function () {
-        expect(nerdamer('mode(r,r,r,r)').toString()).toEqual('r');
-        expect(nerdamer('mode(1,2)').toString()).toEqual('mode(1,2)');
-        expect(nerdamer('mode(1,2,3,1,2)').toString()).toEqual('mode(1,2)');
-        expect(nerdamer('mode(1,1,2)').toString()).toEqual('1');
-        expect(nerdamer('mode(a,a,b,c,a,b,d)').toString()).toEqual('a');
-        expect(nerdamer('mode(x, r+1, 21, tan(x), r+1)').toString()).toEqual('1+r');
-        expect(nerdamer('mode(x, r+1, 21, tan(x), r+1, x)').toString()).toEqual('mode(1+r,x)');
-    });
-});
-    

package/spec/solve.spec.js

@@ -1,126 +0,0 @@
-/* global expect */
-
-'use strict';
-
-var nerdamer = require('../nerdamer.core.js');
-require('../Solve');
-
-describe('Solve', function () {
-    it('should solve correctly', function () {
-        expect(nerdamer('solve(x=y/3416.3333333333344, y)').toString()).toEqual('[(1073228064103962/314146179365)*x]');
-        expect(nerdamer('solve(x, x)').toString()).toEqual('[0]');
-        expect(nerdamer('solve(5*y^x=8, x)').toString()).toEqual('[log(8/5)*log(y)^(-1)]');
-        expect(nerdamer('solve(x^y+8=a*b, x)').toString()).toEqual('[(-8+a*b)^y^(-1)]');
-        expect(nerdamer('solve(x^2, x)').toString()).toEqual('[0]');
-        expect(nerdamer('solve(x^3, x)').toString()).toEqual('[0]');
-        expect(nerdamer('solve(x+1, x)').toString()).toEqual('[-1]');
-        expect(nerdamer('solve(x^2+1, x)').toString()).toEqual('[i,-i]');
-        expect(nerdamer('solve(2*x^2+1, x)').toString()).toEqual('[(1/2)*i*sqrt(2),(-1/2)*i*sqrt(2)]');
-        expect(nerdamer('solve(3*(x+5)*(x-4), x)').toString()).toEqual('[-5,4]');
-        expect(nerdamer('solve(3*(x+a)*(x-b), x)').toString()).toEqual('[-a,b]');
-        expect(nerdamer('solve(a*x^2+b, x)').toString()).toEqual('[a^(-1)*i*sqrt(a)*sqrt(b),-a^(-1)*i*sqrt(a)*sqrt(b)]');
-        expect(nerdamer('solve(x^2+2*x+1, x)').toString()).toEqual('[-1]');
-        expect(nerdamer('solve(-5 sqrt(14)x-14x^2 sqrt(83)-10=0,x)').toString()).toEqual('[(-1/28)*sqrt(-560*sqrt(83)+350)*sqrt(83)^(-1)+(-5/28)*sqrt(14)*sqrt(83)^(-1),(-5/28)*sqrt(14)*sqrt(83)^(-1)+(1/28)*sqrt(-560*sqrt(83)+350)*sqrt(83)^(-1)]');
-        expect(nerdamer('solve(-5*sqrt(14)x-14x^2*sqrt(83)-10x=0,x)').toString()).toEqual('[(-5/14)*(2+sqrt(14))*sqrt(83)^(-1),0]');
-        expect(nerdamer('solve(8*x^3-26x^2+3x+9,x)').toString()).toEqual('[3/4,-1/2,3]');
-        expect(nerdamer('solve(a*x^2+b*x+c, x)').toString()).toEqual('[(1/2)*(-b+sqrt(-4*a*c+b^2))*a^(-1),(1/2)*(-b-sqrt(-4*a*c+b^2))*a^(-1)]');
-        expect(nerdamer('solve(sqrt(x^3)+sqrt(x^2)-sqrt(x)=0,x)').toString()).toEqual('[0,78202389238903801/240831735646702201]');
-        expect(nerdamer('solve(x^3-10x^2+31x-30,x)').toString()).toEqual('[3,5,2]');
-        expect(nerdamer('solve(sqrt(x)+sqrt(2x+1)=5,x)').toString()).toEqual('[4]');
-        expect(nerdamer('solve(x=2/(3-x),x)').toString()).toEqual('[1,2]');
-        expect(nerdamer('solve(1/x=a,x)').toString()).toEqual('[a^(-1)]');
-        expect(nerdamer('solve(sqrt(x^2-1),x)').toString()).toEqual('[1,-1]');
-        expect(nerdamer('solve(m*x^9+n,x)').toString()).toEqual('[2*m^(-1/9)*n^(1/9),2*e^((2/9)*i*pi)*m^(-1/9)*n^(1/9),2*e^((4/9)*i*pi)*m^(-1/9)*n^(1/9),2*e^((2/3)*i*pi)*m^(-1/9)*n^(1/9),2*e^((8/9)*i*pi)*m^(-1/9)*n^(1/9),2*e^((10/9)*i*pi)*m^(-1/9)*n^(1/9),2*e^((4/3)*i*pi)*m^(-1/9)*n^(1/9),2*e^((14/9)*i*pi)*m^(-1/9)*n^(1/9),2*e^((16/9)*i*pi)*m^(-1/9)*n^(1/9)]');
-        expect(nerdamer('solve(sqrt(97)x^2-sqrt(13)x+sqrt(14)x+sqrt(43)x^2+sqrt(3)*sqrt(101)=0,x)').toString()).toEqual('[(-1/2)*(sqrt(43)+sqrt(97))^(-1)*sqrt(14)+(1/2)*(sqrt(43)+sqrt(97))^(-1)*sqrt(-2*sqrt(13)*sqrt(14)-4*sqrt(101)*sqrt(3)*sqrt(43)-4*sqrt(101)*sqrt(3)*sqrt(97)+27)+(1/2)*(sqrt(43)+sqrt(97))^(-1)*sqrt(13),(-1/2)*(sqrt(43)+sqrt(97))^(-1)*sqrt(-2*sqrt(13)*sqrt(14)-4*sqrt(101)*sqrt(3)*sqrt(43)-4*sqrt(101)*sqrt(3)*sqrt(97)+27)+(-1/2)*(sqrt(43)+sqrt(97))^(-1)*sqrt(14)+(1/2)*(sqrt(43)+sqrt(97))^(-1)*sqrt(13)]');
-        expect(nerdamer('solve(a*y^2*x^3-1, x)').toString()).toEqual('[((-1/2)*abs(a^(-1)*y^(-2))+(1/2)*a^(-1)*y^(-2))^(1/3)+((1/2)*a^(-1)*y^(-2)+(1/2)*abs(a^(-1)*y^(-2)))^(1/3),(((-1/2)*abs(a^(-1)*y^(-2))+(1/2)*a^(-1)*y^(-2))^(1/3)+((1/2)*a^(-1)*y^(-2)+(1/2)*abs(a^(-1)*y^(-2)))^(1/3))*((1/2)*i*sqrt(3)+1/2),(((-1/2)*abs(a^(-1)*y^(-2))+(1/2)*a^(-1)*y^(-2))^(1/3)+((1/2)*a^(-1)*y^(-2)+(1/2)*abs(a^(-1)*y^(-2)))^(1/3))*((1/2)*i*sqrt(3)+1/2)^2]');
-        expect(nerdamer('solve((1/2)*sqrt(-4*x+4*y)-2+y, y)').toString()).toEqual('[(-1/2)*(-5+sqrt(-4*x+9)),(-1/2)*(-5-sqrt(-4*x+9))]');
-        expect(nerdamer('solve(log(a*x-c)-b=21, x)').toString()).toEqual('[-(-c-e^(21+b))*a^(-1)]');
-        expect(nerdamer('solve(x/(x-a)+4,x)').toString()).toEqual('[(4/5)*a]');
-        expect(nerdamer('solve(3*sin(a^2*x-b)-4,x)').toString()).toEqual('[a^(-2)*asin(4/3)]');
-        expect(nerdamer('solve(a*log(x^2-4)-4,x)').toString()).toEqual('[(1/2)*sqrt(16+4*e^(4*a^(-1))),(-1/2)*sqrt(16+4*e^(4*a^(-1)))]');
-        expect(nerdamer('solve(x/(x^2+2*x+1)+4,x)').toString()).toEqual('[(1/8)*sqrt(17)-9/8,(-1/8)*sqrt(17)-9/8]');
-        expect(nerdamer('solve((a*x^2+1),x)').toString()).toEqual('[a^(-1)*sqrt(-a),-a^(-1)*sqrt(-a)]');
-        expect(nerdamer('solve(sqrt(x)-2x+x^2,x)').toString()).toEqual('[(-1/2)*sqrt(5)+3/2,0,1,832040/2178309]');
-        expect(nerdamer('solve((2x+x^2)^2-x,x)').toString()).toEqual('[0,((-1/6)*sqrt(3)^(-1)*sqrt(59)+43/54)^(1/3)+((1/6)*sqrt(3)^(-1)*sqrt(59)+43/54)^(1/3)-4/3,(((-1/6)*sqrt(3)^(-1)*sqrt(59)+43/54)^(1/3)+((1/6)*sqrt(3)^(-1)*sqrt(59)+43/54)^(1/3)-4/3)*((1/2)*i*sqrt(3)+1/2),(((-1/6)*sqrt(3)^(-1)*sqrt(59)+43/54)^(1/3)+((1/6)*sqrt(3)^(-1)*sqrt(59)+43/54)^(1/3)-4/3)*((1/2)*i*sqrt(3)+1/2)^2]');
-        expect(nerdamer('solve((5*x^4-2)/(x+1)/(x^2-1),x)').toString()).toEqual('[72425485/91070226,-72425485/91070226,(316684236/398209345)*i,(-316684236/398209345)*i]');
-        expect(nerdamer('solve(0=(x^(2)-2)/(e^(x)-1), x)').toString()).toEqual('[sqrt(2),-sqrt(2)]');
-        expect(nerdamer('solve(4/y^2=x^2+1,y)').toString()).toEqual('[(1/2)*(-1-x^2)^(-1)*sqrt(16+16*x^2),(-1/2)*(-1-x^2)^(-1)*sqrt(16+16*x^2)]');
-        expect(nerdamer('solve(1/(x+x^2), x)').toString()).toEqual('[]');
-        expect(nerdamer('solve(1/(x+x^2-1), x)').toString()).toEqual('[]');
-        expect(nerdamer('solve(-1+11000*(-100*(10+x)^(-1)+20)^(-2)*(10+x)^(-2), x)').toString()).toEqual('[(-1/2)*sqrt(110)-5,(1/2)*sqrt(110)-5]');
-        expect(nerdamer('solve(x^3+y^3=3, x)').toString()).toEqual('[((-1/2)*y^3+3/2+abs((-1/2)*y^3+3/2))^(1/3)+((-1/2)*y^3-abs((-1/2)*y^3+3/2)+3/2)^(1/3),(((-1/2)*y^3+3/2+abs((-1/2)*y^3+3/2))^(1/3)+((-1/2)*y^3-abs((-1/2)*y^3+3/2)+3/2)^(1/3))*((1/2)*i*sqrt(3)+1/2),(((-1/2)*y^3+3/2+abs((-1/2)*y^3+3/2))^(1/3)+((-1/2)*y^3-abs((-1/2)*y^3+3/2)+3/2)^(1/3))*((1/2)*i*sqrt(3)+1/2)^2]');
-        expect(nerdamer('solve(sqrt(10x+186)=x+9,x)').toString()).toEqual('[7]');
-        expect(nerdamer('solve(x^3+8=x^2+6,x)').toString()).toEqual('[-1,1+i,-i+1]');
-        expect(nerdamer('solve(x^3-10x^2+31x-30,x)').toString()).toEqual('[3,5,2]');
-        expect(nerdamer('solve(8x^3-26x^2+3x+9,x)').toString()).toEqual('[3/4,-1/2,3]');
-        expect(nerdamer('solve(x^3-1/2x^2-13/2x-3,x)').toString()).toEqual('[-2,3,-1/2]');
-        expect(nerdamer('solve(x^3+2x^2+3x-4=0,x)').evaluate().text()).toEqual('[0.776045435028538,0.388022717514269+0.6720750612256601*i,-0.388022717514269+0.6720750612256599*i]');
-        expect(nerdamer('solve(x*log(x),x)').toString()).toEqual('[1]');
-        expect(nerdamer('solve((9x+x^2)^3+10800x+40x^4+4440x^2+720x^3+20(9*x+x^2)^2+8000,x) ').toString()).toEqual('[-5,-4]');
-        expect(nerdamer('solve((x^3-4)/(x^3+7x-11),x)').evaluate().text()).toEqual('[1.587401051968199,0.7937005259840910+1.3747296369986024*i,-0.793700525984099+1.374729636998602*i]');
-        expect(nerdamer('solve((93222358/131836323)*(-2*y+549964829/38888386)=10, y)').toString()).toEqual('[1/3625267041734188]');
-        expect(nerdamer('solve(sqrt(x)+sqrt(2x+1)=5,x) ').toString()).toEqual('[4]');
-        expect(nerdamer('solve(sqrt(x)-1,x) ').toString()).toEqual('[1]');
-        expect(nerdamer('solve(sqrt(x)+1,x)').toString()).toEqual('[]');
-        expect(nerdamer('solve((x-1)*(x+1)*x=3x,x)').toString()).toEqual('[0,2,-2]');
-        expect(nerdamer('solve(sqrt(x^2+1),x)').toString()).toEqual('[i,-i]');
-        expect(nerdamer('solve(sqrt(x^2-1),x)').toString()).toEqual('[1,-1]');
-        expect(nerdamer('solve(((x+1)*((x+1)+1))/2=n,x)').toString()).toEqual('[-3/2+sqrt(1/4+2*n),-3/2-sqrt(1/4+2*n)]');
-        expect(nerdamer('solve(sqrt(10x+186)=x+9,x)').toString()).toEqual('[7]');
-        expect(nerdamer('solve(x^3+8=x^2+6,x)').toString()).toEqual('[-1,1+i,-i+1]');
-        expect(nerdamer('solve(x^2=x^-2,x)').toString()).toEqual('[1,-1,i,-i]');
-        expect(nerdamer('solve((x+1)(x+1)x=3x,x)').toString()).toEqual('[0,-1+sqrt(3),-1-sqrt(3)]');
-        expect(nerdamer('solve(log(y) = -t, y)').toString() ).toEqual('[e^(-t)]');
-        expect(nerdamer('solve(y=exp(4x),x)').toString() ).toEqual('[(1/4)*log(y)]');
-
-    });
-    it('should solve system of equations correctly', function () {
-        expect(nerdamer.solveEquations(['x+y=1', '2*x=6', '4*z+y=6']).toString()).toEqual('x,3,y,-2,z,2');
-        expect(nerdamer.solveEquations(['x+y=a', 'x-y=b', 'z+y=c'], ['x', 'y', 'z']).toString()).toEqual('x,0.5*a+0.5*b,y,-0.5*b+0.5*a,z,-0.5*a+0.5*b+c');
-        expect(nerdamer.solveEquations(['x-2*y=-3', 'x+y-z+2*d=8', '5*d-1=19', 'z+d=7']).toString()).toEqual('d,4,x,1,y,2,z,3');
-        expect(nerdamer.solveEquations('x^2+4=x-y').toString()).toEqual('(1/2)*(1+sqrt(-15-4*y)),(1/2)*(-sqrt(-15-4*y)+1)');
-        expect(nerdamer.solveEquations(['x+y=3', 'y^3-x=7']).toString()).toEqual('x,1,y,2');
-        expect(nerdamer.solveEquations(['x^2+y=3', 'x+y+z=6', 'z^2-y=7']).toString()).toEqual('x,1,y,2,z,3');
-        expect(nerdamer.solveEquations(['x*y-cos(z)=-3', '3*z^3-y^2+1=12', '3*sin(x)*cos(y)-x^3=-4']).toString()).toEqual('x,1.10523895006979,y,-2.98980336936266,z,1.88015428627437');
-        expect(nerdamer.solveEquations(['x=i','x+y=3']).toString()).toEqual('x,i,y,-i+3');
-        expect(nerdamer.solveEquations(["x/(45909438.9 + 0 + x)=0", "45909438.9+0+x=45909438.9"]).toString()).toEqual('x,0');
-        expect(nerdamer.solveEquations(["a=1"]).toString()).toEqual('a,1');
-        expect(nerdamer.solveEquations(["x=5", "0.6=1-(x/(10+y))"]).toString()).toEqual('x,5,y,2.5');
-    });
-    /** #55: nerdamer.solveEquation quits working */
-    it('should handle text("fractions") without later impact', function () {
-        expect(nerdamer.solveEquations("x+1=2", "x").toString()).toEqual('1');
-        expect(nerdamer('x=1').text("fractions")).toEqual('x=1');
-        expect(nerdamer.solveEquations("x+1=2", "x").toString()).toEqual('1');
-    });
-    it('should parse equations correctly', function () {
-        expect(nerdamer("-(a+1)=(a+3)^2").toString()).toEqual('-1-a=(3+a)^2');
-    });
-    //NOTE: contains duplicates
-    it('should solve functions with factorials', function () {
-        expect(nerdamer('solve(x!-x^2,x)').text('decimals', 20)).toEqual('[-2.200391782610595,-4.010232827899529,-2.938361683501947,1,1.000000000000001,3.562382285390900,3.562382285390896,0.9999999999999910,1.000000000000000]');
-    });
-    it('should solve for variables other than x', function () {
-        expect(nerdamer('solve(2*a^(2)+4*a*6=128, a)').toString()).toEqual('[4,-16]');
-    });
-    it('should solve nonlinear system of equations with multiple parameter functions', function () {
-        var ans = nerdamer.solveEquations([
-            `y=x * 2`,
-            `z=y + max (y * 0.1, 23)`,
-            `j=y + max (y * 0.1, 23)`,
-            `6694.895373 = j + z + (max(j * 0.280587, z * 0.280587, 176))`
-        ]);
-        expect(ans.toString()).toEqual('j,2935.601831019821,x,1334.3644686453729,y,2668.7289372907458,z,2935.601831019821');
-    });
-
-    it('should solve factors', function () {
-        expect(nerdamer('solve((x-1)*(-a*c-a*x+c*x+x^2),x)').text()).toEqual('[1,-c,a]');
-    });
-    
-    it('should solve circle equations', function() {
-        var eq1 ="x^2+y^2=1";
-        var eq2 ="x+y=1";
-        var sol = nerdamer.solveEquations([eq1, eq2]);
-        expect(sol.toString()).toEqual('x,1,0,y,0,1');
-    });
-});

package/spec/support/jasmine.json

@@ -1,11 +0,0 @@
-{
-  "spec_dir": "spec",
-  "spec_files": [
-    "**/*[sS]pec.js"
-  ],
-  "helpers": [
-    "helpers/**/*.js"
-  ],
-  "stopSpecOnExpectationFailure": false,
-  "random": false
-}

package/spec/support/utils.js

@@ -1,42 +0,0 @@
-/* global expect */
-
-var nerdamer = require('../../nerdamer.core.js');
-
-//fix for rounding errors in some functions
-var toFixed = function(x, n) {
-    return Number(x).toFixed(n||14);
-};
-
-/**
- * @param {Array} o An array of object to parse
- * @param {String} dec Get output as decimals
- */
-var run = function(o, dec) {
-    dec = dec || 'decimal';
-    for (var i = 0; i < o.length; ++i) {
-        // when
-        var parsed = nerdamer(o[i].given);
-        var value = parsed.evaluate().text(dec);
-
-        // then
-        expect(parsed.toString()).toEqual(o[i].expected);
-        expect(value).toEqual(o[i].expectedValue);
-    }
-};
-
-/**
- * @param {String} e The expression
- * @param {object} subs The substitution object
- */
-var parse = function(e, subs) {
-    var r = nerdamer(e, subs).evaluate().text('decimals');
-    if(!isNaN(r))
-        r = Number(r);
-    return r;
-};
-
-module.exports = {
-    run: run,
-    toFixed: toFixed,
-    parse: parse
-};

package/spec/text.spec.js

@@ -1,132 +0,0 @@
-'use strict';
-
-var nerdamer = require('../nerdamer.core.js');
-
-describe('The text function', function () {
-    // given
-    var testCases = [
-       {
-           given: '6',
-           expected_mixed: '6',
-           expected_recurring: "6"
-       },
-       {
-           given: '-5',
-           expected_mixed: '-5',
-           expected_recurring: "-5"
-       },
-       {
-           given: '1/1',
-           expected_mixed: '1',
-           expected_recurring: "1"
-       },
-       {
-           given: '1/5',
-           expected_mixed: '1/5',
-           expected_recurring: "0.2"
-       },
-       {
-           given: '-1/5',
-           expected_mixed: '-1/5',
-           expected_recurring: "-0.2"
-       },
-       {
-           given: '1/-5',
-           expected_mixed: '-1/5',
-           expected_recurring: "-0.2"
-       },
-       {
-           given: '6/5',
-           expected_mixed: '1+1/5',
-           expected_recurring: "1.2"
-       },
-       {
-           given: '-6/5',
-           expected_mixed: '-1-1/5',
-           expected_recurring: "-1.2"
-       },
-       {
-           given: '6/5a',
-           expected_mixed: '(1+1/5)*a',
-           expected_recurring: "1.2*a"
-       },
-       {
-           given: 'a/5',
-           expected_mixed: '(1/5)*a',
-           expected_recurring: "0.2*a"
-       },
-       {
-           given: '1/a',
-           expected_mixed: 'a^(-1)',
-           expected_recurring: "a^(-1)"
-       },
-       {
-           given: '(2x)/(3y)',
-           expected_mixed: '(2/3)*x*y^(-1)',
-           expected_recurring: "(0.'6')*x*y^(-1)"
-       },
-       {
-           given: '(3x)/(2y)',
-           expected_mixed: '(1+1/2)*x*y^(-1)',
-           expected_recurring: "1.5*x*y^(-1)"
-       },
-       {
-           given: '(2x)/(-3y)',
-           expected_mixed: '(-2/3)*x*y^(-1)',
-           expected_recurring: "(-0.'6')*x*y^(-1)"
-       },
-       {
-           given: '(3x)/(-2y)',
-           expected_mixed: '(-1-1/2)*x*y^(-1)',
-           expected_recurring: "-1.5*x*y^(-1)"
-       },
-       {
-           given: '(10/-8)a^(-9/6)',
-           expected_mixed: '(-1-1/4)*a^(-1-1/2)',
-           expected_recurring: "-1.25*a^(-1.5)"
-       },
-       {
-           given: '1/2+3/4',
-           expected_mixed: '1+1/4',
-           expected_recurring: "1.25"
-       },
-       {
-           given: '2/3+4/7',
-           expected_mixed: '1+5/21',
-           expected_recurring: "1.'238095'"
-       },
-       {
-           given: '100-46/47-98/43-67/44',
-           expected_mixed: '95+19517/88924',
-           expected_recurring: "95.21'947955557554765867482344473932796545364580990508749044127569610004048400881651747559713913004363276505780216814358328460258198011785344788808420673833835634924204939049075615132022850973865323197337051864513517160721515001574378120642346273222077279474607530025639872250461067878188115694300751203274706490936080248301920741307183662453330934280959021186631280644145562502811389501147046916467995141918942017902928343304394764068193063739822770005847690162385857586253429895191399397238090954073141109261841572578831361612163195537762583779407134181998110746255229184472133507264630470963969232153299446718546174261166839098556070352210876703702037695110431379605056002878862849174576042463227025324996626332598623543700238405829697269578516485988034726283118168323512212675992982771805136970896495884125770320723314290855112230668885790112905402366065404165354684899464711438981602267104493724978633439791282443434843236921416040663937744590886599793081732715577346'"
-       },
-       {
-           given: '1+2-2/3+3/4-4/5+5/6-6/7+7/8-8/9+9/10-10/11',
-           expected_mixed: '2+6557/27720',
-           expected_recurring: "2.236'544011'"
-       },
-       {
-           given: '20*30/46',
-           expected_mixed: '13+1/23',
-           expected_recurring: "13.0'4347826086956521739130'"
-       }
-    ];
-    
-    it('should give mixed fractions correctly', function () {
-        for (var i = 0; i < testCases.length; ++i) {
-            // when
-            var text = nerdamer(testCases[i].given).text('mixed');
-            // then
-            expect(text).toEqual(testCases[i].expected_mixed);
-        }
-    });
-    
-    it('should give recurring decimals correctly', function () {
-        for (var i = 0; i < testCases.length; ++i) {
-            // when
-            var text = nerdamer(testCases[i].given).text('recurring');
-            // then
-            expect(text).toEqual(testCases[i].expected_recurring);
-        }
-    });
-});