acceptance: Refactor AcceptanceType (names for the acceptance types)

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11192 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/acceptance/AcceptanceBuchi.java

@@ -150,7 +150,7 @@ public class AcceptanceBuchi implements AcceptanceOmega
 		} else if (AcceptanceType.contains(allowedAcceptance, AcceptanceType.GENERIC)) {
 			return complementToGeneric();
 		}
-		throw new PrismNotSupportedException("Can not complement " + getTypeName() + " acceptance to a supported acceptance type");
+		throw new PrismNotSupportedException("Can not complement " + getType() + " acceptance to a supported acceptance type");
 	}
 
 	@Override
@@ -207,15 +207,17 @@ public class AcceptanceBuchi implements AcceptanceOmega
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeAbbreviated()
 	{
-		return "B";
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeName()
 	{
-		return "Buchi";
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceBuchiDD.java

@@ -105,15 +105,17 @@ public class AcceptanceBuchiDD implements AcceptanceOmegaDD
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeAbbreviated()
 	{
-		return "B";
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeName()
 	{
-		return "Buchi";
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceGenRabin.java

@@ -204,7 +204,7 @@ public class AcceptanceGenRabin
 		if (AcceptanceType.contains(allowedAcceptance, AcceptanceType.GENERIC)) {
 			return complementToGeneric();
 		}
-		throw new PrismNotSupportedException("Can not complement " + getTypeName() + " acceptance to a supported acceptance type");
+		throw new PrismNotSupportedException("Can not complement " + getType() + " acceptance to a supported acceptance type");
 	}
 
 	@Override
@@ -324,15 +324,15 @@ public class AcceptanceGenRabin
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "GR";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Generalized Rabin";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceGenRabinDD.java

@@ -213,14 +213,14 @@ public class AcceptanceGenRabinDD
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "GR";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Generalized Rabin";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 }

prism/src/acceptance/AcceptanceGeneric.java

@@ -225,13 +225,15 @@ public class AcceptanceGeneric implements AcceptanceOmega {
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeAbbreviated() {
-		return "";
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeName() {
-		return "generic";
+		return getType().getName();
 	}
 
 	@Override
@@ -287,7 +289,7 @@ public class AcceptanceGeneric implements AcceptanceOmega {
 		if (AcceptanceType.contains(allowedAcceptance, AcceptanceType.GENERIC)) {
 			return this.complementToGeneric();
 		}
-		throw new PrismNotSupportedException("Can not complement " + getTypeName() + " acceptance to required acceptance type");
+		throw new PrismNotSupportedException("Can not complement " + getType() + " acceptance to required acceptance type");
 	}
 
 	@Override

prism/src/acceptance/AcceptanceGenericDD.java

@@ -154,13 +154,15 @@ public class AcceptanceGenericDD implements AcceptanceOmegaDD {
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeAbbreviated() {
-		return "";
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
+	@Deprecated
 	public String getTypeName() {
-		return "generic";
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceOmega.java

@@ -60,11 +60,18 @@ public interface AcceptanceOmega extends Cloneable
 	public AcceptanceType getType();
 
 	/** Returns the type of this acceptance condition as a String,
-	 * i.e., "R" for Rabin
+	 * i.e., "R" for Rabin.
+	 * <br>
+	 * Deprecated, use {@code getType().getNameAbbreviated()}
 	 */
+	@Deprecated
 	public String getTypeAbbreviated();
 
-	/** Returns a full name for this acceptance condition */
+	/** Returns a full name for this acceptance condition
+	 * <br>
+	 * Deprecated, use {@code getType()} in String context or {@code getType().getName()}
+	 */
+	@Deprecated
 	public String getTypeName();
 
 	/** Print the appropriate Acceptance (and potentially acc-name) header */

prism/src/acceptance/AcceptanceOmegaDD.java

@@ -51,6 +51,7 @@ public interface AcceptanceOmegaDD
 	/** Returns the type of this acceptance condition as a String,
 	 * i.e., "R" for Rabin
 	 */
+	@Deprecated
 	public String getTypeAbbreviated();
 
 	/**
@@ -61,5 +62,6 @@ public interface AcceptanceOmegaDD
 	void clear();
 
 	/** Returns a full name for this acceptance condition */
+	@Deprecated
 	public String getTypeName();
 }

prism/src/acceptance/AcceptanceRabin.java

@@ -210,7 +210,7 @@ public class AcceptanceRabin
 		if (AcceptanceType.contains(allowedAcceptance, AcceptanceType.GENERIC)) {
 			return complementToGeneric();
 		}
-		throw new PrismNotSupportedException("Can not complement " + getTypeName() + " acceptance to a supported acceptance type");
+		throw new PrismNotSupportedException("Can not complement " + getType() + " acceptance to a supported acceptance type");
 	}
 
 	/**
@@ -317,15 +317,15 @@ public class AcceptanceRabin
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "R";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Rabin";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceRabinDD.java

@@ -29,7 +29,6 @@ package acceptance;
 import java.util.ArrayList;
 
 import common.IterableBitSet;
-
 import jdd.JDD;
 import jdd.JDDNode;
 import jdd.JDDVars;
@@ -241,14 +240,14 @@ public class AcceptanceRabinDD
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "R";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Rabin";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 }

prism/src/acceptance/AcceptanceReach.java

@@ -131,7 +131,7 @@ public class AcceptanceReach implements AcceptanceOmega
 		} else if (AcceptanceType.contains(allowedAcceptance, AcceptanceType.GENERIC)) {
 			return complementToGeneric();
 		}
-		throw new PrismNotSupportedException("Can not complement " + getTypeName() + " acceptance to a supported acceptance type");
+		throw new PrismNotSupportedException("Can not complement " + getType() + " acceptance to a supported acceptance type");
 	}
 
 	@Override
@@ -188,15 +188,15 @@ public class AcceptanceReach implements AcceptanceOmega
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "F";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Finite";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceReachDD.java

@@ -105,15 +105,15 @@ public class AcceptanceReachDD implements AcceptanceOmegaDD
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "F";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Finite";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceStreett.java

@@ -213,7 +213,7 @@ public class AcceptanceStreett
 		if (AcceptanceType.contains(allowedAcceptance, AcceptanceType.GENERIC)) {
 			return complementToGeneric();
 		}
-		throw new PrismNotSupportedException("Can not complement " + getTypeName() + " acceptance to a supported acceptance type");
+		throw new PrismNotSupportedException("Can not complement " + getType() + " acceptance to a supported acceptance type");
 	}
 
 
@@ -319,15 +319,15 @@ public class AcceptanceStreett
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "S";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Streett";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 
 	@Override

prism/src/acceptance/AcceptanceStreettDD.java

@@ -239,14 +239,14 @@ public class AcceptanceStreettDD
 	}
 
 	@Override
-	public String getTypeAbbreviated()
-	{
-		return "S";
+	@Deprecated
+	public String getTypeAbbreviated() {
+		return getType().getNameAbbreviated();
 	}
 
 	@Override
-	public String getTypeName()
-	{
-		return "Streett";
+	@Deprecated
+	public String getTypeName() {
+		return getType().getName();
 	}
 }

prism/src/acceptance/AcceptanceType.java

@@ -31,12 +31,48 @@ package acceptance;
  * An omega-regular acceptance type.
  */
 public enum AcceptanceType {
-	BUCHI,
-	RABIN,
- 	STREETT,
- 	REACH,
-	GENERALIZED_RABIN,
- 	GENERIC;
+	/** Büchi acceptance */
+	BUCHI("Buchi", "B"),
+	/** Rabin acceptance */
+	RABIN("Rabin", "R"),
+	/** Streett acceptance */
+ 	STREETT("Streett", "S"),
+ 	/** Finite acceptance (goal states) */
+ 	REACH("Finite", "F"),
+ 	/** Generalized Rabin acceptance */
+	GENERALIZED_RABIN("generalized-Rabin", "GR"),
+	/** Generic acceptance, i.e., a boolean formula over Inf and Fin as in HOA format */
+ 	GENERIC("generic", "");   // abbreviation for generic is empty, results in DA
+
+	/** The long form name */
+	private final String typeName;
+	/** The abbreviated name */
+	private final String typeNameAbbreviated;
+
+	private AcceptanceType(String typeName, String typeNameAbbreviated)
+	{
+		this.typeName = typeName;
+		this.typeNameAbbreviated = typeNameAbbreviated;
+	}
+
+	/** Returns the long form name for this acceptance type */
+	public String getName()
+	{
+		return typeName;
+	}
+
+	/** Returns the abbreviated form of the name for this acceptance type */
+	public String getNameAbbreviated()
+	{
+		return typeNameAbbreviated;
+	}
+
+	@Override
+	public String toString()
+	{
+		// the long form name
+		return getName();
+	}
 
 	/**
 	 * Check whether an array of AcceptanceTypes contains a specific element.