fix: random not correctly filling rectangular matrices

targos · targos · commit a79c3eb7b4e5 · 2015-11-19T12:55:27.000+01:00
diff --git a/src/matrix.js b/src/matrix.js
@@ -131,7 +131,7 @@ class Matrix extends Array {
         if (rng === undefined) rng = Math.random;
         var matrix = Matrix.empty(rows, columns);
         for (var i = 0; i < rows; i++) {
-            for (var j = 0; j < rows; j++) {
+            for (var j = 0; j < columns; j++) {
                 matrix[i][j] = rng();
             }
         }
diff --git a/test/matrix/creation.js b/test/matrix/creation.js
@@ -84,10 +84,14 @@ describe('Matrix creation', function () {
         Matrix.ones(2, 3).to2DArray().should.eql([[1, 1, 1], [1, 1, 1]]);
     });
     it('random', function () {
-        var random = Matrix.rand(2, 2);
-        var random2 = Matrix.rand(2, 2);
+        var random = Matrix.rand(2, 3);
+        var random2 = Matrix.rand(2, 3);
         random.to2DArray().should.not.eql(random2.to2DArray());
-        random[0][0].should.be.within(0, 1);
+        for (var i = 0; i < 2; i++) {
+            for (var j = 0; j < 3; j++) {
+                random[i][j].should.be.within(0, 1);
+            }
+        }
     });
     it('random with custom RNG', function () {
         function fakeRNG() { return 2; }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class Matrix extends Array {`
`131`	`131`	`if (rng === undefined) rng = Math.random;`
`132`	`132`	`var matrix = Matrix.empty(rows, columns);`
`133`	`133`	`for (var i = 0; i < rows; i++) {`
`134`		`- for (var j = 0; j < rows; j++) {`
	`134`	`+ for (var j = 0; j < columns; j++) {`
`135`	`135`	`matrix[i][j] = rng();`
`136`	`136`	`}`
`137`	`137`	`}`