From 678b9327089e898c240d265fe0204fb25db7d7bf Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 28 Nov 2012 15:58:47 +0100 Subject: improve matrix load support --- src/main/scala/scalam/package.scala | 4 ++-- 1 file 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 -- cgit v1.2.3