diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2012-10-30 13:45:19 +0100 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2012-10-30 13:45:19 +0100 |
| commit | 91b9f59892dd1004e9ec496237fd712a6d7a00b6 (patch) | |
| tree | 3aadd1415d59f1fc433ab4a566038ccc3975ae71 | |
| parent | 5ec341ecb62fbd089fc1498ac136206d8762415f (diff) | |
| download | scalam-91b9f59892dd1004e9ec496237fd712a6d7a00b6.tar.gz scalam-91b9f59892dd1004e9ec496237fd712a6d7a00b6.tar.bz2 scalam-91b9f59892dd1004e9ec496237fd712a6d7a00b6.zip | |
*remove leftover implicit
| -rw-r--r-- | src/main/scala/scalam/collection/DenseVectorOps.scala | 13 | ||||
| -rw-r--r-- | src/main/scala/scalam/package.scala | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/main/scala/scalam/collection/DenseVectorOps.scala b/src/main/scala/scalam/collection/DenseVectorOps.scala index 7f8e9f9..da33d5d 100644 --- a/src/main/scala/scalam/collection/DenseVectorOps.scala +++ b/src/main/scala/scalam/collection/DenseVectorOps.scala @@ -5,7 +5,6 @@ import scala.collection.mutable.ArrayBuffer import scala.collection.generic.CanBuildFrom import scala.collection.mutable.Builder -/* TODO find solution to remove class manifest */ class DenseVectorOps[Elem: ClassManifest](override val repr: DenseVector[Elem]) extends DenseVectorLike[Elem, DenseVector[Elem]] { val self = repr def newBuilder = DenseVectorOps.newBuilder[Elem] @@ -17,16 +16,4 @@ class DenseVectorOps[Elem: ClassManifest](override val repr: DenseVector[Elem]) object DenseVectorOps { def newBuilder[Elem: ClassManifest] = new ArrayBuffer[Elem] mapResult (x => new DenseVector(x.toArray)) - - implicit def canBuildFrom[T: ClassManifest] = new CanBuildFrom[DenseVector[_], T, DenseVector[T]] { - def apply(from: DenseVector[_]): Builder[T, DenseVector[T]] = newBuilder[T] - def apply: Builder[T, DenseVector[T]] = newBuilder[T] - } - /* - implicit def denseVectorBuildFrom[A: ClassManifest]: CanBuildFrom[DenseVector[_], A, DenseVector[A]] = - new CanBuildFrom[DenseVector[_], A, DenseVector[A]] { - def apply(from: DenseVector[_]): Builder[A, DenseVector[A]] = apply() - def apply(): Builder[A, DenseVector[A]] = collection.DenseVectorOps.newBuilder[A] - } - */ } diff --git a/src/main/scala/scalam/package.scala b/src/main/scala/scalam/package.scala index da0888c..95f1fa2 100644 --- a/src/main/scala/scalam/package.scala +++ b/src/main/scala/scalam/package.scala @@ -7,7 +7,7 @@ package object scalam extends LowPriorityImplicits { implicit def denseVector2Ops[A: ClassManifest](v: DenseVector[A]) = new DenseVectorOps(v) - implicit def denseVectorBuildFrom[A: ClassManifest]: CanBuildFrom[DenseVector[_], A, DenseVector[A]] = + implicit def denseVectorCanBuildFrom[A: ClassManifest]: CanBuildFrom[DenseVector[_], A, DenseVector[A]] = new CanBuildFrom[DenseVector[_], A, DenseVector[A]] { def apply(from: DenseVector[_]): Builder[A, DenseVector[A]] = apply() def apply(): Builder[A, DenseVector[A]] = collection.DenseVectorOps.newBuilder[A] |