mathjs 7.3.0 → 7.6.0

package/es/expression/node/Node.js

@@ -123,8 +123,8 @@ export var createNode = /* #__PURE__ */factory(name, dependencies, function (_re
 
   Node.prototype.traverse = function (callback) {
     // execute callback for itself
-    callback(this, null, null); // eslint-disable-line standard/no-callback-literal
-    // recursively traverse over all childs of a node
+    // eslint-disable-next-line
+    callback(this, null, null); // recursively traverse over all childs of a node
 
     function _traverse(node, callback) {
       node.forEach(function (child, path, parent) {

package/es/factoriesAny.js

@@ -78,6 +78,8 @@ export { createOnes } from './function/matrix/ones';
 export { createRange } from './function/matrix/range';
 export { createReshape } from './function/matrix/reshape';
 export { createResize } from './function/matrix/resize';
+export { createRotate } from './function/matrix/rotate';
+export { createRotationMatrix } from './function/matrix/rotationMatrix';
 export { createRow } from './function/matrix/row';
 export { createSize } from './function/matrix/size';
 export { createSqueeze } from './function/matrix/squeeze';

package/es/function/arithmetic/ceil.js

@@ -1,15 +1,38 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { Decimal } from 'decimal.js';
 import { factory } from '../../utils/factory';
 import { deepMap } from '../../utils/collection';
 import { nearlyEqual } from '../../utils/number';
 import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual';
 import { ceilNumber } from '../../plain/number';
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11';
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14';
 var name = 'ceil';
-var dependencies = ['typed', 'config', 'round'];
+var dependencies = ['typed', 'config', 'round', 'matrix', 'equalScalar'];
 export var createCeil = /* #__PURE__ */factory(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       config = _ref.config,
-      round = _ref.round;
-
+      round = _ref.round,
+      matrix = _ref.matrix,
+      equalScalar = _ref.equalScalar;
+  var algorithm11 = createAlgorithm11({
+    typed: typed,
+    equalScalar: equalScalar
+  });
+  var algorithm14 = createAlgorithm14({
+    typed: typed
+  });
   /**
    * Round a value towards plus infinity
    * If `x` is complex, both real and imaginary part are rounded towards plus infinity.
@@ -18,6 +41,7 @@ export var createCeil = /* #__PURE__ */factory(name, dependencies, function (_re
    * Syntax:
    *
    *    math.ceil(x)
+   *    math.ceil(x, n)
    *
    * Examples:
    *
@@ -26,18 +50,27 @@ export var createCeil = /* #__PURE__ */factory(name, dependencies, function (_re
    *    math.ceil(-4.2)              // returns number -4
    *    math.ceil(-4.7)              // returns number -4
    *
-   *    const c = math.complex(3.2, -2.7)
+   *    math.ceil(3.212, 2)          // returns number 3.22
+   *    math.ceil(3.288, 2)          // returns number 3.29
+   *    math.ceil(-4.212, 2)         // returns number -4.21
+   *    math.ceil(-4.782, 2)         // returns number -4.78
+   *
+   *    const c = math.complex(3.24, -2.71)
    *    math.ceil(c)                 // returns Complex 4 - 2i
+   *    math.ceil(c, 1)              // returns Complex 3.3 - 2.7i
    *
    *    math.ceil([3.2, 3.8, -4.7])  // returns Array [4, 4, -4]
+   *    math.ceil([3.21, 3.82, -4.71], 1)  // returns Array [3.3, 3.9, -4.7]
    *
    * See also:
    *
    *    floor, fix, round
    *
    * @param  {number | BigNumber | Fraction | Complex | Array | Matrix} x  Number to be rounded
+   * @param  {number | BigNumber | Array} [n=0]                            Number of decimals
    * @return {number | BigNumber | Fraction | Complex | Array | Matrix} Rounded value
    */
+
   return typed('ceil', {
     number: function number(x) {
       if (nearlyEqual(x, round(x), config.epsilon)) {
@@ -46,9 +79,32 @@ export var createCeil = /* #__PURE__ */factory(name, dependencies, function (_re
         return ceilNumber(x);
       }
     },
+    'number, number': function numberNumber(x, n) {
+      if (nearlyEqual(x, round(x, n), config.epsilon)) {
+        return round(x, n);
+      } else {
+        var _$split = "".concat(x, "e").split('e'),
+            _$split2 = _slicedToArray(_$split, 2),
+            number = _$split2[0],
+            exponent = _$split2[1];
+
+        var result = Math.ceil(Number("".concat(number, "e").concat(Number(exponent) + n)));
+
+        var _$split3 = "".concat(result, "e").split('e');
+
+        var _$split4 = _slicedToArray(_$split3, 2);
+
+        number = _$split4[0];
+        exponent = _$split4[1];
+        return Number("".concat(number, "e").concat(Number(exponent) - n));
+      }
+    },
     Complex: function Complex(x) {
       return x.ceil();
     },
+    'Complex, number': function ComplexNumber(x, n) {
+      return x.ceil(n);
+    },
     BigNumber: function BigNumber(x) {
       if (bigNearlyEqual(x, round(x), config.epsilon)) {
         return round(x);
@@ -56,12 +112,40 @@ export var createCeil = /* #__PURE__ */factory(name, dependencies, function (_re
         return x.ceil();
       }
     },
+    'BigNumber, BigNumber': function BigNumberBigNumber(x, n) {
+      if (bigNearlyEqual(x, round(x, n), config.epsilon)) {
+        return round(x, n);
+      } else {
+        return x.toDecimalPlaces(n.toNumber(), Decimal.ROUND_CEIL);
+      }
+    },
     Fraction: function Fraction(x) {
       return x.ceil();
     },
+    'Fraction, number': function FractionNumber(x, n) {
+      return x.ceil(n);
+    },
     'Array | Matrix': function ArrayMatrix(x) {
       // deep map collection, skip zeros since ceil(0) = 0
       return deepMap(x, this, true);
+    },
+    'Array | Matrix, number': function ArrayMatrixNumber(x, n) {
+      var _this = this;
+
+      // deep map collection, skip zeros since ceil(0) = 0
+      return deepMap(x, function (i) {
+        return _this(i, n);
+      }, true);
+    },
+    'SparseMatrix, number | BigNumber': function SparseMatrixNumberBigNumber(x, y) {
+      return algorithm11(x, y, this, false);
+    },
+    'DenseMatrix, number | BigNumber': function DenseMatrixNumberBigNumber(x, y) {
+      return algorithm14(x, y, this, false);
+    },
+    'number | Complex | BigNumber, Array': function numberComplexBigNumberArray(x, y) {
+      // use matrix implementation
+      return algorithm14(matrix(y), x, this, true).valueOf();
     }
   });
 });

package/es/function/arithmetic/fix.js

@@ -1,13 +1,17 @@
 import { factory } from '../../utils/factory';
 import { deepMap } from '../../utils/collection';
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14';
 var name = 'fix';
-var dependencies = ['typed', 'Complex', 'ceil', 'floor'];
+var dependencies = ['typed', 'Complex', 'matrix', 'ceil', 'floor'];
 export var createFix = /* #__PURE__ */factory(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       _Complex = _ref.Complex,
+      matrix = _ref.matrix,
       ceil = _ref.ceil,
       floor = _ref.floor;
-
+  var algorithm14 = createAlgorithm14({
+    typed: typed
+  });
   /**
    * Round a value towards zero.
    * For matrices, the function is evaluated element wise.
@@ -23,34 +27,67 @@ export var createFix = /* #__PURE__ */factory(name, dependencies, function (_ref
    *    math.fix(-4.2)               // returns number -4
    *    math.fix(-4.7)               // returns number -4
    *
-   *    const c = math.complex(3.2, -2.7)
+   *    math.fix(3.12, 1)                // returns number 3.1
+   *    math.fix(3.18, 1)                // returns number 3.1
+   *    math.fix(-4.12, 1)               // returns number -4.1
+   *    math.fix(-4.17, 1)               // returns number -4.1
+   *
+   *    const c = math.complex(3.22, -2.78)
    *    math.fix(c)                  // returns Complex 3 - 2i
+   *    math.fix(c, 1)               // returns Complex 3.2 - 2.7i
    *
-   *    math.fix([3.2, 3.8, -4.7])   // returns Array [3, 3, -4]
+   *    math.fix([3.2, 3.8, -4.7])      // returns Array [3, 3, -4]
+   *    math.fix([3.2, 3.8, -4.7], 1)   // returns Array [3.2, 3.8, -4.7]
    *
    * See also:
    *
    *    ceil, floor, round
    *
-   * @param {number | BigNumber | Fraction | Complex | Array | Matrix} x Number to be rounded
-   * @return {number | BigNumber | Fraction | Complex | Array | Matrix}            Rounded value
+   * @param  {number | BigNumber | Fraction | Complex | Array | Matrix} x    Number to be rounded
+   * @param  {number | BigNumber | Array} [n=0]                             Number of decimals
+   * @return {number | BigNumber | Fraction | Complex | Array | Matrix}     Rounded value
    */
+
   return typed('fix', {
     number: function number(x) {
       return x > 0 ? floor(x) : ceil(x);
     },
+    'number, number | BigNumber': function numberNumberBigNumber(x, n) {
+      return x > 0 ? floor(x, n) : ceil(x, n);
+    },
     Complex: function Complex(x) {
       return new _Complex(x.re > 0 ? Math.floor(x.re) : Math.ceil(x.re), x.im > 0 ? Math.floor(x.im) : Math.ceil(x.im));
     },
+    'Complex, number | BigNumber': function ComplexNumberBigNumber(x, n) {
+      return new _Complex(x.re > 0 ? floor(x.re, n) : ceil(x.re, n), x.im > 0 ? floor(x.im, n) : ceil(x.im, n));
+    },
     BigNumber: function BigNumber(x) {
       return x.isNegative() ? ceil(x) : floor(x);
     },
+    'BigNumber, number | BigNumber': function BigNumberNumberBigNumber(x, n) {
+      return x.isNegative() ? ceil(x, n) : floor(x, n);
+    },
     Fraction: function Fraction(x) {
       return x.s < 0 ? x.ceil() : x.floor();
     },
+    'Fraction, number | BigNumber': function FractionNumberBigNumber(x, n) {
+      return x.s < 0 ? x.ceil(n) : x.floor(n);
+    },
     'Array | Matrix': function ArrayMatrix(x) {
       // deep map collection, skip zeros since fix(0) = 0
       return deepMap(x, this, true);
+    },
+    'Array | Matrix, number | BigNumber': function ArrayMatrixNumberBigNumber(x, n) {
+      var _this = this;
+
+      // deep map collection, skip zeros since fix(0) = 0
+      return deepMap(x, function (i) {
+        return _this(i, n);
+      }, true);
+    },
+    'number | Complex | BigNumber, Array': function numberComplexBigNumberArray(x, y) {
+      // use matrix implementation
+      return algorithm14(matrix(y), x, this, true).valueOf();
     }
   });
 });

package/es/function/arithmetic/floor.js

@@ -1,14 +1,37 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { Decimal } from 'decimal.js';
 import { factory } from '../../utils/factory';
 import { deepMap } from '../../utils/collection';
 import { nearlyEqual } from '../../utils/number';
 import { nearlyEqual as bigNearlyEqual } from '../../utils/bignumber/nearlyEqual';
+import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11';
+import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14';
 var name = 'floor';
-var dependencies = ['typed', 'config', 'round'];
+var dependencies = ['typed', 'config', 'round', 'matrix', 'equalScalar'];
 export var createFloor = /* #__PURE__ */factory(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       config = _ref.config,
-      round = _ref.round;
-
+      round = _ref.round,
+      matrix = _ref.matrix,
+      equalScalar = _ref.equalScalar;
+  var algorithm11 = createAlgorithm11({
+    typed: typed,
+    equalScalar: equalScalar
+  });
+  var algorithm14 = createAlgorithm14({
+    typed: typed
+  });
   /**
    * Round a value towards minus infinity.
    * For matrices, the function is evaluated element wise.
@@ -16,6 +39,7 @@ export var createFloor = /* #__PURE__ */factory(name, dependencies, function (_r
    * Syntax:
    *
    *    math.floor(x)
+   *    math.floor(x, n)
    *
    * Examples:
    *
@@ -24,18 +48,27 @@ export var createFloor = /* #__PURE__ */factory(name, dependencies, function (_r
    *    math.floor(-4.2)             // returns number -5
    *    math.floor(-4.7)             // returns number -5
    *
-   *    const c = math.complex(3.2, -2.7)
-   *    math.floor(c)                // returns Complex 3 - 3i
+   *    math.floor(3.212, 2)          // returns number 3.21
+   *    math.floor(3.288, 2)          // returns number 3.28
+   *    math.floor(-4.212, 2)         // returns number -4.22
+   *    math.floor(-4.782, 2)         // returns number -4.79
    *
-   *    math.floor([3.2, 3.8, -4.7]) // returns Array [3, 3, -5]
+   *    const c = math.complex(3.24, -2.71)
+   *    math.floor(c)                 // returns Complex 3 - 3i
+   *    math.floor(c, 1)              // returns Complex 3.2 - 2.8i
+   *
+   *    math.floor([3.2, 3.8, -4.7])       // returns Array [3, 3, -5]
+   *    math.floor([3.21, 3.82, -4.71], 1)  // returns Array [3.2, 3.8, -4.8]
    *
    * See also:
    *
    *    ceil, fix, round
    *
    * @param  {number | BigNumber | Fraction | Complex | Array | Matrix} x  Number to be rounded
+   * @param  {number | BigNumber | Array} [n=0]                            Number of decimals
    * @return {number | BigNumber | Fraction | Complex | Array | Matrix} Rounded value
    */
+
   return typed('floor', {
     number: function number(x) {
       if (nearlyEqual(x, round(x), config.epsilon)) {
@@ -44,9 +77,32 @@ export var createFloor = /* #__PURE__ */factory(name, dependencies, function (_r
         return Math.floor(x);
       }
     },
+    'number, number': function numberNumber(x, n) {
+      if (nearlyEqual(x, round(x, n), config.epsilon)) {
+        return round(x, n);
+      } else {
+        var _$split = "".concat(x, "e").split('e'),
+            _$split2 = _slicedToArray(_$split, 2),
+            number = _$split2[0],
+            exponent = _$split2[1];
+
+        var result = Math.floor(Number("".concat(number, "e").concat(Number(exponent) + n)));
+
+        var _$split3 = "".concat(result, "e").split('e');
+
+        var _$split4 = _slicedToArray(_$split3, 2);
+
+        number = _$split4[0];
+        exponent = _$split4[1];
+        return Number("".concat(number, "e").concat(Number(exponent) - n));
+      }
+    },
     Complex: function Complex(x) {
       return x.floor();
     },
+    'Complex, number': function ComplexNumber(x, n) {
+      return x.floor(n);
+    },
     BigNumber: function BigNumber(x) {
       if (bigNearlyEqual(x, round(x), config.epsilon)) {
         return round(x);
@@ -54,12 +110,40 @@ export var createFloor = /* #__PURE__ */factory(name, dependencies, function (_r
         return x.floor();
       }
     },
+    'BigNumber, BigNumber': function BigNumberBigNumber(x, n) {
+      if (bigNearlyEqual(x, round(x, n), config.epsilon)) {
+        return round(x, n);
+      } else {
+        return x.toDecimalPlaces(n.toNumber(), Decimal.ROUND_FLOOR);
+      }
+    },
     Fraction: function Fraction(x) {
       return x.floor();
     },
+    'Fraction, number': function FractionNumber(x, n) {
+      return x.floor(n);
+    },
     'Array | Matrix': function ArrayMatrix(x) {
       // deep map collection, skip zeros since floor(0) = 0
       return deepMap(x, this, true);
+    },
+    'Array | Matrix, number': function ArrayMatrixNumber(x, n) {
+      var _this = this;
+
+      // deep map collection, skip zeros since ceil(0) = 0
+      return deepMap(x, function (i) {
+        return _this(i, n);
+      }, true);
+    },
+    'SparseMatrix, number | BigNumber': function SparseMatrixNumberBigNumber(x, y) {
+      return algorithm11(x, y, this, false);
+    },
+    'DenseMatrix, number | BigNumber': function DenseMatrixNumberBigNumber(x, y) {
+      return algorithm14(x, y, this, false);
+    },
+    'number | Complex | BigNumber, Array': function numberComplexBigNumberArray(x, y) {
+      // use matrix implementation
+      return algorithm14(matrix(y), x, this, true).valueOf();
     }
   });
 });

package/es/function/arithmetic/round.js

@@ -43,10 +43,14 @@ export var createRound = /* #__PURE__ */factory(name, dependencies, function (_r
    *
    * Examples:
    *
-   *    math.round(3.2)              // returns number 3
-   *    math.round(3.8)              // returns number 4
+   *    math.round(3.22)             // returns number 3
+   *    math.round(3.82)             // returns number 4
    *    math.round(-4.2)             // returns number -4
    *    math.round(-4.7)             // returns number -5
+   *    math.round(3.22, 1)          // returns number 3.2
+   *    math.round(3.88, 1)          // returns number 3.8
+   *    math.round(-4.21, 1)         // returns number -4.2
+   *    math.round(-4.71, 1)         // returns number -4.7
    *    math.round(math.pi, 3)       // returns number 3.142
    *    math.round(123.45678, 2)     // returns number 123.46
    *

package/es/function/matrix/rotate.js

@@ -0,0 +1,78 @@
+import { factory } from '../../utils/factory';
+import { arraySize } from '../../utils/array';
+var name = 'rotate';
+var dependencies = ['typed', 'multiply', 'rotationMatrix'];
+export var createRotate = /* #__PURE__ */factory(name, dependencies, function (_ref) {
+  var typed = _ref.typed,
+      multiply = _ref.multiply,
+      rotationMatrix = _ref.rotationMatrix;
+
+  /**
+     * Rotate a vector of size 1x2 counter-clockwise by a given angle
+     * Rotate a vector of size 1x3 counter-clockwise by a given angle around the given axis
+     *
+     * Syntax:
+     *
+     *    math.rotate(w, theta)
+     *    math.rotate(w, theta, v)
+     *
+     * Examples:
+     *
+     *    math.rotate([11, 12], math.pi / 2)                           // returns matrix([-12, 11])
+     *    math.rotate(matrix([11, 12]), math.pi / 2)                   // returns matrix([-12, 11])
+     *
+     *    math.rotate([1, 0, 0], unit('90deg'), [0, 0, 1])             // returns matrix([0, 1, 0])
+     *    math.rotate(matrix([1, 0, 0]), unit('90deg'), [0, 0, 1])     // returns matrix([0, 1, 0])
+     *
+     *    math.rotate([1, 0], math.complex(1 + i))                     // returns matrix([cos(1 + i) - sin(1 + i), sin(1 + i) + cos(1 + i)])
+     *
+     * See also:
+     *
+     *    matrix, rotationMatrix
+     *
+     * @param {Array | Matrix} w                             Vector to rotate
+     * @param {number | BigNumber | Complex | Unit} theta    Rotation angle
+     * @param {Array | Matrix} [v]                           Rotation axis
+     * @return {Array | Matrix}                              Multiplication of the rotation matrix and w
+     */
+  return typed(name, {
+    'Array , number | BigNumber | Complex | Unit': function ArrayNumberBigNumberComplexUnit(w, theta) {
+      _validateSize(w, 2);
+
+      var matrixRes = multiply(rotationMatrix(theta), w);
+      return matrixRes.toArray();
+    },
+    'Matrix , number | BigNumber | Complex | Unit': function MatrixNumberBigNumberComplexUnit(w, theta) {
+      _validateSize(w, 2);
+
+      return multiply(rotationMatrix(theta), w);
+    },
+    'Array, number | BigNumber | Complex | Unit, Array | Matrix': function ArrayNumberBigNumberComplexUnitArrayMatrix(w, theta, v) {
+      _validateSize(w, 3);
+
+      var matrixRes = multiply(rotationMatrix(theta, v), w);
+      return matrixRes;
+    },
+    'Matrix, number | BigNumber | Complex | Unit, Array | Matrix': function MatrixNumberBigNumberComplexUnitArrayMatrix(w, theta, v) {
+      _validateSize(w, 3);
+
+      return multiply(rotationMatrix(theta, v), w);
+    }
+  });
+
+  function _validateSize(v, expectedSize) {
+    var actualSize = Array.isArray(v) ? arraySize(v) : v.size();
+
+    if (actualSize.length > 2) {
+      throw new RangeError("Vector must be of dimensions 1x".concat(expectedSize));
+    }
+
+    if (actualSize.length === 2 && actualSize[1] !== 1) {
+      throw new RangeError("Vector must be of dimensions 1x".concat(expectedSize));
+    }
+
+    if (actualSize[0] !== expectedSize) {
+      throw new RangeError("Vector must be of dimensions 1x".concat(expectedSize));
+    }
+  }
+});