aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scalam/collection
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/scalam/collection')
-rw-r--r--src/main/scala/scalam/collection/DenseVectorOps.scala5
-rw-r--r--src/main/scala/scalam/collection/WrappedDenseVector.scala7
2 files changed, 7 insertions, 5 deletions
diff --git a/src/main/scala/scalam/collection/DenseVectorOps.scala b/src/main/scala/scalam/collection/DenseVectorOps.scala
index ace37a3..6d2065f 100644
--- a/src/main/scala/scalam/collection/DenseVectorOps.scala
+++ b/src/main/scala/scalam/collection/DenseVectorOps.scala
@@ -4,6 +4,7 @@ import breeze.linalg.DenseVector
import scala.collection.mutable.ArrayBuffer
import scala.collection.generic.CanBuildFrom
import scala.collection.mutable.Builder
+import scala.reflect.ClassTag
/**
* This class serves as a wrapper for `breeze.linalg.DenseVector`s with all the operations found in
@@ -24,7 +25,7 @@ import scala.collection.mutable.Builder
* @define mayNotTerminateInf
* @define willNotTerminateInf
*/
-class DenseVectorOps[Elem: ClassManifest](override val repr: DenseVector[Elem]) extends DenseVectorLike[Elem, DenseVector[Elem]] {
+class DenseVectorOps[Elem: ClassTag](override val repr: DenseVector[Elem]) extends DenseVectorLike[Elem, DenseVector[Elem]] {
val self = repr
def newBuilder = DenseVectorOps.newBuilder[Elem]
@@ -37,5 +38,5 @@ class DenseVectorOps[Elem: ClassManifest](override val repr: DenseVector[Elem])
* A companion object for DenseVectorsOps.
*/
object DenseVectorOps {
- def newBuilder[Elem: ClassManifest] = new ArrayBuffer[Elem] mapResult (x => new DenseVector(x.toArray))
+ def newBuilder[Elem: ClassTag] = new ArrayBuffer[Elem] mapResult (x => new DenseVector(x.toArray))
}
diff --git a/src/main/scala/scalam/collection/WrappedDenseVector.scala b/src/main/scala/scalam/collection/WrappedDenseVector.scala
index 0e49c07..4f7a941 100644
--- a/src/main/scala/scalam/collection/WrappedDenseVector.scala
+++ b/src/main/scala/scalam/collection/WrappedDenseVector.scala
@@ -5,6 +5,7 @@ import breeze.linalg.DenseVector
import scala.collection.mutable.Builder
import scala.collection.generic.CanBuildFrom
import scala.collection.mutable.ArrayBuffer
+import scala.reflect.ClassTag
/**
* This class serves as a wrapper augmenting `breeze.linalg.DenseVector`s with all the operations
@@ -23,7 +24,7 @@ import scala.collection.mutable.ArrayBuffer
* @define Coll `DenseVector`
* @define coll dense vector
*/
-class WrappedDenseVector[Elem: ClassManifest](val self: DenseVector[Elem]) extends IndexedSeq[Elem] with DenseVectorLike[Elem, WrappedDenseVector[Elem]] {
+class WrappedDenseVector[Elem: ClassTag](val self: DenseVector[Elem]) extends IndexedSeq[Elem] with DenseVectorLike[Elem, WrappedDenseVector[Elem]] {
override protected[this] def newBuilder: Builder[Elem, WrappedDenseVector[Elem]] = WrappedDenseVector.newBuilder[Elem]
}
@@ -31,9 +32,9 @@ class WrappedDenseVector[Elem: ClassManifest](val self: DenseVector[Elem]) exten
* A companion object for wrapped dense vectors.
*/
object WrappedDenseVector {
- def newBuilder[Elem: ClassManifest] = (new ArrayBuffer[Elem]) mapResult (x => new WrappedDenseVector(DenseVector(x.toArray)))
+ def newBuilder[Elem: ClassTag] = (new ArrayBuffer[Elem]) mapResult (x => new WrappedDenseVector(DenseVector(x.toArray)))
- implicit def canBuildFrom[T: ClassManifest] = new CanBuildFrom[WrappedDenseVector[_], T, WrappedDenseVector[T]] {
+ implicit def canBuildFrom[T: ClassTag] = new CanBuildFrom[WrappedDenseVector[_], T, WrappedDenseVector[T]] {
def apply(from: WrappedDenseVector[_]): Builder[T, WrappedDenseVector[T]] = newBuilder[T]
def apply: Builder[T, WrappedDenseVector[T]] = newBuilder[T]
}