Skip to content

Commit 874bc51

Browse files
committed
Some fixes in B(Big)Integer and BSet
1 parent e504f55 commit 874bc51

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

btypes_big_integer/src/main/java/de/hhu/stups/btypes/BInteger.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -70,32 +70,32 @@ public int compareTo(BInteger o) {
7070
}
7171

7272
public BBoolean lessEqual(BInteger o) {
73-
return new BBoolean(this.value <= o.value);
73+
return new BBoolean(compareTo(o) <= 0);
7474
}
7575

7676

7777
public BBoolean greaterEqual(BInteger o) {
78-
return new BBoolean(this.value >= o.value);
79-
}
80-
81-
public java.math.BigInteger asBigInteger() {
82-
return new java.math.BigInteger(String.valueOf(value));
78+
return new BBoolean(compareTo(o) >= 0);
8379
}
8480

8581
public BBoolean less(BInteger o) {
86-
return new BBoolean(this.value < o.value);
82+
return new BBoolean(compareTo(o) < 0);
8783
}
8884

8985
public BBoolean greater(BInteger o) {
90-
return new BBoolean(this.value > o.value);
86+
return new BBoolean(compareTo(o) > 0);
9187
}
9288

9389
public BBoolean equal(BInteger o) {
94-
return new BBoolean(this.value == o.value);
90+
return new BBoolean(compareTo(o) == 0);
9591
}
9692

9793
public BBoolean unequal(BInteger o) {
98-
return new BBoolean(this.value != o.value);
94+
return new BBoolean(compareTo(o) != 0);
95+
}
96+
97+
public java.math.BigInteger asBigInteger() {
98+
return new java.math.BigInteger(String.valueOf(value));
9999
}
100100

101101
@Override

btypes_big_integer/src/main/java/de/hhu/stups/btypes/BSet.java

+15-4
Original file line numberDiff line numberDiff line change
@@ -348,20 +348,31 @@ public BBoolean subsetOfInteger() {
348348
return new BBoolean(true);
349349
}
350350

351+
public BBoolean subsetOfBoolean() {
352+
for(T e : this) {
353+
if(e instanceof BBoolean) {
354+
return new BBoolean(true);
355+
} else {
356+
return new BBoolean(false);
357+
}
358+
}
359+
return new BBoolean(true);
360+
}
361+
351362
public BBoolean strictSubsetOfBoolean() {
352-
return subsetOfBoolean();
363+
return new BBoolean(this.subsetOfBoolean().booleanValue() && this.size() < 2);
353364
}
354365

355366
public BBoolean notSubsetOfBoolean() {
356-
return subsetOfBoolean().not();
367+
return this.subsetOfBoolean().not();
357368
}
358369

359370
public BBoolean equalBoolean() {
360-
return new BBoolean(subsetOfBoolean().booleanValue() && this.size() == 2);
371+
return new BBoolean(this.subsetOfBoolean().booleanValue() && this.size() == 2);
361372
}
362373

363374
public BBoolean unequalBoolean() {
364-
return new BBoolean(subsetOfBoolean().booleanValue() && this.size() < 2);
375+
return new BBoolean(this.subsetOfBoolean().booleanValue() && this.size() < 2);
365376
}
366377

367378
public BBoolean strictSubsetOfInteger() {

0 commit comments

Comments
 (0)