removed unnecessary duplication from matrixFromRows/Columns

josdejong · Apr 12, 2021 · f80e4fb · f80e4fb
1 parent 4966b2d
commit f80e4fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 62 deletions.
diff --git a/src/function/matrix/matrixFromColumns.js b/src/function/matrix/matrixFromColumns.js
@@ -31,8 +31,10 @@ export const createMatrixFromColumns = /* #__PURE__ */ factory(name, dependencie
       return _createArray(arr)
     },
     '...Matrix': function (arr) {
-      return _createMatrix(arr)
+      return matrix(_createArray(arr.map(m => m.toArray())))
     }
+
+    // TODO implement this properly for SparseMatrix
   })
 
   function _createArray (arr) {
@@ -64,39 +66,8 @@ export const createMatrixFromColumns = /* #__PURE__ */ factory(name, dependencie
     return result
   }
 
-  function _createMatrix (arr) {
-    if (arr.length === 0) throw new TypeError('At least one column is needed to construct a matrix.')
-    const N = checkVectorTypeAndReturnLength(arr[0])
-
-    // create an array with empty rows
-    const data = []
-    for (let i = 0; i < N; i++) {
-      data[i] = []
-    }
-
-    // loop columns
-    for (const col of arr) {
-      const colLength = checkVectorTypeAndReturnLength(col)
-
-      if (colLength !== N) {
-        throw new TypeError('The vectors had different length: ' + (N | 0) + ' ≠ ' + (colLength | 0))
-      }
-
-      // push a value to each row
-      let i = 0
-      col.forEach(value => data[i++].push(value))
-    }
-
-    return matrix(data)
-  }
-
   function checkVectorTypeAndReturnLength (vec) {
-    let s
-    if (Array.isArray(vec)) {
-      s = size(vec)
-    } else {
-      s = vec.size()
-    }
+    const s = size(vec)
 
     if (s.length === 1) { // 1D vector
       return s[0]

diff --git a/src/function/matrix/matrixFromRows.js b/src/function/matrix/matrixFromRows.js
@@ -31,8 +31,10 @@ export const createMatrixFromRows = /* #__PURE__ */ factory(name, dependencies,
       return _createArray(arr)
     },
     '...Matrix': function (arr) {
-      return _createMatrix(arr)
+      return matrix(_createArray(arr.map(m => m.toArray())))
     }
+
+    // TODO implement this properly for SparseMatrix
   })
 
   function _createArray (arr) {
@@ -53,35 +55,8 @@ export const createMatrixFromRows = /* #__PURE__ */ factory(name, dependencies,
     return result
   }
 
-  function _createMatrix (arr) {
-    if (arr.length === 0) throw new TypeError('At least one row is needed to construct a matrix.')
-    const N = checkVectorTypeAndReturnLength(arr[0])
-
-    const data = []
-    for (const row of arr) {
-      const rowLength = checkVectorTypeAndReturnLength(row)
-
-      if (rowLength !== N) {
-        throw new TypeError('The vectors had different length: ' + (N | 0) + ' ≠ ' + (rowLength | 0))
-      }
-
-      if (row.storage() === 'dense') {
-        data.push(flatten(row._data))
-      } else {
-        data.push(flatten(row.toArray()))
-      }
-    }
-
-    return matrix(data)
-  }
-
   function checkVectorTypeAndReturnLength (vec) {
-    let s
-    if (Array.isArray(vec)) {
-      s = size(vec)
-    } else {
-      s = vec.size()
-    }
+    const s = size(vec)
 
     if (s.length === 1) { // 1D vector
       return s[0]