1 files changed, 28 insertions, 3 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java
index d2132cea..f3a6ec32 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java
@@ -2,21 +2,46 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra;
 public enum Modality {
        MUST, MAY, CURRENT;
        public boolean isMust() {
                return this == MUST;
        }
        public boolean isMay() {
                return this == MAY;
        }
        public boolean isCurrent() {
                return this == CURRENT;
        }
        public boolean isMustOrCurrent() {
                return isMust() || isCurrent();
        }
        public Modality getDual() {
-                if(this.isCurrent()) return CURRENT;
+                switch (this) {
-                else if(this.isMust())return MAY;
+                case CURRENT:
-                else return MUST;
+                        return CURRENT;
+                case MUST:
+                        return MAY;
+                case MAY:
+                        return MUST;
+                default:
+                        throw new UnsupportedOperationException("Unknown Modality: " + this);
+                }
+        }
+        public Modality toBase() {
+                if (this.isCurrent()) {
+                        return MUST;
+                } else {
+                        return this;
+                }
+        }
+        @Override
+        public String toString() {
+                return super.toString().toLowerCase();
        }
 }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java index d2132cea..f3a6ec32 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/Modality.java
@@ -2,21 +2,46 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra;
2		2
3	public enum Modality {	3	public enum Modality {
4	MUST, MAY, CURRENT;	4	MUST, MAY, CURRENT;
		5
5	public boolean isMust() {	6	public boolean isMust() {
6	return this == MUST;	7	return this == MUST;
7	}	8	}
		9
8	public boolean isMay() {	10	public boolean isMay() {
9	return this == MAY;	11	return this == MAY;
10	}	12	}
		13
11	public boolean isCurrent() {	14	public boolean isCurrent() {
12	return this == CURRENT;	15	return this == CURRENT;
13	}	16	}
		17
14	public boolean isMustOrCurrent() {	18	public boolean isMustOrCurrent() {
15	return isMust() \|\| isCurrent();	19	return isMust() \|\| isCurrent();
16	}	20	}
		21
17	public Modality getDual() {	22	public Modality getDual() {
18	if(this.isCurrent()) return CURRENT;	23	switch (this) {
19	else if(this.isMust())return MAY;	24	case CURRENT:
20	else return MUST;	25	return CURRENT;
		26	case MUST:
		27	return MAY;
		28	case MAY:
		29	return MUST;
		30	default:
		31	throw new UnsupportedOperationException("Unknown Modality: " + this);
		32	}
		33	}
		34
		35	public Modality toBase() {
		36	if (this.isCurrent()) {
		37	return MUST;
		38	} else {
		39	return this;
		40	}
		41	}
		42
		43	@Override
		44	public String toString() {
		45	return super.toString().toLowerCase();
21	}	46	}
22	}	47	}