33386f4c5f 
								
							
								 
							
						 
						
							
							
								
								Changed the actions in the filters to be shared_ptr instead of raw pointers. This prevents memory leaks when a filter is destructed.  
							
							
 
							
							
							- Also handled nullptr actions.
|- They are checked for in the constructor as well as in the add method and filtered out. No segfaults do to nullptr actions anymore.
Former-commit-id: 84b3b2a978 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b7357c2cf9 
								
							
								 
							
						 
						
							
							
								
								Testing, noticed that vectors of pointers are not good. Changing that.  
							
							
 
							
							
							Former-commit-id: 460854c49c 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1c4d7b9ef9 
								
							
								 
							
						 
						
							
							
								
								Some more testing.  
							
							
 
							
							
							Former-commit-id: 3105a0bf3b 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								93a08538e3 
								
							
								 
							
						 
						
							
							
								
								Reverted debug change in test.  
							
							
 
							
							
							Former-commit-id: efeacaf595 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								7c5603de3e 
								
							
								 
							
						 
						
							
							
								
								Improved performance of the expression parser a bit more.  
							
							
 
							
							
							Former-commit-id: 7a0ae116c9 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								aecd0e3cb8 
								
							
								 
							
						 
						
							
							
								
								Made Storm compile again without Z3: guarded some header inclusions and function definitions/implementations. Also guarded the tests that require certain libraries (like Gurobi, glpk, Z3), so that tests do not fail any more when the libraries are not available.  
							
							
 
							
							
							Former-commit-id: 307036e25c 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2c59dd6f32 
								
							
								 
							
						 
						
							
							
								
								Finished unit tests for the actions.  
							
							
 
							
							
							Next up: Update the parser tests.
Former-commit-id: c0db7bd1d4 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ee1ebdf91d 
								
							
								 
							
						 
						
							
							
								
								Removed the visitor from LTL and refactured the formulas to use shared pointer in stead of standart pointer.  
							
							
 
							
							
							Next up: Continue testing.
Former-commit-id: 0103895e13 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								52d3d91060 
								
							
								 
							
						 
						
							
							
								
								Implemented Unsat Core/Assumtions & simple test  
							
							
 
							
							
							Former-commit-id: f79ee3a809 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d2f4c85711 
								
							
								 
							
						 
						
							
							
								
								Made changes to comply with new SparseMatrix Interface (YUCK).  
							
							
 
							
							
							Fixed tests, all that stuff.
Former-commit-id: c78de5f8ce 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9fe246a98b 
								
							
								 
							
						 
						
							
							
								
								Renamed the folders containing the formulas to lowercase to adhere to the naming conventions and Started with testing.  
							
							
 
							
							
							-Tests for BoundAction done
Former-commit-id: d5698d3d53 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a815a6f425 
								
							
								 
							
						 
						
							
							
								
								Implemented allSat with z3 and test  
							
							
 
							
							
							Former-commit-id: 3795fc00c2 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								93c03fff3f 
								
							
								 
							
						 
						
							
							
								
								Fixed order of checks in Z3ExpressionAdapter, fixed missing override of isVariable in VariableExpression, removed unnecessary exception in Z3SmtSolver model generation  
							
							
 
							
							
							Former-commit-id: ca5f876655 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								caf96c04e0 
								
							
								 
							
						 
						
							
							
								
								Extended DD interface by methods to generate explicit row-grouped matrices from DDs.  
							
							
 
							
							
							Former-commit-id: 1945d7be6d 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								8587f68eb1 
								
							
								 
							
						 
						
							
							
								
								Fixed toMatrix conversion using ODDs. The next step is to generate non-deterministic matrices, i.e., matrices with row groups.  
							
							
 
							
							
							Former-commit-id: e4a9c5f0ed 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								236e7fa290 
								
							
								 
							
						 
						
							
							
								
								Another step towards generating explicit data structures from DDs using ODDs.  
							
							
 
							
							
							Former-commit-id: 5b7e3e8680 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f12ff82baf 
								
							
								 
							
						 
						
							
							
								
								Added getNodeCount for ODD and fixed a bug concerning boolean meta variables.  
							
							
 
							
							
							Former-commit-id: 79eb69226b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5d53c6efa5 
								
							
								 
							
						 
						
							
							
								
								Added ODD-concept to easily convert between DD-based and explicit formats.  
							
							
 
							
							
							Former-commit-id: f2a2a002b7 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								72cc5f2188 
								
							
								 
							
						 
						
							
							
								
								Added 'power' as a binary operator in expression classes and expression grammar.  
							
							
 
							
							
							Former-commit-id: c58321709e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								03399375f8 
								
							
								 
							
						 
						
							
							
								
								Fixed an unintended 32bit shift being expanded to 64 bit  
							
							
 
							
							
							Former-commit-id: b2adc2a5ba 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								7b2def2b11 
								
							
								 
							
						 
						
							
							
								
								Added function to retrieve the minterms of a DD as an expression and added corresponding test.  
							
							
 
							
							
							Former-commit-id: afaf1f02a3 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								60b2145461 
								
							
								 
							
						 
						
							
							
								
								Added function to DD interface that creates a nested if-then-else expression that represents the very same function as the DD. Added a test for this functionality. Added some methods offereded by Cudd to simplify DDs.  
							
							
 
							
							
							Former-commit-id: 4fc816f64b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								3271e73f01 
								
							
								 
							
						 
						
							
							
								
								Fixed the last test. All tests green now (well, except the ones that need gurobi, which I don't have).  
							
							
 
							
							
							Former-commit-id: 7636a2a6ab 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9a28e5b580 
								
							
								 
							
						 
						
							
							
								
								Added proper formula string method to filters.  
							
							
 
							
							
							- Lots of debugging
- Changed the way the filter keeps information about the scheduler to use for probability/reward queries.
| This was done by keeping a special action at the first position of the action list.
| Which was not exactly consistent with the idea behind the filter actions.
| Now the filter keeps this information as an enum value in a member variable.
- All but one tests are green. So we almost reestablished full functionality.
|- The last test that still fails is SparseMdpPrctlModelCheckerTest.Dice where the second to last model check returns the wrong result.
Next up: Debug. Then introduce the full range of filter actions.
Former-commit-id: fd311966cc 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a0319cb6e7 
								
							
								 
							
						 
						
							
							
								
								Model Generation and Tests for translating from z3 to storm  
							
							
 
							
							
							translating from z3 to storm has still some errors
Former-commit-id: 2a46b6c615 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								79984db3ee 
								
							
								 
							
						 
						
							
							
								
								Added test for checkWithAssumptions  
							
							
 
							
							
							Former-commit-id: 4f64100ec5 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9a7b4f69ef 
								
							
								 
							
						 
						
							
							
								
								More tests and some small bugfixes for Z3SmtSolver  
							
							
 
							
							
							Former-commit-id: 71def90649 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								45bc8ea665 
								
							
								 
							
						 
						
							
							
								
								Conditional compilation for all parts using z3 by checking STORM_HAVE_Z3  
							
							
 
							
							
							Added first simple tests for Z3SmtSolver and Z3ExpressionAdapter
Former-commit-id: 77ade5ffa6 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4bf0299279 
								
							
								 
							
						 
						
							
							
								
								Changed the Prctl/Csl formula parsers to be static classes.  
							
							
 
							
							
							- Also fixed up control flow and some tests for new interfaces.
|-> It now compiles again.
Next up: More functionallity in the filter.
Former-commit-id: 21d43e75c4 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								45486600f7 
								
							
								 
							
						 
						
							
							
								
								Made parts of the interface of the DdManager protected (because they shouldn't be accessible from the outside world).  
							
							
 
							
							
							Former-commit-id: bf52a653b8 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								29d8111991 
								
							
								 
							
						 
						
							
							
								
								Adapted Gurobi and glpk LP solvers to expression-based interface. Adapted tests and made them work again.  
							
							
 
							
							
							Former-commit-id: 62379ddafd 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								389fddc996 
								
							
								 
							
						 
						
							
							
								
								Added some more methods to valuations. Changed visitor invocation slightly. Moves ExpressionReturnType in separate file. Finished linearity checking visitor. Started on visitor that extracts coefficients of linear expressions.  
							
							
 
							
							
							Former-commit-id: 6e3d0ec910 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								57a8381f91 
								
							
								 
							
						 
						
							
							
								
								If requested, the DD iterator can now skip meta variables which are 'don't cares' for the function value.  
							
							
 
							
							
							Former-commit-id: 061cb5f0fa 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								db232fe39b 
								
							
								 
							
						 
						
							
							
								
								Moved from pair to MatrixEntry as the basic building block of the matrix. Now matrix elements can be accessed in a more readable way.  
							
							
 
							
							
							Former-commit-id: f6514eb0cd 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								92ee6187fa 
								
							
								 
							
						 
						
							
							
								
								Added more query methods to expressions. SparseMatrix now keeps track of non zero entries and models show correct number of transitions by referring to nonzero entries rather than all entries in the matrix.  
							
							
 
							
							
							Former-commit-id: 48180be2fe 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c6976dd8b5 
								
							
								 
							
						 
						
							
							
								
								Added some query methods for new expression classes.  
							
							
 
							
							
							Former-commit-id: 0633c7740e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								82836f1ad1 
								
							
								 
							
						 
						
							
							
								
								Added some checks for validity of identifiers in PRISM programs. Added some illegal tests to test suite.  
							
							
 
							
							
							Former-commit-id: fc44db75a7 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								8d3ed7d2fa 
								
							
								 
							
						 
						
							
							
								
								Added min/max functions on DDs. Added tests for them and ite operation.  
							
							
 
							
							
							Former-commit-id: 8e6df90a38 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								39ec9401ef 
								
							
								 
							
						 
						
							
							
								
								Fixed the PrismParser so the exact format of PRISMs boolean expressions can now be parsed.  
							
							
 
							
							
							Former-commit-id: bb08ec1646 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6078e07476 
								
							
								 
							
						 
						
							
							
								
								First version of DD iterator; small test included.  
							
							
 
							
							
							Former-commit-id: 2ec2323886 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								311247ff0c 
								
							
								 
							
						 
						
							
							
								
								Added support for Xor in expression classes and added parsing functionality for Xor, Implies and Iff.  
							
							
 
							
							
							Former-commit-id: 16e023cf26 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								61d4bb956c 
								
							
								 
							
						 
						
							
							
								
								Added functionality to compare two ADDs up to a given precision. Added logical operator overloads to DD interface. Added tests for all new features.  
							
							
 
							
							
							Former-commit-id: 738ad49d62 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5a4730ae22 
								
							
								 
							
						 
						
							
							
								
								When exporting DDs to the dot format, edges leading to the zero node are now suppressed. Also, nodes in the dot file are now labeled with variable names (+ the number of the bit).  
							
							
 
							
							
							Former-commit-id: 410d61d333 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								94b25c02ca 
								
							
								 
							
						 
						
							
							
								
								Fixed bugs in some files.  
							
							
 
							
							
							Made LTL a little better to compile under WIN32.
Former-commit-id: 71377f0672 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								dc8921037e 
								
							
								 
							
						 
						
							
							
								
								Added missing test inputs.  
							
							
 
							
							
							Former-commit-id: 537971f365 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								164c8225fd 
								
							
								 
							
						 
						
							
							
								
								Fixed some minor issues.  
							
							
 
							
							
							Former-commit-id: 80f0ae4c9c 
							
						 
						12 years ago