diff options
| author | Peter Dobsan <pdobsan@gmail.com> | 2018-04-27 00:09:35 +0200 |
|---|---|---|
| committer | Peter Dobsan <pdobsan@gmail.com> | 2018-04-27 00:09:35 +0200 |
| commit | 1286ae831088236213ea0ea94b0b288a2e0ce4bb (patch) | |
| tree | 1e7117c4929a93af00e37ec7650c24613038492b /packages/base/src/Internal/Matrix.hs | |
| parent | dd96a98207dbafbf81b4a5f02613963cf5bd4b4c (diff) | |
| parent | 3ffea9114b573eb11e2e41ddfc6a8b69fdd6baed (diff) | |
Merge branch 'fix-vector-show-instance'
The show instance was changed in vector 0.11. The merged modifications
adjust hmatrix/base to that change. That fixes issues #277 and #177.
Diffstat (limited to 'packages/base/src/Internal/Matrix.hs')
| -rw-r--r-- | packages/base/src/Internal/Matrix.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/base/src/Internal/Matrix.hs b/packages/base/src/Internal/Matrix.hs index 4bfa13d..5436e59 100644 --- a/packages/base/src/Internal/Matrix.hs +++ b/packages/base/src/Internal/Matrix.hs | |||
| @@ -160,7 +160,8 @@ extractAll ord m = unsafePerformIO (copy ord m) | |||
| 160 | {- | Creates a vector by concatenation of rows. If the matrix is ColumnMajor, this operation requires a transpose. | 160 | {- | Creates a vector by concatenation of rows. If the matrix is ColumnMajor, this operation requires a transpose. |
| 161 | 161 | ||
| 162 | >>> flatten (ident 3) | 162 | >>> flatten (ident 3) |
| 163 | fromList [1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0] | 163 | [1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0] |
| 164 | it :: (Num t, Element t) => Vector t | ||
| 164 | 165 | ||
| 165 | -} | 166 | -} |
| 166 | flatten :: Element t => Matrix t -> Vector t | 167 | flatten :: Element t => Matrix t -> Vector t |