ece4085a61 
								
							
								 
							
						 
						
							
							
								
								Another bugfix for matrix creation during LRA computation.  
							
							
 
							
							
							Former-commit-id: c3325b8913 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								fde78ad759 
								
							
								 
							
						 
						
							
							
								
								Bugfix for matrix creation in LRA computation.  
							
							
 
							
							
							Former-commit-id: cb4c9cb728 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b3601782a9 
								
							
								 
							
						 
						
							
							
								
								Added Lp Solver class for glpk and added it as an option in CMakeLists.txt.  
							
							
 
							
							
							Former-commit-id: e5c5215a29 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								0a89d65f93 
								
							
								 
							
						 
						
							
							
								
								Started refactoring Markov automaton model checker.  
							
							
 
							
							
							Former-commit-id: c4278de4f0 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								18711c01a3 
								
							
								 
							
						 
						
							
							
								
								First working version of time-bounded reachability for Markov automata.  
							
							
 
							
							
							Former-commit-id: 6501cbfca4 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2ef0405104 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into imca  
							
							
 
							
							
							Conflicts:
	src/storage/SparseMatrix.h
Former-commit-id: 7e28105e8b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								dce43d78e7 
								
							
								 
							
						 
						
							
							
								
								Started implementation of time-bounded reachability of Markov automata.  
							
							
 
							
							
							Former-commit-id: 512bb117a6 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								175e852956 
								
							
								 
							
						 
						
							
							
								
								Resolved problems resulting from merge.  
							
							
 
							
							
							- gcc 4.8 (and assorted libraries) does not provide an erase(const_iterator) method for std::list but only an erase(iterator).
  This is in compliance with the c++11 draft N3337, which specifies the change from iterator to const_iterator only for "set, multiset, map [and] multimap" but not list.
  Therefore the constant list iterators were replaced by non constant iterators in MaximalEndComponentDecomposition and Vector set.
  The locations are marked with a FIXME, such that the const_iterator can be replaced back when gcc provides it.
- Fixed (completed) the stub implementation for the GurobiLpSolver in case that Gurobi is not present.
|-> Would not compile before due to missing functions and incorrect signatures.
- Switched to c++11 for gcc. Since gcc 4.8 provides full compliance to the c++11 standard.
|-> Initially hoped that it would fix the const_iterator problem, but it did not.
- Fixed the cmake warning concerning a missing whitespace between tokens in the last line of CMakeLists.txt.
Former-commit-id: f90768375e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								eeb7a21cf9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'reduceCompiletime'  
							
							
 
							
							
							Conflicts:
	src/counterexamples/MILPMinimalLabelSetGenerator.h
	src/models/AbstractModel.h
	src/storage/SparseMatrix.h
	src/storm.cpp
Former-commit-id: 4c3dd2751a 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								281140c8ff 
								
							
								 
							
						 
						
							
							
								
								Sketched algorith outline for time-bounded reachability for Markov automata.  
							
							
 
							
							
							Former-commit-id: 51edb423d3 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								dabfb5e1dd 
								
							
								 
							
						 
						
							
							
								
								First working version of LRA computation for Markov automata.  
							
							
 
							
							
							Former-commit-id: d6c6870fd8 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								339b598694 
								
							
								 
							
						 
						
							
							
								
								Enabled computation of LRA for individual maximal end components. It remains to compute the overall LRA value using the values for the individual MECs.  
							
							
 
							
							
							Former-commit-id: 47eb90e62c 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								45f137face 
								
							
								 
							
						 
						
							
							
								
								Prepared stub for Long-Run Average computation for Markov automata.  
							
							
 
							
							
							Former-commit-id: fef601a81d 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								775382fa91 
								
							
								 
							
						 
						
							
							
								
								Added option to encode reachability of a target state for SAT-based minimal command counterexample generation. Fixed bug in vector-based set.  
							
							
 
							
							
							Former-commit-id: 7c2ea76902 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ad0bba6223 
								
							
								 
							
						 
						
							
							
								
								Started work on including reachability encoding in SAT-based counterexample generator.  
							
							
 
							
							
							Former-commit-id: 739b8850f0 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ea7f48cff6 
								
							
								 
							
						 
						
							
							
								
								Introduced solver header in utility to return standard solvers when requested.  
							
							
 
							
							
							Former-commit-id: 66bba17785 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a229b9b322 
								
							
								 
							
						 
						
							
							
								
								Refactored MILP-based command generator to use a general LpSolver interface, so other LP solvers may be used when needed.  
							
							
 
							
							
							Former-commit-id: 203ad6a499 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9f7a0f1354 
								
							
								 
							
						 
						
							
							
								
								Started abstracting LP solvers into a common interface. This way, we have more freedom to target different LP solvers easily and can avoid licensing problems.  
							
							
 
							
							
							Former-commit-id: badba812a1 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								101c39f365 
								
							
								 
							
						 
						
							
							
								
								Added correct detection of states that possess infinite exptected time to reach a given goal set.  
							
							
 
							
							
							Former-commit-id: 4bc605d89d 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								daea775263 
								
							
								 
							
						 
						
							
							
								
								Now rates get correctly transformed to probabilities + exit rates for Markov automata.  
							
							
 
							
							
							Former-commit-id: bf5ccfa813 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f1a9b1e602 
								
							
								 
							
						 
						
							
							
								
								First version of minimum expected time for Markov automata.  
							
							
 
							
							
							Former-commit-id: 6053be896e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2cbdf56267 
								
							
								 
							
						 
						
							
							
								
								Fixed some bugs in bit vector and vector set that prevented the MEC decomposition from functioning correctly.  
							
							
 
							
							
							Former-commit-id: 51b6d7eb18 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								bfb416687f 
								
							
								 
							
						 
						
							
							
								
								Bugfix for Markov automaton parser. Number of choices now gets computed correctly in the presence of deadlock states.  
							
							
 
							
							
							Former-commit-id: afd996d4a3 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e885603d92 
								
							
								 
							
						 
						
							
							
								
								Added new Markov automaton example.  
							
							
 
							
							
							Former-commit-id: abeb0259e4 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f35ac73547 
								
							
								 
							
						 
						
							
							
								
								Splitted VectorSet in header/source file which caused certain minor changes in its interface. Fixed some issues in the Markov automaton parser and made it substantially faster by dropping sscanf. This however introduces other limitations that need to be addressed in the future.  
							
							
 
							
							
							Former-commit-id: 44eb4aabc9 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5a9d778a23 
								
							
								 
							
						 
						
							
							
								
								First version of MEC decomposition for nondeterministic models.  
							
							
 
							
							
							Former-commit-id: 45f67b2a16 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b9130180ee 
								
							
								 
							
						 
						
							
							
								
								Rough sketch of MEC decomposition.  
							
							
 
							
							
							Former-commit-id: 027b58d380 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f287b7e760 
								
							
								 
							
						 
						
							
							
								
								Further steps towards implementation of MEC decomposition.  
							
							
 
							
							
							Former-commit-id: 8166b3b923 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								84f6bf7104 
								
							
								 
							
						 
						
							
							
								
								Added a getBackwardsTransitions() to AbstractNondeterministicModel, since simple transposition does not yield correct results and for the computation of the backwards transitions the nondeterministic choice indices must be known.  
							
							
 
							
							
							|-> Ran the tests: all green.
Former-commit-id: be0d9de95a 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								bd367f89c7 
								
							
								 
							
						 
						
							
							
								
								Enabled model checking of PCTL properties for symbolic models.  
							
							
 
							
							
							Former-commit-id: a8e2fc6a92 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								170306e46d 
								
							
								 
							
						 
						
							
							
								
								Moved SparseMatrix transposition function from AbstractModel (named: getBackwardsTransitions) to SparseMatrix (named: transpose) where it belongs.  
							
							
 
							
							
							- Fixed one problem marked FIXME in the transpose function. The need for a "sentinel" element was created by an off by one in the prior loop.
- Changed all occurences of SparseMatrix<bool> to SparseMatrix<T>. Now the only two types for which SparseMatrix is instantiated are double and int.
- Compiles again.
|-> Compile time seems to be roughly the same for clean; make all. For incremental builds I haven't tested yet.
Former-commit-id: 6d829e0903 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c30d6d307e 
								
							
								 
							
						 
						
							
							
								
								Figured out how to explicitly instantiate templates.  
							
							
 
							
							
							But got bitten by std::vector<bool> as it is specialized and uses bitsets (i.e. integers) internally.
Less memory but at the cost of 'oh, sorry std::vector<bool> does not return a bool&'.
That again seems to be a problem for the SparseMatrix<bool> instatiation since for instance getValue returns a T&.
On the one hand I don't quite know why this was never an issue before and on the other hand it prevents successful compilation.
So there are different ways to settle this:
- Specialize SparseMatix for bool -> possibly lots of code, but might be the best solution
- Write a wrapper for std::vector that uses chars instead of booleans
- Dont't use SparseMatrix<bool>
Next up: Figure out the best solution for this and implement it.
Former-commit-id: 83b9cfd06e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								eca717759a 
								
							
								 
							
						 
						
							
							
								
								Added functionality to apply a scheduler to a Markov automaton.  
							
							
 
							
							
							Former-commit-id: 2121c61b09 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c5ff387b98 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into imca  
							
							
 
							
							
							Conflicts:
	src/models/AbstractModel.h
Former-commit-id: f94c912331 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e31c3bfb17 
								
							
								 
							
						 
						
							
							
								
								Added an important comment.  
							
							
 
							
							
							Former-commit-id: 79d8280d83 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								360b506afe 
								
							
								 
							
						 
						
							
							
								
								Sparse MDP model checker now correctly computes (memoryless) schedulers for Until and Reachability Reward formulas.  
							
							
 
							
							
							Former-commit-id: c756093fd4 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9e941e6b4a 
								
							
								 
							
						 
						
							
							
								
								Added scheduler classes. Added method to model classes that applies a scheduler.  
							
							
 
							
							
							Former-commit-id: 73a4be11b2 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								09f192b40f 
								
							
								 
							
						 
						
							
							
								
								Refactored SCC-Decomposition design as a preparation step for computing maximal end components of Markov automata.  
							
							
 
							
							
							Former-commit-id: 4596ba71ec 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1c594d02f5 
								
							
								 
							
						 
						
							
							
								
								Added check in Markov automaton parser to ensure the Markovian choice is the first one for each state. This way only the Markovian states need to be stored and by convention their first choice is the Markovian one.  
							
							
 
							
							
							Former-commit-id: 0cca1bb2c7 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								66f15efbc6 
								
							
								 
							
						 
						
							
							
								
								Fixed memory bug in Markov automaton parser.  
							
							
 
							
							
							Former-commit-id: 444b834b91 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d725a3f898 
								
							
								 
							
						 
						
							
							
								
								Removed bit vector for storing markovian choices of MA. From now on, the first choice of a hybrid/Markovian state is the Markovian one.  
							
							
 
							
							
							Former-commit-id: 6b646597dc 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9e66447eb2 
								
							
								 
							
						 
						
							
							
								
								Add "lib" prefix for z3 only on Windows  
							
							
 
							
							
							Former-commit-id: bdfa503070 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								cebda374d1 
								
							
								 
							
						 
						
							
							
								
								Further step towards Markov automata parser.  
							
							
 
							
							
							Former-commit-id: 33e4634743 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c02f4e2adc 
								
							
								 
							
						 
						
							
							
								
								Markov Automata transitions can now be parsed. Next up: a parser that combines transition and label parsing for Markov automata.  
							
							
 
							
							
							Former-commit-id: 77db051f1f 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								873373eb4e 
								
							
								 
							
						 
						
							
							
								
								Further work on explicit MarkovAutomaton parser.  
							
							
 
							
							
							Former-commit-id: 19fbff695b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								77cabe1948 
								
							
								 
							
						 
						
							
							
								
								Started implementing a parser for an explicit format for Markov automata. This commit breaks things, so don't pull if you want to have a running version of this branch.  
							
							
 
							
							
							Former-commit-id: 8a9e9d0c2d 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4fcd4c5961 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/master'  
							
							
 
							
							
							Former-commit-id: ed6cbfed23 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								7c0dd5eaf5 
								
							
								 
							
						 
						
							
							
								
								Fixed build errors on Windows  
							
							
 
							
							
							Former-commit-id: 10929f075d 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								bc94f69c0b 
								
							
								 
							
						 
						
							
							
								
								Resolved some ambiguities that produced problems under Linux. Added option USE_LIBCXX to CMakeLists.txt to also use libc++ under Linux.  
							
							
 
							
							
							Former-commit-id: 2e06d7adf6 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4550422fac 
								
							
								 
							
						 
						
							
							
								
								Added formula support for PRISM models. ExplicitModelAdapter now properly checks for out-of-bound values for integer variables.  
							
							
 
							
							
							Former-commit-id: 86439306b9 
							
						 
						12 years ago