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.

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

Broadcasting rules are properly applied to length 1 NumberLists #117

Merged
merged 1 commit into from
Nov 28, 2024
Merged
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions src/aya/util/VectorizedFunctions.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,18 @@ private static List vectorizeObjList(ExecutionContext context, Operator op, Obj
//

private static List vectorizeListList(ExecutionContext context, Operator op, List a, List b, NumberListOp nlop) {
if (a.isa(NUMBERLIST) && b.isa(NUMBERLIST) && a.length() == b.length()) {
return new List(nlop.ll(asNumberList(a), asNumberList(b)));
if (a.isa(NUMBERLIST) && b.isa(NUMBERLIST)) {
final int a_len = a.length();
final int b_len = b.length();
if (a_len == b_len) {
return new List(nlop.ll(asNumberList(a), asNumberList(b)));
} else if (a_len == 1) {
return new List(nlop.nl(asNumberList(a).get(0), asNumberList(b)));
} else if (b_len == 1) {
return new List(nlop.ln(asNumberList(a), asNumberList(b).get(0)));
} else {
return vectorizeListList(context, op, a, b);
}
} else {
return vectorizeListList(context, op, a, b);
}
Expand Down