mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply narrowing operation to BinaryColumn#and

Browse Source
This commit is contained in:
dfsek
2022-05-26 13:18:00 -07:00
parent 3ec15960cf
commit eaebc445f6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java
View File

@@ -101,7 +101,12 @@ public class BinaryColumn {
* @throws IllegalArgumentException if column heights do not match
*/
public BinaryColumn and(BinaryColumn that) {
return bool(that, (a, b) -> a.getAsBoolean() && b.getAsBoolean());
int bigMinY = Math.max(this.minY, that.minY); // narrow new column, as areas outside will always be false.
int smallMaxY = Math.min(this.maxY, that.maxY);
if(bigMinY >= smallMaxY) return getNull();
return new BinaryColumn(bigMinY, smallMaxY, y -> this.get(y) && that.get(y));
}
/**
@@ -114,14 +119,14 @@ public class BinaryColumn {
* @throws IllegalArgumentException if column heights do not match
*/
public BinaryColumn or(BinaryColumn that) {
return bool(that, (a, b) -> a.getAsBoolean() || b.getAsBoolean());
return or(that, (a, b) -> a.getAsBoolean() || b.getAsBoolean());
}
public BinaryColumn xor(BinaryColumn that) {
return bool(that, (a, b) -> a.getAsBoolean() ^ b.getAsBoolean());
return or(that, (a, b) -> a.getAsBoolean() ^ b.getAsBoolean());
}
private BinaryColumn bool(BinaryColumn that, BooleanBinaryOperator operator) {
private BinaryColumn or(BinaryColumn that, BooleanBinaryOperator operator) {
int smallMinY = Math.min(this.minY, that.minY);
int bigMaxY = Math.max(this.maxY, that.maxY);