From 9db978a12a033fb33ec965eed830549c8d06af32 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Fri, 12 Feb 2016 14:17:45 +0000 Subject: [PATCH] switch to new way of obtaining acceptance type name git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11193 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/automata/DA.java | 4 ++-- prism/src/automata/LTL2DA.java | 2 +- prism/src/explicit/LTLModelChecker.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prism/src/automata/DA.java b/prism/src/automata/DA.java index 8d338329..ee02a2ff 100644 --- a/prism/src/automata/DA.java +++ b/prism/src/automata/DA.java @@ -365,14 +365,14 @@ public class DA s += " " + i + "-" + e.label + "->" + e.dest; } } - s += "; " + acceptance.getTypeName() + " acceptance: "; + s += "; " + acceptance.getType() + " acceptance: "; s += acceptance; return s; } public String getAutomataType() { - return "D"+acceptance.getTypeAbbreviated()+"A"; + return "D"+acceptance.getType().getNameAbbreviated()+"A"; } /** diff --git a/prism/src/automata/LTL2DA.java b/prism/src/automata/LTL2DA.java index 34e58d1f..11648141 100644 --- a/prism/src/automata/LTL2DA.java +++ b/prism/src/automata/LTL2DA.java @@ -282,7 +282,7 @@ public class LTL2DA extends PrismComponent DA.switchAcceptance(result, acceptance.toAcceptanceGeneric()); return result; } else { - throw new PrismException("The external LTL->DA tool returned an automaton with " + acceptance.getTypeName() + throw new PrismException("The external LTL->DA tool returned an automaton with " + acceptance.getType() + " acceptance, which is not yet supported for model checking this model / property"); } } diff --git a/prism/src/explicit/LTLModelChecker.java b/prism/src/explicit/LTLModelChecker.java index 37260916..591355f7 100644 --- a/prism/src/explicit/LTLModelChecker.java +++ b/prism/src/explicit/LTLModelChecker.java @@ -633,7 +633,7 @@ public class LTLModelChecker extends PrismComponent } else if (acceptance instanceof AcceptanceGenRabin) { return findAcceptingECStatesForGeneralizedRabin(model, (AcceptanceGenRabin) acceptance); } - throw new PrismNotSupportedException("Computing end components for acceptance type '"+acceptance.getTypeName()+"' currently not supported (explicit engine)."); + throw new PrismNotSupportedException("Computing end components for acceptance type '"+acceptance.getType()+"' currently not supported (explicit engine)."); } /**