Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
octeres
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Package Registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AIG-public
octeres
Commits
90457ecf
Commit
90457ecf
authored
2 weeks ago
by
Eric Pershey
Browse files
Options
Downloads
Patches
Plain Diff
removed hanging print and added 2 tests.
parent
6c98d01a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/scala/Octeres/Bitmask/BitmaskLite.scala
+1
-3
1 addition, 3 deletions
src/main/scala/Octeres/Bitmask/BitmaskLite.scala
src/test/scala/Octeres/Bitmask/BitmaskLiteTest.scala
+8
-0
8 additions, 0 deletions
src/test/scala/Octeres/Bitmask/BitmaskLiteTest.scala
with
9 additions
and
3 deletions
src/main/scala/Octeres/Bitmask/BitmaskLite.scala
+
1
−
3
View file @
90457ecf
...
@@ -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
]
=
{
/* re
turn only inn
er ArraySeq that are */
/* re
move full out
er 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
...
...
This diff is collapsed.
Click to expand it.
src/test/scala/Octeres/Bitmask/BitmaskLiteTest.scala
+
8
−
0
View file @
90457ecf
...
@@ -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
)
)
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment