David_Korzeniewski
8b1a4b4e52
Quickfix s.t. we have a defined index and don't dereference end() which is bad
Former-commit-id: c55bb57dd5
11 years ago
dehnert
f673dccd76
Formula parser works again. Tests adapted.
Former-commit-id: 78ce54d69f
11 years ago
dehnert
231d2223a9
Model building works again (more or less)
Former-commit-id: fa6843fcdc
11 years ago
dehnert
aaefe7dfa5
Fixed some tests/parser.
Former-commit-id: d1767861c4
11 years ago
dehnert
53196f5610
Created bit vector hash map and some necessary bit vector methods.
Former-commit-id: 4a9946a743
11 years ago
dehnert
ab0caf79e8
Replaced action names by indices in PRISM programs.
Former-commit-id: e66820c247
11 years ago
dehnert
3260a6203c
Started improving performance of explicit model generation.
Former-commit-id: 318a97aedc
11 years ago
dehnert
b37e009168
Further steps to new expressions.
Former-commit-id: 4396857eff
11 years ago
dehnert
8e71081f1e
Functional tests now work again.
Former-commit-id: 46d964ad22
11 years ago
dehnert
7ec3e8b214
Further fixes for new variable handling. libstorm now compiles again, yay.
Former-commit-id: a9ac5c0356
11 years ago
dehnert
e49814d391
Modified pctl/csl/ltl options to now take formulas instead of files. Prefixed the macros with STORM_. Moved these macros into a file in the utilities. Modified architecture of the exception classes slightly. Threw away all the contents of main(). This will now be build from scratch.
Former-commit-id: 89d94f7957
11 years ago
dehnert
ff572c7f6f
Sped up PRISM parser by letting it skip the actual command definitions in the first run (because only gathering constants, variables and formulas is important in this particular run).
Former-commit-id: 0b25c73fa4
11 years ago
dehnert
f485974187
Fixed (asynch) leader election to comply with our grammar. Added LOG_DEBUG macro.
Former-commit-id: 7b22ecba8e
11 years ago
dehnert
40c698af90
Some fixes to make new SMT framework compile with clang under Mac OS (includes fixes to some initializiation ordering warnings). Bugfix for PRISM parser to correctly handle formulas.
Former-commit-id: d513476066
11 years ago
dehnert
72cc5f2188
Added 'power' as a binary operator in expression classes and expression grammar.
Former-commit-id: c58321709e
11 years ago
dehnert
478f5ee38c
Started separating expression parsing from PRISM model parsing.
Former-commit-id: 84d1354f97
11 years ago
dehnert
219af9b43b
Removed constants from expressions. Even though PRISM has the concept of constants and variables, it currently makes no sense to distinguish them in our expression classes.
Former-commit-id: 787e921e2c
11 years ago
dehnert
c76e0e8d4d
Added class for initial construct of PRISM programs (to capture position information). Added more validity checks for programs and tests for them (not all though).
Former-commit-id: cf4e985684
11 years ago
dehnert
873d80cd2d
If a module is renamed from some other module, this is now kept track of in the respective PRISM classes.
Former-commit-id: c07e25ac55
11 years ago
dehnert
82836f1ad1
Added some checks for validity of identifiers in PRISM programs. Added some illegal tests to test suite.
Former-commit-id: fc44db75a7
11 years ago
dehnert
39ec9401ef
Fixed the PrismParser so the exact format of PRISMs boolean expressions can now be parsed.
Former-commit-id: bb08ec1646
11 years ago
PBerger
1d8ae9fc89
Fixed an issue with templated variadic template arguments (see http://stackoverflow.com/questions/23119273/use-a-templated-variadic-template-parameter-as-specialized-parameter for discussion)
Former-commit-id: e7d2d054b6
11 years ago
dehnert
311247ff0c
Added support for Xor in expression classes and added parsing functionality for Xor, Implies and Iff.
Former-commit-id: 16e023cf26
11 years ago
dehnert
164c8225fd
Fixed some minor issues.
Former-commit-id: 80f0ae4c9c
11 years ago
dehnert
d9345b19e9
Further work on adapting explicit model generator to new PRISM classes.
Former-commit-id: 01cefceb52
11 years ago
dehnert
199b6576a9
Added ternary operator. Parsing standard PRISM models into the PRISM classes now works. Included tests for parsing stuff. ToDo: add remaining semantic checks for parsing/PRISM classes and fix explicit model adapter.
Former-commit-id: cb37c98f1f
11 years ago
dehnert
f6587b424d
Further work on PrismParser and the related PRISM classes...
Former-commit-id: be4ae055dd
11 years ago
dehnert
e67eb05309
Changed internal data structures of PRISM classes slightly. Added classs for certain ingredients that were represented as primitives before.
Former-commit-id: bdc61e88a5
11 years ago
PBerger
89909fe8dc
Edited all Parsers to lose its class.
Modified many classes to provide a reference-constructor.
Fixed a few bugs in Tests.
Former-commit-id: c31fe95aae
12 years ago
PBerger
f4050e5b18
Edited Parsers, re factored interface into a single function without an encapsulating class. Warning, this is work in Progress and not yet compiling.
12 years ago
Lanchid
ec91dcbe2e
Merge branch master into LTLParser
12 years ago
gereon
cb14f2e771
Made choiceIndices work in ExplicitModelAdapter, added code to somehow use --symbolic (parse model, show model information)
12 years ago
gereon
aafdbf7671
Fixed errors due to merging.
12 years ago
gereon
dfd4df2884
Removing debug output.
12 years ago
gereon
ac86932785
Fixed renaming: Command names were not considered.
12 years ago
gereon
3b76126f6b
Split PrismParser and PrismGrammar in differenc object files.
Added reset method for grammars, now we can parse multiple files in one program execution.
Added test for mdp parsing.
12 years ago
gereon
4222130524
Fixed a few more bugs in clone() of various Expression classes and some in the module renaming.
12 years ago
gereon
c3cfc5404c
Somewhat fixed weird issue during module renaming.
The "fix" is very weird (see VariableState.cpp:55 and following) and still seems to lead to a segfault upon program termination...
12 years ago
gereon
014ecd8597
Fixed some glitches, producing meaningful error if sum of probabilities for a command is not one
12 years ago
gereon
c1801b4ecc
Changed debug output to use LOG4CPLUS
12 years ago
gereon
9613d099bb
Removed shared_ptr for module, program and rewardmodel objects.
12 years ago
gereon
1878962dea
Fixed another nullptr, removed shared_ptr for Update and Command objects.
12 years ago
gereon
3c1cf4819c
Fixed a few other issues. Module renaming seems to work now!
(However, there is still a segfault at some later point...)
12 years ago
gereon
152bcd2f20
Porting Program datastructures to use shared_ptr (at least for the moment...)
some more cleanups
12 years ago
gereon
b92260fed0
A lot of work on PrismParser:
* Created a distinct parser for each expression type and for identifiers
* Removed all expression rules from PrismParser, using new parsers instead
* Reduced excessive usage of boost::lambda, using semantic actions only for single calls
* Moved actual state to new class (-> VariableState, whole two-run-logic can probably implemented there)
* Much cleanup
Work should be finished on expression parser, but not yet on prism parser...
12 years ago
gereon
bb37bc49f2
Compiling version of PrismParser.
12 years ago
gereon
840a9b6e07
Somewhat works now. Still has at least one bug and segfaults afterwards :-)
12 years ago
gereon
e55fca3836
Implemented module renaming.
This includes clone() routines (that accept the renaming information) for all ir::expressions classes, additional constructors for all ir classes and additional rules in PrismParser.
This is the first version that has the chance to work and actually compiles. (Insert some swearing here...)
Testing is to be done, as this will most probably not work yet.
12 years ago
gereon
752dda4252
fixing error with difference operator in freeIdentifier
13 years ago
gereon
ba49792d29
Perform two runs in PrismParser.
First run collects all variables, second run uses the declared variables.
13 years ago