Browse Source
ModelGenerator (actually ModelInfo) improvements.
ModelGenerator (actually ModelInfo) improvements.
A default implementation of createVarList() in ModelInfo now creates a VarList automatically, so this does not need to be implemented when creating a ModelGenerator. Instead, just getVarDeclarationType(int i), which is a newly added method, should be implemented. There is also a default implementation of this, but it assumes that integer variables are unbounded, which will not work with the symbolic engine. In a related change, ModelInfo can now optionally specify which "module" a variable belongs to (via getVarModuleIndex and getModuleName). ModulesFile is updated, to fully support the new version of ModelInfo, and all implementations of ModelGenerator are simplified where possible. The old VarList constructor which takes a ModulesFile is removed and replaced with one which takes a ModelInfo object.accumulation-v4.7
9 changed files with 202 additions and 92 deletions
-
19prism/src/explicit/ModelModelGenerator.java
-
33prism/src/parser/VarList.java
-
25prism/src/parser/ast/ModulesFile.java
-
47prism/src/prism/ExplicitFiles2ModelInfo.java
-
76prism/src/prism/ModelInfo.java
-
26prism/src/prism/TestModelGenerator.java
-
2prism/src/pta/DigitalClocks.java
-
33prism/src/simulator/ModulesFileModelGenerator.java
-
33prism/src/simulator/ModulesFileModelGeneratorSymbolic.java
Write
Preview
Loading…
Cancel
Save
Reference in new issue