From 586b93bcf3d7f8569aee6c5ba25e8f3a3e7fed4e Mon Sep 17 00:00:00 2001 From: rjbaucells Date: Sun, 3 May 2015 23:39:06 -0400 Subject: [PATCH] atan2 updates --- lib/function/trigonometry/atan2.js | 3 ++- test/function/trigonometry/atan2.test.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/function/trigonometry/atan2.js b/lib/function/trigonometry/atan2.js index 56d0d4cc8..c84d1333c 100644 --- a/lib/function/trigonometry/atan2.js +++ b/lib/function/trigonometry/atan2.js @@ -10,6 +10,7 @@ function factory (type, config, load, typed) { var algorithm03 = load(require('../../type/matrix/util/algorithm03')); var algorithm09 = load(require('../../type/matrix/util/algorithm09')); var algorithm11 = load(require('../../type/matrix/util/algorithm11')); + var algorithm12 = load(require('../../type/matrix/util/algorithm12')); var algorithm13 = load(require('../../type/matrix/util/algorithm13')); var algorithm14 = load(require('../../type/matrix/util/algorithm14')); @@ -122,7 +123,7 @@ function factory (type, config, load, typed) { // check storage format switch (y.storage()) { case 'sparse': - c = algorithm11(y, x, atan2, true); + c = algorithm12(y, x, atan2, true); break; default: c = algorithm14(y, x, atan2, true); diff --git a/test/function/trigonometry/atan2.test.js b/test/function/trigonometry/atan2.test.js index 3b152e539..c856e21b7 100644 --- a/test/function/trigonometry/atan2.test.js +++ b/test/function/trigonometry/atan2.test.js @@ -130,7 +130,7 @@ describe('atan2', function() { describe('SparseMatrix', function () { it('should calculate atan2 sparse matrix - scalar', function () { - assert.deepEqual(divide(atan2(1, sparse([[1, -1], [0, 1]])), pi), sparse([[0.25, 0.75], [0.5, 0.25]])); + assert.deepEqual(divide(atan2(1, sparse([[1, -1], [0, 1]])), pi), matrix([[0.25, 0.75], [0.5, 0.25]])); assert.deepEqual(divide(atan2(sparse([[1, -1], [0, 1]]), 1), pi), sparse([[0.25, -0.25], [0, 0.25]])); });