mathjs 11.8.2 → 11.9.0

package/lib/cjs/expression/embeddedDocs/core/typed.js

@@ -9,7 +9,7 @@ var typedDocs = {
   category: 'Core',
   syntax: ['typed(signatures)', 'typed(name, signatures)'],
   description: 'Create a typed function.',
-  examples: ['double = typed({ "number": f(x)=x+x })', 'double(2)', 'double("hello")'],
+  examples: ['double = typed({ "number": f(x)=x+x, "string": f(x)=concat(x,x) })', 'double(2)', 'double("hello")'],
   seealso: []
 };
 exports.typedDocs = typedDocs;

package/lib/cjs/expression/embeddedDocs/embeddedDocs.js

@@ -85,9 +85,9 @@ var _round = require("./function/arithmetic/round.js");
 var _sign = require("./function/arithmetic/sign.js");
 var _sqrt = require("./function/arithmetic/sqrt.js");
 var _sqrtm = require("./function/arithmetic/sqrtm.js");
-var _sylvester = require("./function/matrix/sylvester.js");
-var _schur = require("./function/matrix/schur.js");
-var _lyap = require("./function/matrix/lyap.js");
+var _sylvester = require("./function/algebra/sylvester.js");
+var _schur = require("./function/algebra/schur.js");
+var _lyap = require("./function/algebra/lyap.js");
 var _square = require("./function/arithmetic/square.js");
 var _subtract = require("./function/arithmetic/subtract.js");
 var _unaryMinus = require("./function/arithmetic/unaryMinus.js");
@@ -187,6 +187,8 @@ var _setPowerset = require("./function/set/setPowerset.js");
 var _setSize = require("./function/set/setSize.js");
 var _setSymDifference = require("./function/set/setSymDifference.js");
 var _setUnion = require("./function/set/setUnion.js");
+var _zpk2tf = require("./function/signal/zpk2tf.js");
+var _freqz = require("./function/signal/freqz.js");
 var _erf = require("./function/special/erf.js");
 var _mad = require("./function/statistics/mad.js");
 var _max = require("./function/statistics/max.js");
@@ -242,6 +244,7 @@ var _numeric = require("./function/utils/numeric.js");
 var _oct = require("./function/utils/oct.js");
 var _print = require("./function/utils/print.js");
 var _typeOf = require("./function/utils/typeOf.js");
+var _solveODE = require("./function/numeric/solveODE.js");
 var embeddedDocs = {
   // construction functions
   bignumber: _bignumber.bignumberDocs,
@@ -613,6 +616,8 @@ var embeddedDocs = {
   sylvester: _sylvester.sylvesterDocs,
   schur: _schur.schurDocs,
   lyap: _lyap.lyapDocs,
+  // functions - numeric
+  solveODE: _solveODE.solveODEDocs,
   // functions - probability
   combinations: _combinations.combinationsDocs,
   combinationsWithRep: _combinationsWithRep.combinationsWithRepDocs,
@@ -649,6 +654,9 @@ var embeddedDocs = {
   setSize: _setSize.setSizeDocs,
   setSymDifference: _setSymDifference.setSymDifferenceDocs,
   setUnion: _setUnion.setUnionDocs,
+  // functions - signal
+  zpk2tf: _zpk2tf.zpk2tfDocs,
+  freqz: _freqz.freqzDocs,
   // functions - special
   erf: _erf.erfDocs,
   // functions - statistics

package/lib/cjs/expression/embeddedDocs/function/{matrix → algebra}/lyap.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.lyapDocs = void 0;
 var lyapDocs = {
   name: 'lyap',
-  category: 'Matrix',
+  category: 'Algebra',
   syntax: ['lyap(A,Q)'],
   description: 'Solves the Continuous-time Lyapunov equation AP+PA\'+Q=0 for P',
-  examples: ['lyap([[-2, 0], [1, -4]], [[3, 1], [1, 3]])', 'lyap(A,Q)'],
+  examples: ['lyap([[-2, 0], [1, -4]], [[3, 1], [1, 3]])', 'A = [[-2, 0], [1, -4]]', 'Q = [[3, 1], [1, 3]]', 'lyap(A,Q)'],
   seealso: ['schur', 'sylvester']
 };
 exports.lyapDocs = lyapDocs;

package/lib/cjs/expression/embeddedDocs/function/algebra/polynomialRoot.js

@@ -9,7 +9,7 @@ var polynomialRootDocs = {
   category: 'Algebra',
   syntax: ['x=polynomialRoot(-6, 3)', 'x=polynomialRoot(4, -4, 1)', 'x=polynomialRoot(-8, 12, -6, 1)'],
   description: 'Finds the roots of a univariate polynomial given by its coefficients starting from constant, linear, and so on, increasing in degree.',
-  examples: ['a = polynomialRoot(-6, 11, -6 1)'],
+  examples: ['a = polynomialRoot(-6, 11, -6, 1)'],
   seealso: ['cbrt', 'sqrt']
 };
 exports.polynomialRootDocs = polynomialRootDocs;

package/lib/cjs/expression/embeddedDocs/function/{matrix → algebra}/schur.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.schurDocs = void 0;
 var schurDocs = {
   name: 'schur',
-  category: 'Matrix',
+  category: 'Algebra',
   syntax: ['schur(A)'],
   description: 'Performs a real Schur decomposition of the real matrix A = UTU\'',
-  examples: ['schur([[1, 0], [-4, 3]])', 'schur(A)'],
+  examples: ['schur([[1, 0], [-4, 3]])', 'A = [[1, 0], [-4, 3]]', 'schur(A)'],
   seealso: ['lyap', 'sylvester']
 };
 exports.schurDocs = schurDocs;

package/lib/cjs/expression/embeddedDocs/function/algebra/simplifyConstant.js

@@ -9,7 +9,7 @@ var simplifyConstantDocs = {
   category: 'Algebra',
   syntax: ['simplifyConstant(expr)', 'simplifyConstant(expr, options)'],
   description: 'Replace constant subexpressions of node with their values.',
-  examples: ['simplifyConatant("(3-3)*x")', 'simplifyConstant(parse("z-cos(tau/8)"))'],
+  examples: ['simplifyConstant("(3-3)*x")', 'simplifyConstant(parse("z-cos(tau/8)"))'],
   seealso: ['simplify', 'simplifyCore', 'evaluate']
 };
 exports.simplifyConstantDocs = simplifyConstantDocs;

package/lib/cjs/expression/embeddedDocs/function/{matrix → algebra}/sylvester.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.sylvesterDocs = void 0;
 var sylvesterDocs = {
   name: 'sylvester',
-  category: 'Matrix',
+  category: 'Algebra',
   syntax: ['sylvester(A,B,C)'],
   description: 'Solves the real-valued Sylvester equation AX+XB=C for X',
-  examples: ['sylvester([[-1, -2], [1, 1]], [[-2, 1], [-1, 2]], [[-3, 2], [3, 0]])', 'sylvester(A,B,C)'],
+  examples: ['sylvester([[-1, -2], [1, 1]], [[-2, 1], [-1, 2]], [[-3, 2], [3, 0]])', 'A = [[-1, -2], [1, 1]]; B = [[2, -1], [1, -2]]; C = [[-3, 2], [3, 0]]', 'sylvester(A, B, C)'],
   seealso: ['schur', 'lyap']
 };
 exports.sylvesterDocs = sylvesterDocs;

package/lib/cjs/expression/embeddedDocs/function/arithmetic/invmod.js

@@ -9,7 +9,7 @@ var invmodDocs = {
   category: 'Arithmetic',
   syntax: ['invmod(a, b)'],
   description: 'Calculate the (modular) multiplicative inverse of a modulo b. Solution to the equation ax ≣ 1 (mod b)',
-  examples: ['invmod(8, 12)=NaN', 'invmod(7, 13)=2', 'invmod(15151, 15122)=10429'],
+  examples: ['invmod(8, 12)', 'invmod(7, 13)', 'invmod(15151, 15122)'],
   seealso: ['gcd', 'xgcd']
 };
 exports.invmodDocs = invmodDocs;

package/lib/cjs/expression/embeddedDocs/function/expression/evaluate.js

@@ -7,9 +7,9 @@ exports.evaluateDocs = void 0;
 var evaluateDocs = {
   name: 'evaluate',
   category: 'Expression',
-  syntax: ['evaluate(expression)', 'evaluate([expr1, expr2, expr3, ...])'],
+  syntax: ['evaluate(expression)', 'evaluate(expression, scope)', 'evaluate([expr1, expr2, expr3, ...])', 'evaluate([expr1, expr2, expr3, ...], scope)'],
   description: 'Evaluate an expression or an array with expressions.',
-  examples: ['evaluate("2 + 3")', 'evaluate("sqrt(" + 4 + ")")'],
+  examples: ['evaluate("2 + 3")', 'evaluate("sqrt(16)")', 'evaluate("2 inch to cm")', 'evaluate("sin(x * pi)", { "x": 1/2 })', 'evaluate(["width=2", "height=4","width*height"])'],
   seealso: []
 };
 exports.evaluateDocs = evaluateDocs;

package/lib/cjs/expression/embeddedDocs/function/matrix/diff.js

@@ -9,7 +9,7 @@ var diffDocs = {
   category: 'Matrix',
   syntax: ['diff(arr)', 'diff(arr, dim)'],
   description: ['Create a new matrix or array with the difference of the passed matrix or array.', 'Dim parameter is optional and used to indicant the dimension of the array/matrix to apply the difference', 'If no dimension parameter is passed it is assumed as dimension 0', 'Dimension is zero-based in javascript and one-based in the parser', 'Arrays must be \'rectangular\' meaning arrays like [1, 2]', 'If something is passed as a matrix it will be returned as a matrix but other than that all matrices are converted to arrays'],
-  examples: ['diff([1, 2, 4, 7, 0])', 'diff([1, 2, 4, 7, 0], 0)', 'diff(matrix([1, 2, 4, 7, 0]))', 'diff([[1, 2], [3, 4]])', 'diff([[1, 2], [3, 4]], 0)', 'diff([[1, 2], [3, 4]], 1)', 'diff([[1, 2], [3, 4]], bignumber(1))', 'diff(matrix([[1, 2], [3, 4]]), 1)', 'diff([[1, 2], matrix([3, 4])], 1)'],
+  examples: ['A = [1, 2, 4, 7, 0]', 'diff(A)', 'diff(A, 1)', 'B = [[1, 2], [3, 4]]', 'diff(B)', 'diff(B, 1)', 'diff(B, 2)', 'diff(B, bignumber(2))', 'diff([[1, 2], matrix([3, 4])], 2)'],
   seealso: ['subtract', 'partitionSelect']
 };
 exports.diffDocs = diffDocs;

package/lib/cjs/expression/embeddedDocs/function/matrix/range.js

@@ -9,7 +9,7 @@ var rangeDocs = {
   category: 'Type',
   syntax: ['start:end', 'start:step:end', 'range(start, end)', 'range(start, end, step)', 'range(string)'],
   description: 'Create a range. Lower bound of the range is included, upper bound is excluded.',
-  examples: ['1:5', '3:-1:-3', 'range(3, 7)', 'range(0, 12, 2)', 'range("4:10")', 'a = [1, 2, 3, 4; 5, 6, 7, 8]', 'a[1:2, 1:2]'],
+  examples: ['1:5', '3:-1:-3', 'range(3, 7)', 'range(0, 12, 2)', 'range("4:10")', 'range(1m, 1m, 3m)', 'a = [1, 2, 3, 4; 5, 6, 7, 8]', 'a[1:2, 1:2]'],
   seealso: ['concat', 'det', 'diag', 'identity', 'inv', 'ones', 'size', 'squeeze', 'subset', 'trace', 'transpose', 'zeros']
 };
 exports.rangeDocs = rangeDocs;

package/lib/cjs/expression/embeddedDocs/function/numeric/solveODE.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.solveODEDocs = void 0;
+var solveODEDocs = {
+  name: 'solveODE',
+  category: 'Numeric',
+  syntax: ['solveODE(func, tspan, y0)', 'solveODE(func, tspan, y0, options)'],
+  description: 'Numerical Integration of Ordinary Differential Equations.',
+  examples: ['f(t,y) = y', 'tspan = [0, 4]', 'solveODE(f, tspan, 1)', 'solveODE(f, tspan, [1, 2])', 'solveODE(f, tspan, 1, { method:"RK23", maxStep:0.1 })'],
+  seealso: ['derivative', 'simplifyCore']
+};
+exports.solveODEDocs = solveODEDocs;

package/lib/cjs/expression/embeddedDocs/function/signal/freqz.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.freqzDocs = void 0;
+var freqzDocs = {
+  name: 'freqz',
+  category: 'Signal',
+  syntax: ['freqz(b, a)', 'freqz(b, a, w)'],
+  description: 'Calculates the frequency response of a filter given its numerator and denominator coefficients.',
+  examples: ['freqz([1, 2], [1, 2, 3])', 'freqz([1, 2], [1, 2, 3], [0, 1])', 'freqz([1, 2], [1, 2, 3], 512)'],
+  seealso: []
+};
+exports.freqzDocs = freqzDocs;

package/lib/cjs/expression/embeddedDocs/function/signal/zpk2tf.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.zpk2tfDocs = void 0;
+var zpk2tfDocs = {
+  name: 'zpk2tf',
+  category: 'Signal',
+  syntax: ['zpk2tf(z, p, k)'],
+  description: 'Compute the transfer function of a zero-pole-gain model.',
+  examples: ['zpk2tf([1, 2], [-1, -2], 1)', 'zpk2tf([1, 2], [-1, -2])', 'zpk2tf([1 - 3i, 2 + 2i], [-1, -2])'],
+  seealso: []
+};
+exports.zpk2tfDocs = zpk2tfDocs;

package/lib/cjs/expression/embeddedDocs/function/utils/numeric.js

@@ -9,7 +9,7 @@ var numericDocs = {
   category: 'Utils',
   syntax: ['numeric(x)'],
   description: 'Convert a numeric input to a specific numeric type: number, BigNumber, or Fraction.',
-  examples: ['numeric("4")', 'numeric("4", "number")', 'numeric("4", "BigNumber")', 'numeric("4", "Fraction)', 'numeric(4, "Fraction")', 'numeric(fraction(2, 5), "number)'],
+  examples: ['numeric("4")', 'numeric("4", "number")', 'numeric("4", "BigNumber")', 'numeric("4", "Fraction")', 'numeric(4, "Fraction")', 'numeric(fraction(2, 5), "number")'],
   seealso: ['number', 'fraction', 'bignumber', 'string', 'format']
 };
 exports.numericDocs = numericDocs;

package/lib/cjs/expression/transform/range.transform.js

@@ -7,7 +7,7 @@ exports.createRangeTransform = void 0;
 var _factory = require("../../utils/factory.js");
 var _range = require("../../function/matrix/range.js");
 var name = 'range';
-var dependencies = ['typed', 'config', '?matrix', '?bignumber', 'smaller', 'smallerEq', 'larger', 'largerEq'];
+var dependencies = ['typed', 'config', '?matrix', '?bignumber', 'smaller', 'smallerEq', 'larger', 'largerEq', 'add', 'isPositive'];
 var createRangeTransform = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
     config = _ref.config,
@@ -16,7 +16,9 @@ var createRangeTransform = /* #__PURE__ */(0, _factory.factory)(name, dependenci
     smaller = _ref.smaller,
     smallerEq = _ref.smallerEq,
     larger = _ref.larger,
-    largerEq = _ref.largerEq;
+    largerEq = _ref.largerEq,
+    add = _ref.add,
+    isPositive = _ref.isPositive;
   var range = (0, _range.createRange)({
     typed: typed,
     config: config,
@@ -25,7 +27,9 @@ var createRangeTransform = /* #__PURE__ */(0, _factory.factory)(name, dependenci
     smaller: smaller,
     smallerEq: smallerEq,
     larger: larger,
-    largerEq: largerEq
+    largerEq: largerEq,
+    add: add,
+    isPositive: isPositive
   });
 
   /**

package/lib/cjs/factoriesAny.js

@@ -741,6 +741,12 @@ Object.defineProperty(exports, "createFractionClass", {
     return _Fraction.createFractionClass;
   }
 });
+Object.defineProperty(exports, "createFreqz", {
+  enumerable: true,
+  get: function get() {
+    return _freqz.createFreqz;
+  }
+});
 Object.defineProperty(exports, "createFunctionAssignmentNode", {
   enumerable: true,
   get: function get() {
@@ -1791,6 +1797,12 @@ Object.defineProperty(exports, "createSmallerEq", {
     return _smallerEq.createSmallerEq;
   }
 });
+Object.defineProperty(exports, "createSolveODE", {
+  enumerable: true,
+  get: function get() {
+    return _solveODE.createSolveODE;
+  }
+});
 Object.defineProperty(exports, "createSort", {
   enumerable: true,
   get: function get() {
@@ -2097,6 +2109,12 @@ Object.defineProperty(exports, "createZeros", {
     return _zeros.createZeros;
   }
 });
+Object.defineProperty(exports, "createZpk2tf", {
+  enumerable: true,
+  get: function get() {
+    return _zpk2tf.createZpk2tf;
+  }
+});
 var _typed = require("./core/function/typed.js");
 var _ResultSet = require("./type/resultset/ResultSet.js");
 var _BigNumber = require("./type/bignumber/BigNumber.js");
@@ -2193,6 +2211,7 @@ var _ctranspose = require("./function/matrix/ctranspose.js");
 var _zeros = require("./function/matrix/zeros.js");
 var _fft = require("./function/matrix/fft.js");
 var _ifft = require("./function/matrix/ifft.js");
+var _solveODE = require("./function/numeric/solveODE.js");
 var _erf = require("./function/special/erf.js");
 var _mode = require("./function/statistics/mode.js");
 var _prod = require("./function/statistics/prod.js");
@@ -2357,6 +2376,8 @@ var _resolve = require("./function/algebra/resolve.js");
 var _symbolicEqual = require("./function/algebra/symbolicEqual.js");
 var _derivative = require("./function/algebra/derivative.js");
 var _rationalize = require("./function/algebra/rationalize.js");
+var _zpk2tf = require("./function/signal/zpk2tf.js");
+var _freqz = require("./function/signal/freqz.js");
 var _reviver = require("./json/reviver.js");
 var _replacer = require("./json/replacer.js");
 var _constants = require("./constants.js");

package/lib/cjs/function/algebra/simplify.js

@@ -542,6 +542,9 @@ var createSimplify = /* #__PURE__ */(0, _factory.factory)(name, dependencies, fu
   },
   // undo replace 'subtract'
   {
+    l: 'n+-(n1)',
+    r: 'n-(n1)'
+  }, {
     s: 'n*(n1^-1) -> n/n1',
     // undo replace 'divide'; for * commutative
     assuming: {

package/lib/cjs/function/matrix/range.js

@@ -7,7 +7,7 @@ exports.createRange = void 0;
 var _factory = require("../../utils/factory.js");
 var _noop = require("../../utils/noop.js");
 var name = 'range';
-var dependencies = ['typed', 'config', '?matrix', '?bignumber', 'smaller', 'smallerEq', 'larger', 'largerEq'];
+var dependencies = ['typed', 'config', '?matrix', '?bignumber', 'smaller', 'smallerEq', 'larger', 'largerEq', 'add', 'isPositive'];
 var createRange = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
     config = _ref.config,
@@ -16,7 +16,9 @@ var createRange = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
     smaller = _ref.smaller,
     smallerEq = _ref.smallerEq,
     larger = _ref.larger,
-    largerEq = _ref.largerEq;
+    largerEq = _ref.largerEq,
+    add = _ref.add,
+    isPositive = _ref.isPositive;
   /**
    * Create an array from a range.
    * By default, the range end is excluded. This can be customized by providing
@@ -37,11 +39,11 @@ var createRange = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
    *
    * - `str: string`
    *   A string 'start:end' or 'start:step:end'
-   * - `start: {number | BigNumber}`
+   * - `start: {number | BigNumber | Unit}`
    *   Start of the range
-   * - `end: number | BigNumber`
+   * - `end: number | BigNumber | Unit`
    *   End of the range, excluded by default, included when parameter includeEnd=true
-   * - `step: number | BigNumber`
+   * - `step: number | BigNumber | Unit`
    *   Step size. Default value is 1.
    * - `includeEnd: boolean`
    *   Option to specify whether to include the end or not. False by default.
@@ -52,6 +54,7 @@ var createRange = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
    *     math.range(2, -3, -1)   // [2, 1, 0, -1, -2]
    *     math.range('2:1:6')     // [2, 3, 4, 5]
    *     math.range(2, 6, true)  // [2, 3, 4, 5, 6]
+   *     math.range(math.unit(2, 'm'), math.unit(-3, 'm'), math.unit(-1, 'm')) // [2 m, 1 m, 0 m , -1 m, -2 m]
    *
    * See also:
    *
@@ -67,30 +70,36 @@ var createRange = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
     string: _strRange,
     'string, boolean': _strRange,
     'number, number': function numberNumber(start, end) {
-      return _out(_rangeEx(start, end, 1));
+      return _out(_range(start, end, 1, false));
     },
     'number, number, number': function numberNumberNumber(start, end, step) {
-      return _out(_rangeEx(start, end, step));
+      return _out(_range(start, end, step, false));
     },
     'number, number, boolean': function numberNumberBoolean(start, end, includeEnd) {
-      return includeEnd ? _out(_rangeInc(start, end, 1)) : _out(_rangeEx(start, end, 1));
+      return _out(_range(start, end, 1, includeEnd));
     },
     'number, number, number, boolean': function numberNumberNumberBoolean(start, end, step, includeEnd) {
-      return includeEnd ? _out(_rangeInc(start, end, step)) : _out(_rangeEx(start, end, step));
+      return _out(_range(start, end, step, includeEnd));
     },
     'BigNumber, BigNumber': function BigNumberBigNumber(start, end) {
       var BigNumber = start.constructor;
-      return _out(_bigRangeEx(start, end, new BigNumber(1)));
+      return _out(_range(start, end, new BigNumber(1), false));
     },
     'BigNumber, BigNumber, BigNumber': function BigNumberBigNumberBigNumber(start, end, step) {
-      return _out(_bigRangeEx(start, end, step));
+      return _out(_range(start, end, step, false));
     },
     'BigNumber, BigNumber, boolean': function BigNumberBigNumberBoolean(start, end, includeEnd) {
       var BigNumber = start.constructor;
-      return includeEnd ? _out(_bigRangeInc(start, end, new BigNumber(1))) : _out(_bigRangeEx(start, end, new BigNumber(1)));
+      return _out(_range(start, end, new BigNumber(1), includeEnd));
     },
     'BigNumber, BigNumber, BigNumber, boolean': function BigNumberBigNumberBigNumberBoolean(start, end, step, includeEnd) {
-      return includeEnd ? _out(_bigRangeInc(start, end, step)) : _out(_bigRangeEx(start, end, step));
+      return _out(_range(start, end, step, includeEnd));
+    },
+    'Unit, Unit, Unit': function UnitUnitUnit(start, end, step) {
+      return _out(_range(start, end, step, false));
+    },
+    'Unit, Unit, Unit, boolean': function UnitUnitUnitBoolean(start, end, step, includeEnd) {
+      return _out(_range(start, end, step, includeEnd));
     }
   });
   function _out(arr) {
@@ -104,117 +113,32 @@ var createRange = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
     if (!r) {
       throw new SyntaxError('String "' + str + '" is no valid range');
     }
-    var fn;
     if (config.number === 'BigNumber') {
       if (bignumber === undefined) {
         (0, _noop.noBignumber)();
       }
-      fn = includeEnd ? _bigRangeInc : _bigRangeEx;
-      return _out(fn(bignumber(r.start), bignumber(r.end), bignumber(r.step)));
+      return _out(_range(bignumber(r.start), bignumber(r.end), bignumber(r.step)), includeEnd);
     } else {
-      fn = includeEnd ? _rangeInc : _rangeEx;
-      return _out(fn(r.start, r.end, r.step));
-    }
-  }
-
-  /**
-   * Create a range with numbers. End is excluded
-   * @param {number} start
-   * @param {number} end
-   * @param {number} step
-   * @returns {Array} range
-   * @private
-   */
-  function _rangeEx(start, end, step) {
-    var array = [];
-    var x = start;
-    if (step > 0) {
-      while (smaller(x, end)) {
-        array.push(x);
-        x += step;
-      }
-    } else if (step < 0) {
-      while (larger(x, end)) {
-        array.push(x);
-        x += step;
-      }
-    }
-    return array;
-  }
-
-  /**
-   * Create a range with numbers. End is included
-   * @param {number} start
-   * @param {number} end
-   * @param {number} step
-   * @returns {Array} range
-   * @private
-   */
-  function _rangeInc(start, end, step) {
-    var array = [];
-    var x = start;
-    if (step > 0) {
-      while (smallerEq(x, end)) {
-        array.push(x);
-        x += step;
-      }
-    } else if (step < 0) {
-      while (largerEq(x, end)) {
-        array.push(x);
-        x += step;
-      }
-    }
-    return array;
-  }
-
-  /**
-   * Create a range with big numbers. End is excluded
-   * @param {BigNumber} start
-   * @param {BigNumber} end
-   * @param {BigNumber} step
-   * @returns {Array} range
-   * @private
-   */
-  function _bigRangeEx(start, end, step) {
-    var zero = bignumber(0);
-    var array = [];
-    var x = start;
-    if (step.gt(zero)) {
-      while (smaller(x, end)) {
-        array.push(x);
-        x = x.plus(step);
-      }
-    } else if (step.lt(zero)) {
-      while (larger(x, end)) {
-        array.push(x);
-        x = x.plus(step);
-      }
+      return _out(_range(r.start, r.end, r.step, includeEnd));
     }
-    return array;
   }
 
   /**
-   * Create a range with big numbers. End is included
-   * @param {BigNumber} start
-   * @param {BigNumber} end
-   * @param {BigNumber} step
+   * Create a range with numbers or BigNumbers
+   * @param {number | BigNumber | Unit} start
+   * @param {number | BigNumber | Unit} end
+   * @param {number | BigNumber | Unit} step
+   * @param {boolean} includeEnd
    * @returns {Array} range
    * @private
    */
-  function _bigRangeInc(start, end, step) {
-    var zero = bignumber(0);
+  function _range(start, end, step, includeEnd) {
     var array = [];
+    var ongoing = isPositive(step) ? includeEnd ? smallerEq : smaller : includeEnd ? largerEq : larger;
     var x = start;
-    if (step.gt(zero)) {
-      while (smallerEq(x, end)) {
-        array.push(x);
-        x = x.plus(step);
-      }
-    } else if (step.lt(zero)) {
-      while (largerEq(x, end)) {
-        array.push(x);
-        x = x.plus(step);
-      }
+    while (ongoing(x, end)) {
+      array.push(x);
+      x = add(x, step);
     }
     return array;
   }