1.2.1

neutronest · May 29, 2014 · fcfd7c3 · fcfd7c3
1 parent b31d23c
commit fcfd7c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,14 +1,14 @@
 name := "nak"
 
-version := "1.2.1-SNAPSHOT"
+version := "1.2.1"
 
 organization := "org.scalanlp"
 
 scalaVersion := "2.10.3"
 
 retrieveManaged := true
 
-crossPaths := false
+crossScalaVersions  := Seq("2.11.0", "2.10.3")
 
 resolvers ++= Seq(
   "Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/",
@@ -17,7 +17,8 @@ resolvers ++= Seq(
 
 
 libraryDependencies ++= Seq(
-  "org.scalanlp" % "breeze_2.10" % "0.6.1",
+  "org.scalanlp" %% "breeze" % "0.8.1",
+  "org.scalanlp" %% "breeze-config" % "0.8",
   "org.rogach" %% "scallop" % "0.9.4",
   "com.typesafe" %% "scalalogging-log4j" % "1.0.1",
   "org.apache.logging.log4j" % "log4j-core" % "2.0-beta8",

diff --git a/src/main/scala/nak/classify/LFMatrix.scala b/src/main/scala/nak/classify/LFMatrix.scala
@@ -1,7 +1,7 @@
 package nak.classify
 
 import breeze.util.{Encoder, Index}
-import breeze.linalg.{norm, Counter, DenseVector, NumericOps}
+import breeze.linalg._
 import breeze.linalg.operators._
 import breeze.linalg.support._
 import breeze.generic._
@@ -179,13 +179,13 @@ object LFMatrix {
   }
 
   implicit def lfAxpyOp[L,TF]
-  (implicit op: CanAxpy[Double, TF,TF], numeric: TF=>NumericOps[TF])
-  : CanAxpy[Double, LFMatrix[L,TF],LFMatrix[L,TF]]  = {
-    new CanAxpy[Double, LFMatrix[L,TF],LFMatrix[L,TF]]  {
-      def apply(a: Double, v2: LFMatrix[L,TF], v1: LFMatrix[L, TF]) {
+  (implicit op: scaleAdd.InPlaceImpl3[TF, Double, TF], numeric: TF=>NumericOps[TF])
+  : scaleAdd.InPlaceImpl3[LFMatrix[L,TF], Double, LFMatrix[L,TF]]  = {
+    new scaleAdd.InPlaceImpl3[LFMatrix[L,TF], Double, LFMatrix[L,TF]]  {
+      def apply(v1: LFMatrix[L,TF], a: Double, v2: LFMatrix[L, TF]) {
         require(v2.labelIndex == v1.labelIndex)
         for( (tf, l) <- v1.data.zipWithIndex) {
-          op(a, v2(l),tf)
+          axpy(a, v2(l), tf)
         }
 
       }

diff --git a/src/main/scala/nak/stats/ContingencyStats.scala b/src/main/scala/nak/stats/ContingencyStats.scala
@@ -19,6 +19,7 @@ package nak.stats
 import nak.classify.Classifier
 import nak.data._
 import breeze.linalg._
+import breeze.stats._
 
 import ContingencyStats._