Skip to content

Support for non-square matrices #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jadrian wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support for non-square matrices #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5178a
Fixed transpose() to support non-square matrices.
jadrian Feb 18, 2016
2c474b1
Fixed mult() to support non-square matrices.
jadrian Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Common/MV.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,22 +277,23 @@ function mult( u, v )
var result = [];

if ( u.matrix && v.matrix ) {
if ( u.length != v.length ) {
throw "mult(): trying to add matrices of different dimensions";
}

for ( var i = 0; i < u.length; ++i ) {
if ( u[i].length != v[i].length ) {
throw "mult(): trying to add matrices of different dimensions";
var M = u.length;
var N = v.length;
var P = v[0].length;

// Check that inner dimensions match.
for ( var i = 0; i < M; ++i ) {
if ( u[i].length != N ) {
throw "mult(): dimension mismatch";
}
}

for ( var i = 0; i < u.length; ++i ) {
for ( var i = 0; i < M; ++i ) {
result.push( [] );

for ( var j = 0; j < v.length; ++j ) {
for ( var j = 0; j < P; ++j ) {
var sum = 0.0;
for ( var k = 0; k < u.length; ++k ) {
for ( var k = 0; k < N; ++k ) {
sum += u[i][k] * v[k][j];
}
result[i].push( sum );
Expand Down Expand Up @@ -505,11 +506,11 @@ function transpose( m )
if ( !m.matrix ) {
return "transpose(): trying to transpose a non-matrix";
}

var result = [];
for ( var i = 0; i < m.length; ++i ) {
for ( var i = 0; i < m[0].length; ++i ) {
result.push( [] );
for ( var j = 0; j < m[i].length; ++j ) {
for ( var j = 0; j < m.length; ++j ) {
result[i].push( m[j][i] );
}
}
Expand Down