Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Table: Fix Bool Column Sorting #1505

Merged
merged 1 commit into from
Feb 24, 2021
Merged

Table: Fix Bool Column Sorting #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public Storage applyMask(OrderMask mask) {
if (positions[i] == Index.NOT_FOUND || isMissing.get(positions[i])) {
newNa.set(i);
} else if (values.get(positions[i])) {
values.set(i);
newVals.set(i);
}
}
return new BoolStorage(newVals, newNa, positions.length, negated);
Expand Down
27 changes: 27 additions & 0 deletions test/Table_Tests/src/Table_Spec.enso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,33 @@ spec =
r = df.sort by='foobar'
r.should_fail_with No_Such_Column_Error

Test.specify 'should correctly reorder all kinds of columns and leave the original columns untouched' <|
ord = [0, 3, 2, 4, 1]
ints = [1, 2, 3, 4, 5]
reals = [1.3, 4.6, 3.2, 5.2, 1.6]
bools = [False, False, True, True, False]
texts = ["foo", "foo", "bar", "baz", "spam"]
objs = [Cons 1 2, Cons 2 3, Cons 6 7, Cons 8 9, Cons 10 30]

df = Table.new [['ord', ord], ['ints', ints], ['reals', reals], ['bools', bools], ['texts', texts], ['objs', objs]]
r = df.sort by='ord'

r.at 'ints' . to_vector . should_equal [1, 5, 3, 2, 4]
df.at 'ints' . to_vector . should_equal ints

r.at 'reals' . to_vector . should_equal [1.3, 1.6, 3.2, 4.6, 5.2]
df.at 'reals' . to_vector . should_equal reals

r.at 'bools' . to_vector . should_equal [False, False, True, False, True]
df.at 'bools' . to_vector . should_equal bools

r.at 'texts' . to_vector . should_equal ['foo', 'spam', 'bar', 'foo', 'baz']
df.at 'texts' . to_vector . should_equal texts

r.at 'objs' . to_vector . should_equal [Cons 1 2, Cons 10 30, Cons 6 7, Cons 2 3, Cons 8 9]
df.at 'objs' . to_vector . should_equal objs


Test.group "Sorting Columns" <|
Test.specify 'should sort columns with specified ordering and missing placement' <|
c = Column.from_vector 'foo' [1, 7, Nothing, 4, 8, Nothing]
Expand Down