Skip to content
Snippets Groups Projects
Commit 874bc510 authored by Fabian Vu's avatar Fabian Vu
Browse files

Some fixes in B(Big)Integer and BSet

parent e504f553
No related branches found
No related tags found
No related merge requests found
Pipeline #151070 passed
......@@ -70,32 +70,32 @@ public class BInteger extends java.lang.Number implements Comparable<BInteger>,
}
public BBoolean lessEqual(BInteger o) {
return new BBoolean(this.value <= o.value);
return new BBoolean(compareTo(o) <= 0);
}
public BBoolean greaterEqual(BInteger o) {
return new BBoolean(this.value >= o.value);
}
public java.math.BigInteger asBigInteger() {
return new java.math.BigInteger(String.valueOf(value));
return new BBoolean(compareTo(o) >= 0);
}
public BBoolean less(BInteger o) {
return new BBoolean(this.value < o.value);
return new BBoolean(compareTo(o) < 0);
}
public BBoolean greater(BInteger o) {
return new BBoolean(this.value > o.value);
return new BBoolean(compareTo(o) > 0);
}
public BBoolean equal(BInteger o) {
return new BBoolean(this.value == o.value);
return new BBoolean(compareTo(o) == 0);
}
public BBoolean unequal(BInteger o) {
return new BBoolean(this.value != o.value);
return new BBoolean(compareTo(o) != 0);
}
public java.math.BigInteger asBigInteger() {
return new java.math.BigInteger(String.valueOf(value));
}
@Override
......
......@@ -348,20 +348,31 @@ public class BSet<T> implements BObject, Set<T> {
return new BBoolean(true);
}
public BBoolean subsetOfBoolean() {
for(T e : this) {
if(e instanceof BBoolean) {
return new BBoolean(true);
} else {
return new BBoolean(false);
}
}
return new BBoolean(true);
}
public BBoolean strictSubsetOfBoolean() {
return subsetOfBoolean();
return new BBoolean(this.subsetOfBoolean().booleanValue() && this.size() < 2);
}
public BBoolean notSubsetOfBoolean() {
return subsetOfBoolean().not();
return this.subsetOfBoolean().not();
}
public BBoolean equalBoolean() {
return new BBoolean(subsetOfBoolean().booleanValue() && this.size() == 2);
return new BBoolean(this.subsetOfBoolean().booleanValue() && this.size() == 2);
}
public BBoolean unequalBoolean() {
return new BBoolean(subsetOfBoolean().booleanValue() && this.size() < 2);
return new BBoolean(this.subsetOfBoolean().booleanValue() && this.size() < 2);
}
public BBoolean strictSubsetOfInteger() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment