mathjs 3.1.3 → 3.1.4

package/HISTORY.md

@@ -1,6 +1,20 @@
 # History
 
 
+## 2016-04-03, version 3.1.4
+
+- Using ES6 Math functions like `Math.sinh`, `Math.cbrt`, `Math.sign`, etc when
+  available.
+- Fixed #631: unit aliases `weeks`, `months`, and `years` where missing.
+- Fixed #632: problem with escaped backslashes at the end of strings.
+- Fixed #635: `Node.toString` options where not passed to function arguments.
+- Fixed #629: expression parser throws an error when passing a number with
+  decimal exponent instead of parsing them as implicit multiplication.
+- Fixed #484, #555: inaccuracy of `math.sinh` for values between -1 and 1.
+- Fixed #625: Unit `in` (`inch`) not always working due to ambiguity with
+  the operator `a in b` (alias of `a to b`).
+
+
 ## 2016-03-24, version 3.1.3
 
 - Fix broken bundle.

package/dist/math.js

@@ -6,8 +6,8 @@
  * It features real and complex numbers, units, matrices, a large set of
  * mathematical functions, and a flexible expression parser.
  *
- * @version 3.1.3
- * @date    2016-03-24
+ * @version 3.1.4
+ * @date    2016-04-03
  *
  * @license
  * Copyright (C) 2013-2016 Jos de Jong <wjosdejong@gmail.com>
@@ -2037,7 +2037,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	 * @param {number} x
 	 * @returns {*}
 	 */
-	exports.sign = function(x) {
+	exports.sign = Math.sign || function(x) {
 	  if (x > 0) {
 	    return 1;
 	  }
@@ -20736,6 +20736,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	    hr: 'hour',
 	    hrs: 'hour',
 	    days: 'day',
+	    weeks: 'week',
+	    months: 'month',
+	    years: 'year',
 
 	    hertz: 'hertz',
 
@@ -23332,7 +23335,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	   *    math.format(value)
 	   *    math.format(value, options)
 	   *    math.format(value, precision)
-	   *    math.format(value, fn)
+	   *    math.format(value, callback)
 	   *
 	   * Where:
 	   *
@@ -23367,10 +23370,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	   *    - `fraction: string`. Available values: 'ratio' (default) or 'decimal'.
 	   *      For example `format(fraction(1, 3))` will output '1/3' when 'ratio' is
 	   *      configured, and will output `0.(3)` when 'decimal' is configured.
-	   * - `fn: Function`
-	   *   A custom formatting function. Can be used to override the built-in notations.
-	   *   Function `fn` is called with `value` as parameter and must return a string.
-	   *   Is useful for example to format all values inside a matrix in a particular way.
+	   * - `callback: function`
+	   *   A custom formatting function, invoked for all numeric elements in `value`,
+	   *   for example all elements of a matrix, or the real and imaginary
+	   *   parts of a complex number. This callback can be used to override the
+	   *   built-in numeric notation with any type of formatting. Function `callback`
+	   *   is called with `value` as parameter and must return a string.
 	   *
 	   * When `value` is an Object:
 	   *
@@ -23398,6 +23403,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	   *    math.format(2.3,    {notation: 'fixed', precision: 2});  // returns '2.30'
 	   *    math.format(52.8,   {notation: 'exponential'});          // returns '5.28e+1'
 	   *
+	   *    function formatCurrency(value) {
+	   *      return '$' + value.toFixed(2);
+	   *    }
+	   *    math.format([2.1, 3, 0.016], formatCurrency};            // returns '[$2.10, $3.00, $0.02]'
+	   *
 	   * See also:
 	   *
 	   *    print
@@ -23737,7 +23747,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 94 */
 /***/ function(module, exports) {
 
-	module.exports = '3.1.3';
+	module.exports = '3.1.4';
 	// Note: This file is automatically generated when building math.js.
 	// Changes made in this file will be overwritten.
 
@@ -28381,7 +28391,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        next();
 
 	        if (!isDigit(c)) {
-	          // this is no legal number, it is just a dot
+	          // this is no legal number, it is just a dot (can be dot notation)
 	          token_type = TOKENTYPE.UNKNOWN;
 	        }
 	      }
@@ -28402,24 +28412,33 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      // check for exponential notation like "2.3e-4", "1.23e50" or "2e+4"
 	      c2 = nextPreview();
-	      if ((c == 'E' || c == 'e') && (isDigit(c2) || c2 == '-' || c2 == '+')) {
-	        token += c;
-	        next();
-
-	        if (c == '+' || c == '-') {
+	      if (c == 'E' || c == 'e') {
+	        if (isDigit(c2) || c2 == '-' || c2 == '+') {
 	          token += c;
 	          next();
-	        }
 
-	        // Scientific notation MUST be followed by an exponent
-	        if (!isDigit(c)) {
-	          // this is no legal number, exponent is missing.
-	          token_type = TOKENTYPE.UNKNOWN;
-	        }
+	          if (c == '+' || c == '-') {
+	            token += c;
+	            next();
+	          }
 
-	        while (isDigit(c)) {
-	          token += c;
+	          // Scientific notation MUST be followed by an exponent
+	          if (!isDigit(c)) {
+	            throw createSyntaxError('Digit expected, got "' + c + '"');
+	          }
+
+	          while (isDigit(c)) {
+	            token += c;
+	            next();
+	          }
+
+	          if (c == '.') {
+	            throw createSyntaxError('Digit expected, got "' + c + '"');
+	          }
+	        }
+	        else if (c2 == '.') {
 	          next();
+	          throw createSyntaxError('Digit expected, got "' + c + '"');
 	        }
 	      }
 
@@ -28884,8 +28903,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	      fn = operators[name];
 
 	      getTokenSkipNewline();
-	      params = [node, parseRange()];
-	      node = new OperatorNode(name, fn, params);
+	      
+	      if (name === 'in' && token === '') {
+	        // end of expression -> this is the unit 'in' ('inch')
+	        node = new OperatorNode('*', 'multiply', [node, new SymbolNode('in')], true);
+	      }
+	      else {
+	        // operator 'a to b' or 'a in b'
+	        params = [node, parseRange()];
+	        node = new OperatorNode(name, fn, params);
+	      }
 	    }
 
 	    return node;
@@ -29306,11 +29333,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 	  function parseStringToken () {
 	    var str = '';
-	    var tPrev = '';
 
-	    while (c != '' && (c != '\"' || tPrev == '\\')) { // also handle escape character
+	    while (c != '' && c != '\"') {
+	      if (c == '\\') {
+	        // escape character
+	        str += c;
+	        next();
+	      }
+
 	      str += c;
-	      tPrev = c;
 	      next();
 	    }
 
@@ -32704,10 +32735,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @extends {Node}
 	   * An operator with two arguments, like 2+3
 	   *
-	   * @param {string} op       Operator name, for example '+'
-	   * @param {string} fn       Function name, for example 'add'
-	   * @param {Node[]} args     Operator arguments
-	   * @param {boolean} implicit Is this an implicit multiplication?
+	   * @param {string} op           Operator name, for example '+'
+	   * @param {string} fn           Function name, for example 'add'
+	   * @param {Node[]} args         Operator arguments
+	   * @param {boolean} [implicit]  Is this an implicit multiplication?
 	   */
 	  function OperatorNode(op, fn, args, implicit) {
 	    if (!(this instanceof OperatorNode)) {
@@ -33318,7 +33349,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 	  FunctionNode.prototype.toString = function (options) {
 	    var customString;
-	    var name = this.fn.toString();
+	    var name = this.fn.toString(options);
 	    if (options && (typeof options.handler === 'object') && options.handler.hasOwnProperty(name)) {
 	      //callback is a map of callback functions
 	      customString = options.handler[name](this, options);
@@ -33338,8 +33369,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @return {string} str
 	   */
 	  FunctionNode.prototype._toString = function (options) {
-	    // format the parameters like "add(2, 4.2)"
-	    return this.fn.toString() + '(' + this.args.join(', ') + ')';
+	    var args = this.args.map(function (arg) {
+	      return arg.toString(options);
+	    });
+
+	    // format the arguments like "add(2, 4.2)"
+	    return this.fn.toString(options) + '(' + args.join(', ') + ')';
 	  };
 
 	  /*
@@ -33451,9 +33486,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @return {string} str
 	   */
 	  FunctionNode.prototype._toTex = function (options) {
-	    var parenthesis = (options && options.parenthesis) ? options.parenthesis : 'keep';
-
-
 	    var args = this.args.map(function (arg) { //get LaTeX of the arguments
 	      return arg.toTex(options);
 	    });
@@ -39901,38 +39933,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	  });
 
-	  /**
-	   * Calculate cbrt for a number
-	   *
-	   * Code from es6-shim.js:
-	   *   https://github.com/paulmillr/es6-shim/blob/master/es6-shim.js#L1564-L1577
-	   *
-	   * @param {number} x
-	   * @returns {number | Complex} Returns the cubic root of x
-	   * @private
-	   */
-	  function _cbrtNumber(x) {
-	    if (x === 0) {
-	      return x;
-	    }
-
-	    var negate = x < 0;
-	    var result;
-	    if (negate) {
-	      x = -x;
-	    }
-
-	    if (isFinite(x)) {
-	      result = Math.exp(Math.log(x) / 3);
-	      // from http://en.wikipedia.org/wiki/Cube_root#Numerical_methods
-	      result = (x / (result * result) + (2 * result)) / 3;
-	    } else {
-	      result = x;
-	    }
-
-	    return negate ? -result : result;
-	  }
-
 	  /**
 	   * Calculate the cubic root for a complex number
 	   * @param {Complex} x
@@ -40015,6 +40015,38 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return cbrt;
 	}
 
+	/**
+	 * Calculate cbrt for a number
+	 *
+	 * Code from es6-shim.js:
+	 *   https://github.com/paulmillr/es6-shim/blob/master/es6-shim.js#L1564-L1577
+	 *
+	 * @param {number} x
+	 * @returns {number | Complex} Returns the cubic root of x
+	 * @private
+	 */
+	var _cbrtNumber = Math.cbrt || function (x) {
+	  if (x === 0) {
+	    return x;
+	  }
+
+	  var negate = x < 0;
+	  var result;
+	  if (negate) {
+	    x = -x;
+	  }
+
+	  if (isFinite(x)) {
+	    result = Math.exp(Math.log(x) / 3);
+	    // from http://en.wikipedia.org/wiki/Cube_root#Numerical_methods
+	    result = (x / (result * result) + (2 * result)) / 3;
+	  } else {
+	    result = x;
+	  }
+
+	  return negate ? -result : result;
+	};
+
 	exports.name = 'cbrt';
 	exports.factory = factory;
 
@@ -42157,7 +42189,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	function factory (type, config, load, typed) {
 	  /**
-	   * Calculate the 10-base of a value. This is the same as calculating `log(x, 10)`.
+	   * Calculate the 10-base logarithm of a value. This is the same as calculating `log(x, 10)`.
 	   *
 	   * For matrices, the function is evaluated element wise.
 	   *
@@ -42184,7 +42216,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var log10 = typed('log10', {
 	    'number': function (x) {
 	      if (x >= 0 || config.predictable) {
-	        return Math.log(x) / Math.LN10;
+	        return _log10(x);
 	      }
 	      else {
 	        // negative value -> complex value computation
@@ -42216,6 +42248,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return log10;
 	}
 
+	/**
+	 * Calculate the 10-base logarithm of a number
+	 * @param {number} x
+	 * @return {number}
+	 * @private
+	 */
+	var _log10 = Math.log10 || function (x) {
+	  return Math.log(x) / Math.LN10;
+	};
+
 	exports.name = 'log10';
 	exports.factory = factory;
 
@@ -51034,7 +51076,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var acosh = typed('acosh', {
 	    'number': function (x) {
 	      if (x >= 1 || config.predictable) {
-	        return Math.log(Math.sqrt(x*x - 1) + x);
+	        return _acosh(x);
 	      }
 	      if (x <= -1) {
 	        return new type.Complex(Math.log(Math.sqrt(x*x - 1) - x), Math.PI);
@@ -51060,6 +51102,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return acosh;
 	}
 
+	/**
+	 * Calculate the hyperbolic arccos of a number
+	 * @param {number} x
+	 * @return {number}
+	 * @private
+	 */
+	var _acosh = Math.acosh || function (x) {
+	  return Math.log(Math.sqrt(x*x - 1) + x)
+	};
+
 	exports.name = 'acosh';
 	exports.factory = factory;
 
@@ -51539,7 +51591,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @return {number | Complex | Array | Matrix} Hyperbolic arcsine of x
 	   */
 	  var asinh = typed('asinh', {
-	    'number': function (x) {
+	    'number': Math.asinh || function (x) {
 	      return Math.log(Math.sqrt(x*x + 1) + x);
 	    },
 
@@ -51818,7 +51870,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var atanh = typed('atanh', {
 	    'number': function (x) {
 	      if ((x <= 1 && x >= -1) || config.predictable) {
-	        return Math.log((1 + x)/(1 - x)) / 2;
+	        return _atanh(x);
 	      }
 	      return new type.Complex(x, 0).atanh();
 	    },
@@ -51842,6 +51894,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return atanh;
 	}
 
+	/**
+	 * Calculate the hyperbolic arctangent of a number
+	 * @param {number} x
+	 * @return {number}
+	 * @private
+	 */
+	var _atanh = Math.atanh || function (x) {
+	  return Math.log((1 + x)/(1 - x)) / 2
+	};
+
 	exports.name = 'atanh';
 	exports.factory = factory;
 
@@ -51978,9 +52040,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	 * @returns {number}
 	 * @private
 	 */
-	function _cosh(x) {
+	var _cosh = Math.cosh || function (x) {
 	  return (Math.exp(x) + Math.exp(-x)) / 2;
-	}
+	};
 
 	exports.name = 'cosh';
 	exports.factory = factory;
@@ -52542,13 +52604,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	 * @returns {number}
 	 * @private
 	 */
-	function _sinh (x) {
-	  if (Math.abs(x) < 1) {
-	    return x + (x * x * x) / 6 + (x * x * x * x * x) / 120;
-	  } else {
-	    return (Math.exp(x) - Math.exp(-x)) / 2;
-	  }
-	}
+	var _sinh = Math.sinh || function (x) {
+	  return (Math.exp(x) - Math.exp(-x)) / 2;
+	};
 
 	exports.name = 'sinh';
 	exports.factory = factory;
@@ -52687,10 +52745,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	 * @returns {number}
 	 * @private
 	 */
-	function _tanh (x) {
+	var _tanh = Math.tanh || function (x) {
 	  var e = Math.exp(2 * x);
 	  return (e - 1) / (e + 1);
-	}
+	};
 
 	exports.name = 'tanh';
 	exports.factory = factory;