diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2012-11-28 15:58:47 +0100 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2012-11-28 15:58:47 +0100 |
| commit | 678b9327089e898c240d265fe0204fb25db7d7bf (patch) | |
| tree | d525cb50dd0a8b1160108609771e657004f2496a | |
| parent | 22f152d97bc7056879bae25531a16ca581654716 (diff) | |
| download | scalam-678b9327089e898c240d265fe0204fb25db7d7bf.tar.gz scalam-678b9327089e898c240d265fe0204fb25db7d7bf.tar.bz2 scalam-678b9327089e898c240d265fe0204fb25db7d7bf.zip | |
improve matrix load support
| -rw-r--r-- | src/main/scala/scalam/package.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/scalam/package.scala b/src/main/scala/scalam/package.scala index 69ba1ae..a361889 100644 --- a/src/main/scala/scalam/package.scala +++ b/src/main/scala/scalam/package.scala @@ -33,8 +33,8 @@ package object scalam extends LowPriorityImplicits { def denseMatrixIsLoadable[A: ClassTag](converter: String => A): Loadable[DenseMatrix[A]] = new Loadable[DenseMatrix[A]] { def load(in: scalax.file.Path) = { val lines: Array[String] = in.lines().dropWhile(_.isEmpty).toArray - val separator = "\\s|," - val elements: Array[Array[String]] = lines.map(_.split(separator)) + val separator = "\\s+|," + val elements: Array[Array[String]] = lines.map(_.trim.split(separator)) require(elements.forall(_.length == elements(0).length), "Cannot load non-rectangular matrix. Check your data file: " + in.path) val linear = elements.transpose.flatten |