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

Sparse Matrix non sorted index issue

Browse Source 
Fixed issue #450
This commit is contained in:
Rogelio J. Baucells 2015-09-03 19:45:48 -04:00
parent 06c3cd31b5
commit 9e47b8a316
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/type/matrix/SparseMatrix.js
View File

@ -505,22 +505,15 @@ function factory (type, config, load, typed) {
var _getValueIndex = function(i, top, bottom, index) {
// check row is on the bottom side
if (bottom - top === 0 || i > index[bottom - 1])
if (bottom - top === 0)
return bottom;
// loop until we find row index
while (top < bottom) {
// point in the middle (fast integer division)
var p = ~~((top + bottom) / 2);
// row @ p
var r = index[p];
// check we have to look on the top side, bottom side or we found the row
if (i < r)
bottom = p;
else if (i > r)
top = p + 1;
else
return p;
// loop rows [top, bottom[
for (var r = top; r < bottom; r++) {
// check we found value index
if (index[r] === i)
return r;
}
// we did not find row
return top;
};

18
test/type/matrix/SparseMatrix.test.js
View File

@ -631,6 +631,24 @@ describe('SparseMatrix', function() {
assert.equal(m.get([5, 1]), 4);
assert.equal(m.get([5, 5]), -1);
});
it('should get matrix element - Issue #450', function () {
var m = new SparseMatrix({
mathjs: 'SparseMatrix',
values: [ 3, 10, 3, 9, 7, 4, 8, 8, 8, 7, 7, 9, -2, 5, 9, 2, 3, -1, 13 ],
index: [ 1, 0, 3, 1, 2, 5, 4, 2, 3, 2, 3, 4, 0, 3, 4, 5, 1, 5, 4 ],
ptr: [ 0, 3, 7, 9, 12, 16, 19 ],
size: [ 6, 6 ],
datatype: undefined
});
assert.equal(m.get([0, 0]), 10);
assert.equal(m.get([1, 0]), 3);
assert.equal(m.get([4, 1]), 8);
assert.equal(m.get([5, 1]), 4);
assert.equal(m.get([4, 5]), 13);
assert.equal(m.get([5, 5]), -1);
});
});
describe('set', function () {