archive-gh-me/mathjs
1
0
Fork 0
mirror of https://github.com/josdejong/mathjs.git synced 2026-02-01 16:07:46 +00:00
Code Issues Projects Releases Wiki Activity

CCS tests

Browse Source
This commit is contained in:
rjbaucells 2015-03-15 13:01:39 -04:00
parent 5713b988ed
commit 00ce77d540
4 changed files with 304 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/function/matrix/inv.js
View File

@ -60,7 +60,8 @@ module.exports = function (math) {
if (rows == cols) {
if (x instanceof Matrix) {
return math.matrix(
_inv(x.valueOf(), rows, cols)
_inv(x.valueOf(), rows, cols),
x.storage()
);
}
else {

30
lib/type/matrix/CcsMatrix.js
View File

@ -834,7 +834,7 @@ module.exports = function (math) {
*
* @param {Array} size The matrix size.
* @param {Number, Array} value The values for the diagonal.
* @param {Number} [defaultValue] The default value for non-diagonal
* @param {Number | BigNumber} [k=0] The diagonal where the vector will be filled in.
*
* @returns {CcsMatrix}
*/
@ -857,13 +857,31 @@ module.exports = function (math) {
}
return s;
});
// validate k if any
if (k) {
// convert BigNumber to a number
if (k instanceof BigNumber)
k = k.toNumber();
// is must be an integer
if (!isNumber(k) || !isInteger(k)) {
throw new TypeError ('The parameter k must be an integer number');
}
}
else {
// default value
k = 0;
}
var kSuper = k > 0 ? k : 0;
var kSub = k < 0 ? -k : 0;
// rows and columns
var rows = size[0];
var columns = size[1];
// number of non-zero items
var n = Math.min(rows, columns);
var n = Math.min(rows - kSub, columns - kSuper);
// value extraction function
var _value;
@ -895,17 +913,19 @@ module.exports = function (math) {
var ptr = [];
// loop items
for (var i = 0; i < columns; i++) {
for (var j = 0; j < columns; j++) {
// number of rows with value
ptr.push(values.length);
// diagonal index
var i = j - kSuper;
// check we need to set diagonal value
if (i < n) {
if (i >= 0 && i < n) {
// get value @ i
var v = _value(i);
// check for zero
if (!math.equal(v, 0)) {
// column
index.push(i);
index.push(i + kSub);
// add value
values.push(v);
}

3
test/function/matrix/inv.test.js
View File

@ -56,7 +56,8 @@ describe('inv', function() {
it('should return the inverse for each element in a matrix', function() {
assert.deepEqual(inv(math.matrix([4])), math.matrix([1/4]));
assert.deepEqual(inv(math.matrix([[4]])), math.matrix([[1/4]]));
assert.deepEqual(inv(math.matrix([[1,2],[3,4]])), math.matrix([[-2, 1],[1.5, -0.5]]));
assert.deepEqual(inv(math.matrix([[4]], 'ccs')), math.matrix([[1/4]], 'ccs'));
assert.deepEqual(inv(math.matrix([[1,2],[3,4]], 'ccs')), math.matrix([[-2, 1],[1.5, -0.5]], 'ccs'));
});
it('should throw an error in case of non-square matrices', function() {

275
test/type/matrix/CcsMatrix.test.js
View File

@ -1224,6 +1224,96 @@ describe('CcsMatrix', function() {
]);
});
it('should create CCS matrix (n x n), k > 0', function () {
var m = CcsMatrix.diagonal([3, 3], 1, 1);
assert.deepEqual(m._size, [3, 3]);
assert.deepEqual(m._values, [1, 1]);
assert.deepEqual(m._index, [0, 1]);
assert.deepEqual(m._ptr, [0, 0, 1, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 1, 0],
[0, 0, 1],
[0, 0, 0]
]);
});
it('should create CCS matrix (n x n), k < 0', function () {
var m = CcsMatrix.diagonal([3, 3], 1, -1);
assert.deepEqual(m._size, [3, 3]);
assert.deepEqual(m._values, [1, 1]);
assert.deepEqual(m._index, [1, 2]);
assert.deepEqual(m._ptr, [0, 1, 2, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 0, 0],
[1, 0, 0],
[0, 1, 0]
]);
});
it('should create CCS matrix (n x n), vector value', function () {
var m = CcsMatrix.diagonal([3, 3], [1, 2, 3]);
assert.deepEqual(m._size, [3, 3]);
assert.deepEqual(m._values, [1, 2, 3]);
assert.deepEqual(m._index, [0, 1, 2]);
assert.deepEqual(m._ptr, [0, 1, 2, 3]);
assert.deepEqual(
m.toArray(),
[
[1, 0, 0],
[0, 2, 0],
[0, 0, 3]
]);
});
it('should create CCS matrix (n x n), vector value, k > 0', function () {
var m = CcsMatrix.diagonal([3, 3], [1, 2], 1);
assert.deepEqual(m._size, [3, 3]);
assert.deepEqual(m._values, [1, 2]);
assert.deepEqual(m._index, [0, 1]);
assert.deepEqual(m._ptr, [0, 0, 1, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 1, 0],
[0, 0, 2],
[0, 0, 0]
]);
});
it('should create CCS matrix (n x n), vector value, k < 0', function () {
var m = CcsMatrix.diagonal([3, 3], [1, 2], -1);
assert.deepEqual(m._size, [3, 3]);
assert.deepEqual(m._values, [1, 2]);
assert.deepEqual(m._index, [1, 2]);
assert.deepEqual(m._ptr, [0, 1, 2, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 0, 0],
[1, 0, 0],
[0, 2, 0]
]);
});
it('should create CCS matrix (n x n), complex number', function () {
var m = CcsMatrix.diagonal([3, 3], new Complex(1, 1));
@ -1253,6 +1343,101 @@ describe('CcsMatrix', function() {
]);
});
it('should create CCS matrix (m x n), m > n, k > 0', function () {
var m = CcsMatrix.diagonal([4, 3], 1, 1);
assert.deepEqual(m._size, [4, 3]);
assert.deepEqual(m._values, [1, 1]);
assert.deepEqual(m._index, [0, 1]);
assert.deepEqual(m._ptr, [0, 0, 1, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 1, 0],
[0, 0, 1],
[0, 0, 0],
[0, 0, 0]
]);
});
it('should create CCS matrix (m x n), m > n, k < 0', function () {
var m = CcsMatrix.diagonal([4, 3], 1, -1);
assert.deepEqual(m._size, [4, 3]);
assert.deepEqual(m._values, [1, 1, 1]);
assert.deepEqual(m._index, [1, 2, 3]);
assert.deepEqual(m._ptr, [0, 1, 2, 3]);
assert.deepEqual(
m.toArray(),
[
[0, 0, 0],
[1, 0, 0],
[0, 1, 0],
[0, 0, 1],
]);
});
it('should create CCS matrix (m x n), m > n, vector value', function () {
var m = CcsMatrix.diagonal([4, 3], [1, 2, 3]);
assert.deepEqual(m._size, [4, 3]);
assert.deepEqual(m._values, [1, 2, 3]);
assert.deepEqual(m._index, [0, 1, 2]);
assert.deepEqual(m._ptr, [0, 1, 2, 3]);
assert.deepEqual(
m.toArray(),
[
[1, 0, 0],
[0, 2, 0],
[0, 0, 3],
[0, 0, 0]
]);
});
it('should create CCS matrix (m x n), m > n, vector value, k > 0', function () {
var m = CcsMatrix.diagonal([4, 3], [1, 2], 1);
assert.deepEqual(m._size, [4, 3]);
assert.deepEqual(m._values, [1, 2]);
assert.deepEqual(m._index, [0, 1]);
assert.deepEqual(m._ptr, [0, 0, 1, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 1, 0],
[0, 0, 2],
[0, 0, 0],
[0, 0, 0]
]);
});
it('should create CCS matrix (m x n), m > n, vector value, k < 0', function () {
var m = CcsMatrix.diagonal([4, 3], [1, 2, 3], -1);
assert.deepEqual(m._size, [4, 3]);
assert.deepEqual(m._values, [1, 2, 3]);
assert.deepEqual(m._index, [1, 2, 3]);
assert.deepEqual(m._ptr, [0, 1, 2, 3]);
assert.deepEqual(
m.toArray(),
[
[0, 0, 0],
[1, 0, 0],
[0, 2, 0],
[0, 0, 3]
]);
});
it('should create CCS matrix (m x n), m < n', function () {
var m = CcsMatrix.diagonal([3, 4], 1);
@ -1270,6 +1455,96 @@ describe('CcsMatrix', function() {
[0, 0, 1, 0]
]);
});
it('should create CCS matrix (m x n), m < n, k > 0', function () {
var m = CcsMatrix.diagonal([3, 4], 1, 1);
assert.deepEqual(m._size, [3, 4]);
assert.deepEqual(m._values, [1, 1, 1]);
assert.deepEqual(m._index, [0, 1, 2]);
assert.deepEqual(m._ptr, [0, 0, 1, 2, 3]);
assert.deepEqual(
m.toArray(),
[
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, 0, 0, 1]
]);
});
it('should create CCS matrix (m x n), m < n, k < 0', function () {
var m = CcsMatrix.diagonal([3, 4], 1, -1);
assert.deepEqual(m._size, [3, 4]);
assert.deepEqual(m._values, [1, 1]);
assert.deepEqual(m._index, [1, 2]);
assert.deepEqual(m._ptr, [0, 1, 2, 2, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 0, 0, 0],
[1, 0, 0, 0],
[0, 1, 0, 0]
]);
});
it('should create CCS matrix (m x n), m < n, vector value', function () {
var m = CcsMatrix.diagonal([3, 4], [1, 2, 3]);
assert.deepEqual(m._size, [3, 4]);
assert.deepEqual(m._values, [1, 2, 3]);
assert.deepEqual(m._index, [0, 1, 2]);
assert.deepEqual(m._ptr, [0, 1, 2, 3, 3]);
assert.deepEqual(
m.toArray(),
[
[1, 0, 0, 0],
[0, 2, 0, 0],
[0, 0, 3, 0]
]);
});
it('should create CCS matrix (m x n), m < n, vector value, k > 0', function () {
var m = CcsMatrix.diagonal([3, 4], [1, 2, 3], 1);
assert.deepEqual(m._size, [3, 4]);
assert.deepEqual(m._values, [1, 2, 3]);
assert.deepEqual(m._index, [0, 1, 2]);
assert.deepEqual(m._ptr, [0, 0, 1, 2, 3]);
assert.deepEqual(
m.toArray(),
[
[0, 1, 0, 0],
[0, 0, 2, 0],
[0, 0, 0, 3]
]);
});
it('should create CCS matrix (m x n), m < n, vector value, k < 0', function () {
var m = CcsMatrix.diagonal([3, 4], [1, 2], -1);
assert.deepEqual(m._size, [3, 4]);
assert.deepEqual(m._values, [1, 2]);
assert.deepEqual(m._index, [1, 2]);
assert.deepEqual(m._ptr, [0, 1, 2, 2, 2]);
assert.deepEqual(
m.toArray(),
[
[0, 0, 0, 0],
[1, 0, 0, 0],
[0, 2, 0, 0]
]);
});
});
describe('transpose', function () {