aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2012-11-01 15:40:48 +0100
committerJakob Odersky <jodersky@gmail.com>2012-11-01 15:40:48 +0100
commita61adcf4190a58b2690cdb0bd9d6c0c9888c04a9 (patch)
tree01d867c9de98b2724ad9ef882b703b004c431783
parent7f14a9ce58841a9372eacee14f89392c9c78a621 (diff)
downloadscalam-a61adcf4190a58b2690cdb0bd9d6c0c9888c04a9.tar.gz
scalam-a61adcf4190a58b2690cdb0bd9d6c0c9888c04a9.tar.bz2
scalam-a61adcf4190a58b2690cdb0bd9d6c0c9888c04a9.zip
Revert "cleanup"
This reverts commit 7f14a9ce58841a9372eacee14f89392c9c78a621.
-rw-r--r--src/main/scala/scalam/package.scala20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/main/scala/scalam/package.scala b/src/main/scala/scalam/package.scala
index fcb2d99..b8de338 100644
--- a/src/main/scala/scalam/package.scala
+++ b/src/main/scala/scalam/package.scala
@@ -40,13 +40,19 @@ package object scalam extends LowPriorityImplicits {
}
}
- implicit def intDenseMatrixIsLoadable = denseMatrixIsLoadable[Int](_.toInt)
- implicit def doubleDenseMatrixIsLoadable = denseMatrixIsLoadable[Double](_.toDouble)
- implicit def floatDenseMatrixIsLoadable = denseMatrixIsLoadable[Float](_.toFloat)
- implicit def byteDenseMatrixIsLoadable = denseMatrixIsLoadable[Byte](_.toByte)
- implicit def longDenseMatrixIsLoadable = denseMatrixIsLoadable[Long](_.toLong)
- implicit def booleanDenseMatrixIsLoadable = denseMatrixIsLoadable[Boolean](_.toBoolean)
+ implicit def intDenseIsLoadable = denseMatrixIsLoadable[Int](_.toInt)
+ implicit def doubleDenseIsLoadable = denseMatrixIsLoadable[Double](_.toDouble)
+ implicit def floatDenseIsLoadable = denseMatrixIsLoadable[Float](_.toFloat)
+ implicit def byteDenseIsLoadable = denseMatrixIsLoadable[Byte](_.toByte)
+ implicit def longDenseIsLoadable = denseMatrixIsLoadable[Long](_.toLong)
+ implicit def booleanDenseIsLoadable = denseMatrixIsLoadable[Boolean](_.toBoolean)
-
+ /* implicit val string2Int: (String => Int) = (x: String) => x.toInt
+ implicit val string2Double: (String => Double) = (x: String) => x.toDouble
+ implicit val string2Char: (String => Char) = (x: String) => x.toChar*/
+
+ //implicit val cv = (d: String) => d.toDouble
+
+ //val m = scalam.io.load[DenseMatrix[Double]](scalax.file.Path(""))
} \ No newline at end of file