Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-mathjs-2.4.2-upgrade into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Upgrade math.js to version 2.4.2 to fix complex numbers formatting

Upgrade math.js to version 2.4.2 to fix complex numbers formatting

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:241
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/20/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/137/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/20/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm, thanks

review: Approve

=== modified file 'app/engine/math.js'
--- app/engine/math.js	2015-10-30 20:02:49 +0000
+++ app/engine/math.js	2015-11-15 00:20:00 +0000
@@ -14,8 +14,8 @@
  * It features real and complex numbers, units, matrices, a large set of
  * mathematical functions, and a flexible expression parser.
  *
- * @version 2.4.1
- * @date    2015-10-29
+ * @version 2.4.2
+ * @date    2015-11-14
  *
  * @license
  * Copyright (C) 2013-2015 Jos de Jong <[e-mail]>
@@ -113,7 +113,7 @@
 	  math.create = create;
 
 	  // import data types, functions, constants, expression parser, etc.
-	  math.import(__webpack_require__(13));
+	  math['import'](__webpack_require__(13));
 
 	  return math;
 	}
@@ -2422,7 +2422,7 @@
 	  }
 
 	  if (c.length > precision) {
-	    var removed = c.splice(precision);
+	    var removed = c.splice(precision, c.length - precision);
 
 	    if (removed[0] >= 5) {
 	      var i = precision - 1;
@@ -9123,7 +9123,7 @@
 	        this.units = [{
 	          unit: matchingUnit.unit,
 	          prefix: matchingUnit.prefix,
-	          power: 1.0,
+	          power: 1.0
 	        }];
 	      }
 	      else {
@@ -9150,8 +9150,7 @@
 	    }
 
 	    this.isUnitListSimplified = true;
-	    return;
-	  }
+	  };
 
 	  /**
 	   * Get a string representation of the units of this Unit, without the value.
@@ -10493,7 +10492,7 @@
 	      base: BASE_UNITS.ELECTRIC_CHARGE,
 	      prefixes: PREFIXES.LONG,
 	      value: 1,
-	      offset: 0,
+	      offset: 0
 	    },
 	    C: {
 	      name: 'C',
@@ -10939,7 +10938,7 @@
 	    0: '0',
 	    1: '\\left(${args[0]}\\right)',
 	    2: '\\left(\\left(${args[0]}\\right)+'
-	      + latex.symbols['i'] + '\\cdot\\left(${args[1]}\\right)\\right)',
+	      + latex.symbols['i'] + '\\cdot\\left(${args[1]}\\right)\\right)'
 	  };
 
 	  return complex;
@@ -18689,7 +18688,7 @@
 /* 79 */
 /***/ function(module, exports) {
 
-	module.exports = '2.4.1';
+	module.exports = '2.4.2';
 	// Note: This file is automatically generated when building math.js.
 	// Changes made in this file will be overwritten.
 
@@ -19618,7 +19617,7 @@
 	  'examples': [
 	    'lup([[2, 1], [1, 4]])',
 	    'lup(matrix([[2, 1], [1, 4]]))',
-	    'lup(sparse([[2, 1], [1, 4]]))',
+	    'lup(sparse([[2, 1], [1, 4]]))'
 	  ],
 	  'seealso': [
 	    'lusolve', 'lsolve', 'usolve', 'matrix', 'sparse', 'slu'
@@ -19682,7 +19681,7 @@
 	  'description':
 	  'Solves the linear system U * x = b where U is an [n x n] upper triangular matrix and b is a [n] column vector.',
 	  'examples': [
-	    'x=usolve(sparse([1, 1, 1, 1; 0, 1, 1, 1; 0, 0, 1, 1; 0, 0, 0, 1]), [1; 2; 3; 4])',
+	    'x=usolve(sparse([1, 1, 1, 1; 0, 1, 1, 1; 0, 0, 1, 1; 0, 0, 0, 1]), [1; 2; 3; 4])'
 	  ],
 	  'seealso': [
 	    'lup', 'lusolve', 'lsolve', 'matrix', 'sparse'
@@ -25241,7 +25240,7 @@
 	    'OperatorNode:pow': {
 	      associativity: 'right',
 	      associativeWith: [],
-	      latexRightParens: false,
+	      latexRightParens: false
 	      //the exponent doesn't need parentheses in
 	      //LaTeX because it's 2 dimensional
 	      //(it's on top)

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-15 00:20:00 +0000
+++ debian/changelog	2015-11-15 00:20:00 +0000
@@ -2,6 +2,7 @@
 
   [ Bartosz Kosiorek ]
   * Fix evaluation of long complex numbers (LP: #1515600)
+  * Upgrade math.js to version 2.4.2 to fix complex numbers formatting 
 
  -- Bartosz Kosiorek <[e-mail]>  Thu, 12 Nov 2015 13:28:29 +0100