last edits to multiarray2 for now

hail-is · Dec 3, 2015 · dc46651 · dc46651
1 parent 58076a2
commit dc46651
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/main/scala/org/broadinstitute/hail/utils/MultiArray2.scala b/src/main/scala/org/broadinstitute/hail/utils/MultiArray2.scala
@@ -15,21 +15,17 @@ class MultiArray2[T](val n1: Int,
   class Row(val i:Int) extends IndexedSeq[T] {
     require(i >= 0 && i < n1)
     def apply(j:Int): T = {
-      if (j >= 0 && j < length)
-        a(i*n2 + j)
-      else
-        throw new ArrayIndexOutOfBoundsException
+      if (j < 0 || j >= length) throw new ArrayIndexOutOfBoundsException
+      a(i*n2 + j)
     }
     def length: Int = n2
   }
 
   class Column(val j:Int) extends IndexedSeq[T] {
     require(j >= 0 && j < n2)
     def apply(i:Int): T = {
-      if (i >= 0 && i < length)
-        a(i*n2 + j)
-      else
-        throw new ArrayIndexOutOfBoundsException
+      if (i < 0 || i >= length) throw new ArrayIndexOutOfBoundsException
+      a(i*n2 + j)
     }
     def length: Int = n1
   }