77e2693ccc 
								
							
								 
							
						 
						
							
							
								
								Further work on SCC-based mc.  
							
							
 
							
							
							Former-commit-id: 4e5c1fb188 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								86fb5a3c49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://sselab.de/lab9/private/git/storm  
							
							
 
							
							
							Former-commit-id: 62eaafecda 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								8f4653c98d 
								
							
								 
							
						 
						
							
							
								
								Some format changes in the formula and action classes.  
							
							
 
							
							
							- Indented the namespaces.
- Removed the file headers.
- Also added a free function overloading the stream output operator << for formula and filter classes.
|- Had to be a free function as the standard lib cannot be modified.
Former-commit-id: 59f21ecf3d 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1cc930f0e4 
								
							
								 
							
						 
						
							
							
								
								Added proper source grouping for properties directory. Fixed one performance tests. Started on SCC-based reachability model checker.  
							
							
 
							
							
							Former-commit-id: e48c163783 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6dd69cca3c 
								
							
								 
							
						 
						
							
							
								
								Added interpolation methods to smt-solver interface.  
							
							
 
							
							
							Former-commit-id: a9b19cd0aa 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a0a8bf704a 
								
							
								 
							
						 
						
							
							
								
								Fixed some minor issues in the sparse matrix.  
							
							
 
							
							
							Former-commit-id: c7690b5a13 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2757dd31e2 
								
							
								 
							
						 
						
							
							
								
								Removed illegal typename keywords in SparseMatrix.cpp.  
							
							
 
							
							
							Refactored the constexpr in the AutoParser.
@CDehnert : SparseMatrix Lines 59 to 65 - that cant be right.
Former-commit-id: 21c458604c 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ed3df5f155 
								
							
								 
							
						 
						
							
							
								
								Last push :)  
							
							
 
							
							
							Former-commit-id: 72c4b69cb2 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								552b3eaab7 
								
							
								 
							
						 
						
							
							
								
								Fixed SCC performance tests.  
							
							
 
							
							
							Former-commit-id: a6b46e2fc5 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								59dbc5a71e 
								
							
								 
							
						 
						
							
							
								
								Fixed tests to comply with new requirement for hint in tra-file (needs to be at the very beginning, no prior white spaces).  
							
							
 
							
							
							Former-commit-id: 60bfb720b8 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e02c8659fe 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://sselab.de/lab9/private/git/storm  
							
							
 
							
							
							Former-commit-id: 19edf14143 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								418ce8b625 
								
							
								 
							
						 
						
							
							
								
								Fixed some problems related to the memory-mapped file.  
							
							
 
							
							
							Former-commit-id: 68225d8006 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								11696fc468 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
 
							
							
							Former-commit-id: 949e48d4c1 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e0f9bd7865 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'refactorMainCpp'  
							
							
 
							
							
							Former-commit-id: 21cdb65d5e 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2ce2156c7a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://sselab.de/lab9/private/git/storm  
							
							
 
							
							
							Former-commit-id: 3cbc9f3c2c 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								daca9d5294 
								
							
								 
							
						 
						
							
							
								
								refactored main.cpp  
							
							
 
							
							
							Former-commit-id: a0648b4e1f 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b3810dc75b 
								
							
								 
							
						 
						
							
							
								
								factored out code parts from storm.cpp  
							
							
 
							
							
							Former-commit-id: 91cd8e52ad 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2c231a794d 
								
							
								 
							
						 
						
							
							
								
								SCC decomposition now correctly ignores zero-entries in the matrix.  
							
							
 
							
							
							Former-commit-id: 351c0ac6ad 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								915c106573 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into parametricSystems  
							
							
 
							
							
							Former-commit-id: 9292feb153 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6fde42850d 
								
							
								 
							
						 
						
							
							
								
								fix for gcc 4.9  
							
							
 
							
							
							Former-commit-id: d6f8d87a63 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9da54842b7 
								
							
								 
							
						 
						
							
							
								
								remove stray symbol  
							
							
 
							
							
							Former-commit-id: a6c18ae7f9 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								fff4e61fc3 
								
							
								 
							
						 
						
							
							
								
								Changed interface of matrix builder slightly to be able to also not force the resulting matrix to certain dimensions, but merely to reserve the desired space.  
							
							
 
							
							
							Former-commit-id: e36d05398e 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f767cfe844 
								
							
								 
							
						 
						
							
							
								
								Started to modify the matrix builder to be a bit smarter about preallocation.  
							
							
 
							
							
							Former-commit-id: 50be5c8af1 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								05b8b942fb 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
 
							
							
							Former-commit-id: ece5742b5c 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ac420f13d0 
								
							
								 
							
						 
						
							
							
								
								Fixed some warnings in various places.  
							
							
 
							
							
							Former-commit-id: fbfbfc2bcb 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								72af8c7246 
								
							
								 
							
						 
						
							
							
								
								Added missing (but implicitly declared) template instance.  
							
							
 
							
							
							Former-commit-id: 23a897d83e 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ab58103555 
								
							
								 
							
						 
						
							
							
								
								Started to pimp matrix. First step: added proper methods setColumn/setValue that operate on a matrix entry and removed the non-const versions of getColumn/getValue. Added a typedef for the index type in the matrix so that it becomes possible to have matrices with a different index type (e.g. 32-bit values).  
							
							
 
							
							
							Former-commit-id: 3cc0fdf9ee 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								0d9ccde6af 
								
							
								 
							
						 
						
							
							
								
								merge with master  
							
							
 
							
							
							Former-commit-id: c30c43252e 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								01cefbb2c0 
								
							
								 
							
						 
						
							
							
								
								Modified the multiplication of a sparse matrix with a dense vector to only use the parallel version if available and the number of nonzero entries exceeds a certain threshold.  
							
							
 
							
							
							Former-commit-id: 07957b2d29 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								21eb9cb898 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into philippTopologicalRevival  
							
							
 
							
							
							Conflicts:
	src/storage/StronglyConnectedComponentDecomposition.cpp
	src/storage/StronglyConnectedComponentDecomposition.h
Former-commit-id: 5528f9dbe8 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c8e05f7137 
								
							
								 
							
						 
						
							
							
								
								Added explicit template instance.  
							
							
 
							
							
							Former-commit-id: 1ffcf0e47f 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d40573640f 
								
							
								 
							
						 
						
							
							
								
								Dropped our current Tarjan-implementation in favour of the path-based algorithm by Gabow (and others) as this seems to perform a lot better (at when comparing our implementations).  
							
							
 
							
							
							Former-commit-id: 5cfeb85193 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								0c305825f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into philippTopologicalRevival  
							
							
 
							
							
							Conflicts:
	src/counterexamples/PathBasedSubsystemGenerator.h
Former-commit-id: 106eed626b 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								59ca5fcdba 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into philippTopologicalRevival  
							
							
 
							
							
							Conflicts:
	src/counterexamples/PathBasedSubsystemGenerator.h
	src/storm.cpp
Former-commit-id: 338637dcd6 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								493f93a94b 
								
							
								 
							
						 
						
							
							
								
								Added __restrict__ keyword to CUDA kernel. This should enhance compiler optimization.  
							
							
 
							
							
							Refactored TopologicalValueIterationNondeterministicLinearEquationSolver to support "down-casting" to float.
Added better timing output.
Former-commit-id: 688c40decb 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4f25312a6b 
								
							
								 
							
						 
						
							
							
								
								Adapted SMT-based counterexample generator such that it works with the new property classes.  
							
							
 
							
							
							Former-commit-id: 359a4c706f 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								7f7ddc06e1 
								
							
								 
							
						 
						
							
							
								
								Removed two erronous keywords.  
							
							
 
							
							
							Former-commit-id: ecc36e0b07 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5a0059d110 
								
							
								 
							
						 
						
							
							
								
								Commented out the SMTMinimalCommandSetGeneraator, again.  
							
							
 
							
							
							Former-commit-id: 4e0427caaf 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4f5b0b5949 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'refactorFormulas'  
							
							
 
							
							
							Conflicts:
	src/counterexamples/SMTMinimalCommandSetGenerator.h
	src/storm.cpp
Former-commit-id: f65836b10d 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								52cfe9f02d 
								
							
								 
							
						 
						
							
							
								
								Fixed some compile errors.  
							
							
 
							
							
							- Added a missing inlude (boost/functional/hash.hpp) to SparseMatrix.h. I don't know how this could have been compiled without.
- Changed a return type in the stub section of the GurobiLpSolver to void. Not correctly overwrites the base class function.
- Went through the change history of the SparseMarkovAutomatonCslModelchecker.h to correctly integrate all changes made in this branch with the changes of the other branches.
Former-commit-id: 43ce12274b 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b84ef7bebc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into refactorFormulas  
							
							
 
							
							
							Conflicts:
	src/counterexamples/MILPMinimalLabelSetGenerator.h
	src/counterexamples/PathBasedSubsystemGenerator.h
	src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
	src/parser/PrctlParser.cpp
	src/storm.cpp
	test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
	test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
All conflicts resoved. Revision of src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h pending.
Former-commit-id: 6bf9d05dba 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d75e32b83e 
								
							
								 
							
						 
						
							
							
								
								Renames the folder formula to properties and the namespace property to properties.  
							
							
 
							
							
							Former-commit-id: 236ed22c7d 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6b2b1e4d7b 
								
							
								 
							
						 
						
							
							
								
								Finished the documentation of the formulas.  
							
							
 
							
							
							- Also removed one superflous class (IOptimizingOperator).
- Killed all warnings concerning missing virtual destructor in the interfaced for the modelchecker.
- A whole lot of little things I can't quite remember.
Next up: Remerge
Former-commit-id: 28fedd036c 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								71320239f1 
								
							
								 
							
						 
						
							
							
								
								Some debug output.  
							
							
 
							
							
							Former-commit-id: dd0a60f099 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ea427fcde1 
								
							
								 
							
						 
						
							
							
								
								Fixed include directories for CUDA Plugin in CMakeLists.txt  
							
							
 
							
							
							Refactored all code related to the SPMV kernels to work with float.
Wrote a test that determines whether the compiler uses 64bit boundary alignments on std::pairs of uint64 and float.
Introduced functions that allow for conversions between different ValueTypes (e.g. from float to double and backwards).
Former-commit-id: 830d24064f 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								cbf1301e47 
								
							
								 
							
						 
						
							
							
								
								Small bugfix.  
							
							
 
							
							
							Former-commit-id: 11d4a2474a 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								7f15f358c1 
								
							
								 
							
						 
						
							
							
								
								Removed the FormulaCheckers.  
							
							
 
							
							
							Former-commit-id: 24910974c6 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								532b0cf3ad 
								
							
								 
							
						 
						
							
							
								
								Added function to test if a formula is a probability bounded reachability formula, i.e. conforms to the pattern P[<,<=,>,>=]p ([phi U, E] psi) where phi, psi are propositional formulas (consisting only of And, Or, Not and AP).  
							
							
 
							
							
							- For that implemented function that checks if a formula is a propositional logic formula to all three logics.
- Added tests for the function.
- Added documentation for the function.
Former-commit-id: 3fcb84b990 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								27df78c2b0 
								
							
								 
							
						 
						
							
							
								
								Finished testing Ltl.  
							
							
 
							
							
							- Regrettably, the LtlFilterTest could not be done, since an Ltl modechecker would be needed for that. Which, we don't have.
|- So that is a TODO until such a modelchecker is implemented.
- This concludes the testing for the refactured formulas.
Next up: Documentation.
Former-commit-id: 2d731edcd9 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								57882db84e 
								
							
								 
							
						 
						
							
							
								
								Fixed warnings about unused variables in PathBasedSubsystemGenerator and SMTMinimalCommandSetGenerator. Also some stuff with type conversions.  
							
							
 
							
							
							Fixed the missing include/definition for getcwd
Former-commit-id: 08f82f2ed2 
							
						 
						11 years ago