Commit 874bc51 1 parent e504f55 commit 874bc51 Copy full SHA for 874bc51
File tree 2 files changed +25
-14
lines changed
btypes_big_integer/src/main/java/de/hhu/stups/btypes
2 files changed +25
-14
lines changed Original file line number Diff line number Diff line change @@ -70,32 +70,32 @@ public int compareTo(BInteger o) {
70
70
}
71
71
72
72
public BBoolean lessEqual (BInteger o ) {
73
- return new BBoolean (this . value <= o . value );
73
+ return new BBoolean (compareTo ( o ) <= 0 );
74
74
}
75
75
76
76
77
77
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 );
83
79
}
84
80
85
81
public BBoolean less (BInteger o ) {
86
- return new BBoolean (this . value < o . value );
82
+ return new BBoolean (compareTo ( o ) < 0 );
87
83
}
88
84
89
85
public BBoolean greater (BInteger o ) {
90
- return new BBoolean (this . value > o . value );
86
+ return new BBoolean (compareTo ( o ) > 0 );
91
87
}
92
88
93
89
public BBoolean equal (BInteger o ) {
94
- return new BBoolean (this . value == o . value );
90
+ return new BBoolean (compareTo ( o ) == 0 );
95
91
}
96
92
97
93
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 ));
99
99
}
100
100
101
101
@ Override
Original file line number Diff line number Diff line change @@ -348,20 +348,31 @@ public BBoolean subsetOfInteger() {
348
348
return new BBoolean (true );
349
349
}
350
350
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
+
351
362
public BBoolean strictSubsetOfBoolean () {
352
- return subsetOfBoolean ();
363
+ return new BBoolean ( this . subsetOfBoolean (). booleanValue () && this . size () < 2 );
353
364
}
354
365
355
366
public BBoolean notSubsetOfBoolean () {
356
- return subsetOfBoolean ().not ();
367
+ return this . subsetOfBoolean ().not ();
357
368
}
358
369
359
370
public BBoolean equalBoolean () {
360
- return new BBoolean (subsetOfBoolean ().booleanValue () && this .size () == 2 );
371
+ return new BBoolean (this . subsetOfBoolean ().booleanValue () && this .size () == 2 );
361
372
}
362
373
363
374
public BBoolean unequalBoolean () {
364
- return new BBoolean (subsetOfBoolean ().booleanValue () && this .size () < 2 );
375
+ return new BBoolean (this . subsetOfBoolean ().booleanValue () && this .size () < 2 );
365
376
}
366
377
367
378
public BBoolean strictSubsetOfInteger () {
You can’t perform that action at this time.
0 commit comments