Browse Source

Bug fix: tra extension does not need to be first listed in -importmodel.

Also remove some redundant code.
accumulation-v4.7
Dave Parker 7 years ago
parent
commit
bbc508f2b9
  1. 11
      prism/src/prism/PrismCL.java

11
prism/src/prism/PrismCL.java

@ -1902,9 +1902,6 @@ public class PrismCL implements PrismModelListener
} else if (ext.equals("tra")) { } else if (ext.equals("tra")) {
importtrans = true; importtrans = true;
modelFilename = basename + ".tra"; modelFilename = basename + ".tra";
} else if (ext.equals("tra")) {
importtrans = true;
modelFilename = basename + ".tra";
} else if (ext.equals("sta")) { } else if (ext.equals("sta")) {
importstates = true; importstates = true;
importStatesFilename = basename + ".sta"; importStatesFilename = basename + ".sta";
@ -1919,10 +1916,10 @@ public class PrismCL implements PrismModelListener
else { else {
throw new PrismException("Unknown extension \"" + ext + "\" for -importmodel switch"); throw new PrismException("Unknown extension \"" + ext + "\" for -importmodel switch");
} }
// Check at least the transition matrix was imported
if (!importtrans) {
throw new PrismException("You must import the transition matrix when using -importmodel (use option \"tra\" or \"all\")");
}
}
// Check at least the transition matrix was imported
if (!importtrans) {
throw new PrismException("You must import the transition matrix when using -importmodel (use option \"tra\" or \"all\")");
} }
// No options supported currently // No options supported currently
/*// Process options /*// Process options

Loading…
Cancel
Save