Skip to content
Snippets Groups Projects
Commit 90457ecf authored by Eric Pershey's avatar Eric Pershey
Browse files

removed hanging print and added 2 tests.

parent 6c98d01a
No related branches found
No related tags found
No related merge requests found
...@@ -331,7 +331,6 @@ object BitmaskLite { ...@@ -331,7 +331,6 @@ object BitmaskLite {
def intersection_any_v1(a_bitmask: LiteBitmaskStruct, b_bitmask: LiteBitmaskStruct): Boolean = { def intersection_any_v1(a_bitmask: LiteBitmaskStruct, b_bitmask: LiteBitmaskStruct): Boolean = {
var result = false var result = false
if (!intersection_possible(a_bitmask, b_bitmask)) { if (!intersection_possible(a_bitmask, b_bitmask)) {
println("intersection not possible.")
result = false result = false
} else { } else {
val first_a = a_bitmask.bit_idx_first val first_a = a_bitmask.bit_idx_first
...@@ -380,7 +379,7 @@ object BitmaskLite { ...@@ -380,7 +379,7 @@ object BitmaskLite {
} }
def toArrayRangeLimitGen(arraySeq: ArraySeq[ArraySeq[Long]], idx_first: Long = 0, idx_last: Long = -2): Iterator[Long] = { def toArrayRangeLimitGen(arraySeq: ArraySeq[ArraySeq[Long]], idx_first: Long = 0, idx_last: Long = -2): Iterator[Long] = {
/* return only inner ArraySeq that are */ /* remove full outer ArraySeq that are not in the idx_first to idx_last range. */
if (arraySeq.nonEmpty){ if (arraySeq.nonEmpty){
toArrayRangeGen(arraySeq.filter(a => ( toArrayRangeGen(arraySeq.filter(a => (
((a.head >= idx_first)) | (a.last >= idx_first)) ((a.head >= idx_first)) | (a.last >= idx_first))
...@@ -394,7 +393,6 @@ object BitmaskLite { ...@@ -394,7 +393,6 @@ object BitmaskLite {
def intersection_any_v2(a_bitmask: LiteBitmaskStruct, b_bitmask: LiteBitmaskStruct): Boolean = { def intersection_any_v2(a_bitmask: LiteBitmaskStruct, b_bitmask: LiteBitmaskStruct): Boolean = {
var result = false var result = false
if (!intersection_possible(a_bitmask, b_bitmask)) { if (!intersection_possible(a_bitmask, b_bitmask)) {
println("intersection not possible.")
result = false result = false
} else { } else {
val first_a = a_bitmask.bit_idx_first val first_a = a_bitmask.bit_idx_first
......
...@@ -193,6 +193,14 @@ class BitmaskLiteTest extends AnyFunSuite{ ...@@ -193,6 +193,14 @@ class BitmaskLiteTest extends AnyFunSuite{
LiteBitmaskStruct(4392, 10, 2911, 3006, ArraySeq(ArraySeq[Long](2911, 2911), ArraySeq[Long](2913, 2913), ArraySeq[Long](2962, 2963), ArraySeq[Long](2965, 2965), ArraySeq[Long](2970, 2971), ArraySeq[Long](3004, 3006))), LiteBitmaskStruct(4392, 10, 2911, 3006, ArraySeq(ArraySeq[Long](2911, 2911), ArraySeq[Long](2913, 2913), ArraySeq[Long](2962, 2963), ArraySeq[Long](2965, 2965), ArraySeq[Long](2970, 2971), ArraySeq[Long](3004, 3006))),
LiteBitmaskStruct(4392, 2196, 0, 4390, ArraySeq.range(0, 4392, 2).map(i => ArraySeq(i.toLong, i.toLong))), LiteBitmaskStruct(4392, 2196, 0, 4390, ArraySeq.range(0, 4392, 2).map(i => ArraySeq(i.toLong, i.toLong))),
true true
), (
LiteBitmaskStruct(128, 1, 0, 0, ArraySeq(ArraySeq[Long](0, 0))),
LiteBitmaskStruct(128, 64, 1, 127, ArraySeq.range(1, 128, 2).map(i => ArraySeq(i.toLong, i.toLong))),
false
), (
LiteBitmaskStruct(128, 1, 0, 0, ArraySeq(ArraySeq[Long](0, 0))),
LiteBitmaskStruct(128, 64, 0, 126, ArraySeq.range(0, 128, 2).map(i => ArraySeq(i.toLong, i.toLong))),
true
) )
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment