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  
				
					
						
							
							
								 
						
							
							
							
								
							
								758fac5389 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into SmtSolvers  
							
							
 
							
							
							Former-commit-id: 57915f3aa9 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								df5bafc38b 
								
							
								 
							
						 
						
							
							
								
								Finished the implementation of the Cls and Ltl filters.  
							
							
 
							
							
							-Mostly copy and paste from the prctl version with some individual changes.
Next up: Testing.
Former-commit-id: 19a4f90255 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a5e28fcf04 
								
							
								 
							
						 
						
							
							
								
								Added some filter actions.  
							
							
 
							
							
							- Also major cleanup of the filter.
- Implementation clompleted for pctl.
Next up: Wrap up the Csl and Ltl filter and then testing.
Former-commit-id: 8189f8462c 
							
						 
						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  
				
					
						
							
							
								 
						
							
							
							
								
							
								084bb14acd 
								
							
								 
							
						 
						
							
							
								
								Bugfix for expression parser.  
							
							
 
							
							
							Former-commit-id: 2b03856c86 
							
						 
						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  
				
					
						
							
							
								 
						
							
							
							
								
							
								dd73387ed1 
								
							
								 
							
						 
						
							
							
								
								Add missing case.  
							
							
 
							
							
							Former-commit-id: b30aa3bc0d 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								72cc5f2188 
								
							
								 
							
						 
						
							
							
								
								Added 'power' as a binary operator in expression classes and expression grammar.  
							
							
 
							
							
							Former-commit-id: c58321709e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								478f5ee38c 
								
							
								 
							
						 
						
							
							
								
								Started separating expression parsing from PRISM model parsing.  
							
							
 
							
							
							Former-commit-id: 84d1354f97 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								28eed65a0d 
								
							
								 
							
						 
						
							
							
								
								Fixed a reference to a non-existant option.  
							
							
 
							
							
							Former-commit-id: 02020513cc 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5503e91bb3 
								
							
								 
							
						 
						
							
							
								
								Added detailed time measurement using std::chrono, leading to more useful information for comparison against Prism, etc.  
							
							
 
							
							
							Former-commit-id: 98e3e8e097 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								7ab2a84c0f 
								
							
								 
							
						 
						
							
							
								
								Small beauty fixes to the Cudd Interface  
							
							
 
							
							
							Former-commit-id: 631d5a20bd 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								03399375f8 
								
							
								 
							
						 
						
							
							
								
								Fixed an unintended 32bit shift being expanded to 64 bit  
							
							
 
							
							
							Former-commit-id: b2adc2a5ba 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b5cb0cde1d 
								
							
								 
							
						 
						
							
							
								
								Fixed a typo in the StormOptions.cpp  
							
							
 
							
							
							Former-commit-id: a23d47d112 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b7ad4398e2 
								
							
								 
							
						 
						
							
							
								
								Fixed an error in the interface of the LpSolvers.  
							
							
 
							
							
							Former-commit-id: 65e415efb2 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9a7c24372e 
								
							
								 
							
						 
						
							
							
								
								Added crude version of 'dump to explicit format' for Dtmcs.  
							
							
 
							
							
							Former-commit-id: bbe6195046 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								63f55b38f0 
								
							
								 
							
						 
						
							
							
								
								Removed debug output that was - of course - never there. (You saw nothing!)  
							
							
 
							
							
							Former-commit-id: 9249928f54 
							
						 
						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  
				
					
						
							
							
								 
						
							
							
							
								
							
								e79fa50999 
								
							
								 
							
						 
						
							
							
								
								Changed naming of DD variables belonging to one meta variable slightly: only integer-valued meta variables now get a '.i' suffix to denote their i-th bit.  
							
							
 
							
							
							Former-commit-id: 771312ac31 
							
						 
						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  
				
					
						
							
							
								 
						
							
							
							
								
							
								1513241985 
								
							
								 
							
						 
						
							
							
								
								Added functions for more efficiently retrieving the DD for 'greater than constant', 'greater or equal than constant' and 'notZero'.  
							
							
 
							
							
							Former-commit-id: 9d80c29f27 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b1f22c1747 
								
							
								 
							
						 
						
							
							
								
								Added shortcut DD interface to compute \'greaterZero\' on a DD.  
							
							
 
							
							
							Former-commit-id: 65585533fd 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9e506f40bc 
								
							
								 
							
						 
						
							
							
								
								Some fixes for MSVC. :P  
							
							
 
							
							
							Former-commit-id: 1429e54f73 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								50eb16f9f9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into SmtSolvers  
							
							
 
							
							
							Former-commit-id: 20effdeffe 
							
						 
						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  
				
					
						
							
							
								 
						
							
							
							
								
							
								185c2197cb 
								
							
								 
							
						 
						
							
							
								
								Fixed up the CslParser.  
							
							
 
							
							
							Next Up: Making the parsers static classes.
Former-commit-id: 247a105078 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b45b52a097 
								
							
								 
							
						 
						
							
							
								
								Added the class AbstractRewardPathFormula to the PRCTL formula tree.  
							
							
 
							
							
							- This change splits the path formulas into probabilistic path formulas like Next or Until and reward path formulas like InstantaneousReward or SteadyStateReward.
|- That way it is assured at compile time that no reward path formula can ever be subformula of any probabilistic bound operator and vise versa.
Next up: Adopt changes in the Csl formula tree to the Csl parser.
Former-commit-id: d74c88bbf8 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								cf6623c68c 
								
							
								 
							
						 
						
							
							
								
								Intruduced legacy support.  
							
							
 
							
							
							- Every PRCTL formula that worked before works now and behaves in the same way. One exception:
|- Formulas of the type Pmin<0.5[Phi] and Rmin<0.5[Psi] result in a parsing error, as the comparison operator already implies the scheduler to be used.
|  Also, the modelchecker now actually uses the comparison operator in order to choose the correct scheduler for MDPs.
Former-commit-id: d942d18e7e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6a2d75d68d 
								
							
								 
							
						 
						
							
							
								
								Some changes in anticipation of integrating MEDDLY.  
							
							
 
							
							
							Former-commit-id: 0f7a71ec9b 
							
						 
						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  
				
					
						
							
							
								 
						
							
							
							
								
							
								37ef3feebb 
								
							
								 
							
						 
						
							
							
								
								Fixed return type of addBinaryVariable  
							
							
 
							
							
							Former-commit-id: 44fc99b9a3 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4e6c9b7d6b 
								
							
								 
							
						 
						
							
							
								
								Implemented translating z3 expressions to storm expressions  
							
							
 
							
							
							Former-commit-id: 945ce77e35 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								66d6fa3bb4 
								
							
								 
							
						 
						
							
							
								
								Fixed wrong type.  
							
							
 
							
							
							Former-commit-id: 59e08c3669 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c3a71d5915 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into SmtSolvers  
							
							
 
							
							
							Conflicts:
	src/storage/expressions/Expression.cpp
Former-commit-id: 151d48f807 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								686618e6e2 
								
							
								 
							
						 
						
							
							
								
								Added missing header to (hopefully) fix MSVC problems.  
							
							
 
							
							
							Former-commit-id: 0247ce1e35 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9e746549a8 
								
							
								 
							
						 
						
							
							
								
								Fully adapted MILP-based counterexample generator to new LP solver interface.  
							
							
 
							
							
							Former-commit-id: 83f3b8c507 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								db4721ce3a 
								
							
								 
							
						 
						
							
							
								
								Started adapting MILP-based counterexample generator to new LP solver interface.  
							
							
 
							
							
							Former-commit-id: b571d744db 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d80586b4aa 
								
							
								 
							
						 
						
							
							
								
								Adapted MA model checker to new LP solver interface (LRA computation).  
							
							
 
							
							
							Former-commit-id: b23b72c851 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ccbfef288d 
								
							
								 
							
						 
						
							
							
								
								removed some debug output  
							
							
 
							
							
							Former-commit-id: 0b99218276 
							
						 
						12 years ago