Browse Source

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
master
Joachim Klein 10 years ago
parent
commit
9db978a12a
  1. 4
      prism/src/automata/DA.java
  2. 2
      prism/src/automata/LTL2DA.java
  3. 2
      prism/src/explicit/LTLModelChecker.java

4
prism/src/automata/DA.java

@ -365,14 +365,14 @@ public class DA<Symbol, Acceptance extends AcceptanceOmega>
s += " " + i + "-" + e.label + "->" + e.dest; s += " " + i + "-" + e.label + "->" + e.dest;
} }
} }
s += "; " + acceptance.getTypeName() + " acceptance: ";
s += "; " + acceptance.getType() + " acceptance: ";
s += acceptance; s += acceptance;
return s; return s;
} }
public String getAutomataType() public String getAutomataType()
{ {
return "D"+acceptance.getTypeAbbreviated()+"A";
return "D"+acceptance.getType().getNameAbbreviated()+"A";
} }
/** /**

2
prism/src/automata/LTL2DA.java

@ -282,7 +282,7 @@ public class LTL2DA extends PrismComponent
DA.switchAcceptance(result, acceptance.toAcceptanceGeneric()); DA.switchAcceptance(result, acceptance.toAcceptanceGeneric());
return result; return result;
} else { } 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"); + " acceptance, which is not yet supported for model checking this model / property");
} }
} }

2
prism/src/explicit/LTLModelChecker.java

@ -633,7 +633,7 @@ public class LTLModelChecker extends PrismComponent
} else if (acceptance instanceof AcceptanceGenRabin) { } else if (acceptance instanceof AcceptanceGenRabin) {
return findAcceptingECStatesForGeneralizedRabin(model, (AcceptanceGenRabin) acceptance); 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).");
} }
/** /**

Loading…
Cancel
Save