Fix bug with .cast forcing bad values to NA, not NM.

tixxit · Nov 4, 2014 · d9dacb2 · d9dacb2
1 parent 8afecbf
commit d9dacb2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/framian/src/main/scala/framian/ColumnTyper.scala b/framian/src/main/scala/framian/ColumnTyper.scala
@@ -71,7 +71,7 @@ final class DefaultColumnTyper[A: ClassTag] extends ColumnTyper[A] {
     if (classTag[A].runtimeClass isAssignableFrom col.classTagA.runtimeClass) {
       col.column.asInstanceOf[Column[A]]
     } else {
-      Column.empty[A]()
+      col.column.flatMap { _ => NM }
     }
 }
 
@@ -82,6 +82,6 @@ final class TypeableColumnTyper[A: ClassTag: Typeable] extends ColumnTyper[A] {
     if (classTag[A].runtimeClass isAssignableFrom col.classTagA.runtimeClass) {
       col.column.asInstanceOf[Column[A]]
     } else {
-      col.column.flatMap { a => Cell.fromOption(a.cast[A]) }
+      col.column.flatMap { a => Cell.fromOption(a.cast[A], NM) }
     }
 }
diff --git a/framian/src/test/scala/framian/UntypedColumnSpec.scala b/framian/src/test/scala/framian/UntypedColumnSpec.scala
@@ -12,4 +12,22 @@ class UntypedColumnSpec extends Specification {
       (0 to 4).map(col(_)) must_== Seq(Value(1), Value(2), Value(3), Value(4), NA)
     }
   }
+
+  "cast" should {
+    "return NMs when values don't make sense" in {
+      val col0 = TypedColumn(Column(Value(42), NA, NM, Value(32))).cast[String]
+      col0(0) must_== NM
+      col0(1) must_== NA
+      col0(2) must_== NM
+      col0(3) must_== NM
+      col0(4) must_== NA
+
+      val col1 = TypedColumn(Column(Value("x"), NA, NM, Value("y"))).cast[Double]
+      col1(0) must_== NM
+      col1(1) must_== NA
+      col1(2) must_== NM
+      col1(3) must_== NM
+      col1(4) must_== NA
+    }
+  }
 }