422da8f481 
								
							
								 
							
						 
						
							
							
								
								Added set class with an underlying vector container. Adapted code in counterexample generators to use the new set class. Still bugs in it though.  
							
							
 
							
							
							Former-commit-id: ac9993eab2 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								58fa1a46a0 
								
							
								 
							
						 
						
							
							
								
								Added some comments.  
							
							
 
							
							
							Former-commit-id: acb1c62506 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e0fbb5cbea 
								
							
								 
							
						 
						
							
							
								
								Added proper treatment for both upper bound operators to counterexample generators. Added optional statistics output to SAT-based counterexample generator.  
							
							
 
							
							
							Former-commit-id: 5d471c6d00 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								82f970356e 
								
							
								 
							
						 
						
							
							
								
								Introduced analysis for labels that could potentially improve a solution.  
							
							
 
							
							
							Former-commit-id: 765bc27aa6 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								0329899304 
								
							
								 
							
						 
						
							
							
								
								Removed debug output from Z3 adapter. Put new backward cuts in actions.  
							
							
 
							
							
							Former-commit-id: a26787f613 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e24c64e41e 
								
							
								 
							
						 
						
							
							
								
								Refinement work on backward implications.  
							
							
 
							
							
							Former-commit-id: 6f08189217 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2201581ac3 
								
							
								 
							
						 
						
							
							
								
								Further improved treatment of solutions with only unreachable target states.  
							
							
 
							
							
							Former-commit-id: c36920c46c 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								dc0be79172 
								
							
								 
							
						 
						
							
							
								
								Improved elimination of solutions in which the target states are not even reachable.  
							
							
 
							
							
							Former-commit-id: f3d917ef7b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b74715a374 
								
							
								 
							
						 
						
							
							
								
								Force Gurobi to be more precise wrt. binary variables.  
							
							
 
							
							
							Former-commit-id: 860ec42ed1 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1b2bb9c138 
								
							
								 
							
						 
						
							
							
								
								Set up command flow for subsystem generation. Results seem correct on the first look.  
							
							
 
							
							
							Next up: Write the DTMC output for the subsystem generation.
Also:
- fixed one bug in the subsystem generation leading to an infinite loop
- corrected a typo in a comment in SparseMatrix
Former-commit-id: 6014bf2dd2 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9143e09d86 
								
							
								 
							
						 
						
							
							
								
								Added some more output to counterexample generators for benchmarks.  
							
							
 
							
							
							Former-commit-id: 7e64b90de6 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d3dee7dd3e 
								
							
								 
							
						 
						
							
							
								
								Minor changes to counterexample generator settings and output.  
							
							
 
							
							
							Former-commit-id: 6bc775bec0 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5adb9e2f6b 
								
							
								 
							
						 
						
							
							
								
								Renamed option file for counterexample features.  
							
							
 
							
							
							Former-commit-id: 1e84973f3b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e97680d37d 
								
							
								 
							
						 
						
							
							
								
								Added counterexample property files for some models.  
							
							
 
							
							
							Former-commit-id: 1cd16d0aca 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								47a05fc1b0 
								
							
								 
							
						 
						
							
							
								
								Beautified output of option system. Enabled command line interface of counterexample generation.  
							
							
 
							
							
							Former-commit-id: cecc5e85b3 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e2d4a5c1d3 
								
							
								 
							
						 
						
							
							
								
								Started work on beautifying Option-System output.  
							
							
 
							
							
							Former-commit-id: 7c14bb11cf 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b61090fe92 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into MinimalCommandCounterexample  
							
							
 
							
							
							Former-commit-id: 3a30ef5f18 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b18199d3ec 
								
							
								 
							
						 
						
							
							
								
								Further work on minimal label set generators.  
							
							
 
							
							
							Former-commit-id: 84e86f5842 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ad7f800ac0 
								
							
								 
							
						 
						
							
							
								
								Added examples from MILP-paper.  
							
							
 
							
							
							Former-commit-id: 6c8f918ed5 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c31dbc85a7 
								
							
								 
							
						 
						
							
							
								
								Made all examples from the MILP-paper work. Most of them are really slow though.  
							
							
 
							
							
							Former-commit-id: 1f3f5afb9a 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b55932b212 
								
							
								 
							
						 
						
							
							
								
								Adapted subsystem generation to the use of the new subsystem checking method using bit vectors.  
							
							
 
							
							
							Compiles now.
Next up: Setting up the control flow to make it actually generate a critical subsystem.
Former-commit-id: a05fd42071 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4dca7abd3f 
								
							
								 
							
						 
						
							
							
								
								Implementaed methods for checking until formula by providing the left and right states instead of the whole formula (same with bounded Until) in the SparseDtmcPrctlModelChecker, analouge to the SparseMdpPrctlModelChecker.  
							
							
 
							
							
							Reverted unnecessary changes to the AbstractModel checker.
Next on the list: Adapting the subsystem generation routine to the new method of providing the subsystem to the model checker.
Former-commit-id: 6c90c064a2 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								86909937f3 
								
							
								 
							
						 
						
							
							
								
								Grammar now supports min/max/floor/ceil functions. Parsing still has errors though.  
							
							
 
							
							
							Former-commit-id: 5af975489b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e8b83a6aab 
								
							
								 
							
						 
						
							
							
								
								Added synchronization cuts.  
							
							
 
							
							
							Former-commit-id: bb9cab2eeb 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								641c09dcfa 
								
							
								 
							
						 
						
							
							
								
								Fixed compile errors on windows caused by missing includes and use of initializer lists (not supported by vs11)  
							
							
 
							
							
							Former-commit-id: 294c26cd64 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e8f1c7c9ab 
								
							
								 
							
						 
						
							
							
								
								Fix to grammar to allow for empty probability in updates.  
							
							
 
							
							
							Former-commit-id: d13a5297a9 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								0cb390b186 
								
							
								 
							
						 
						
							
							
								
								More integration work.  
							
							
 
							
							
							Ran into problem with the AbstractModelChecker being declared const for the model check.
I use it for the subsystem generation and tell it what the current subsystem is. so I have two options:
1. Carry the subsystem as argument through all checking functions of the complete checking tree
2. Store the subsystem in the checker and use it in checkAp to induce the correct result back through the tree.
In the original implementation I used option 2.
But that does only work if it is not constant.
Former-commit-id: 8a833cc05e 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6a4d2183dc 
								
							
								 
							
						 
						
							
							
								
								Fix for SAT-based minimal counterexample generator: backward cuts are now fully correct again. Fix for PRISM grammar: missing update probabilities now default to one.  
							
							
 
							
							
							Former-commit-id: fc139c33d0 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								8244420248 
								
							
								 
							
						 
						
							
							
								
								Some refactoring work.  
							
							
 
							
							
							Former-commit-id: 1e67f5cac8 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4d161e5e8e 
								
							
								 
							
						 
						
							
							
								
								Began with integration of crit. subsystem generation into master.  
							
							
 
							
							
							Still some compile errors to fix.
Former-commit-id: 30dfdd2479 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1716c45ec5 
								
							
								 
							
						 
						
							
							
								
								Fixed compile errors concerning the handling of the STORM_HAVE_Z3 flag and a missing include in IRUtility.h  
							
							
 
							
							
							Should now compile again.
Former-commit-id: a72c906fb0 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ae6838d786 
								
							
								 
							
						 
						
							
							
								
								Switched to different computation of smallest model.  
							
							
 
							
							
							Former-commit-id: 79b3394420 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								54d28e5540 
								
							
								 
							
						 
						
							
							
								
								Further work on MaxSAT-based minimal command set generator.  
							
							
 
							
							
							Former-commit-id: 0c15787768 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								fda9c43e86 
								
							
								 
							
						 
						
							
							
								
								Fix for SMT-based minimal command set generator. Minor fixes to string output of expression classes.  
							
							
 
							
							
							Former-commit-id: 316a762d74 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a2bba28f94 
								
							
								 
							
						 
						
							
							
								
								Moved static analysis for guaranteed label set computation into utilities and improved MILP-based approach by using this information.  
							
							
 
							
							
							Former-commit-id: 611867288a 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								629448c312 
								
							
								 
							
						 
						
							
							
								
								First working version of MaxSAT-based minimal command counterexample generation.  
							
							
 
							
							
							Former-commit-id: 6dc49157f9 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b6ff62e689 
								
							
								 
							
						 
						
							
							
								
								Towards adding more cuts to MaxSAT-based minimal command counterexamples. Some fixes here and there along the way.  
							
							
 
							
							
							Former-commit-id: 15ea8544fd 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d6c59e2ca3 
								
							
								 
							
						 
						
							
							
								
								Further work on MaxSAT-based minimal counterexample generator.  
							
							
 
							
							
							Former-commit-id: 847a6e202c 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b860f16ada 
								
							
								 
							
						 
						
							
							
								
								Further work on MaxSAT-based minimal command counterexamples.  
							
							
 
							
							
							Former-commit-id: 4991bdcb3d 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								aec2596753 
								
							
								 
							
						 
						
							
							
								
								Several fixes for the IR. Weakest precondition computation is now supported for IR expressions.  
							
							
 
							
							
							Former-commit-id: 00387e59fc 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f7a578e65d 
								
							
								 
							
						 
						
							
							
								
								Major change in PRISM grammars and IR: the IR now uses unique pointers instead of shared pointers to express ownership of objects more clearly.  
							
							
 
							
							
							Former-commit-id: 5b0228ee3b 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								20ae92e1ba 
								
							
								 
							
						 
						
							
							
								
								Added support for cloning IR expressions.  
							
							
 
							
							
							Former-commit-id: 913269b3a5 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2cc5b6e080 
								
							
								 
							
						 
						
							
							
								
								Added Z3ExpressionAdapter to translate IR expressions to the Z3 format. Improvements to label-/command set generators. Disabled MILP-call from main().  
							
							
 
							
							
							Former-commit-id: 7128ab4477 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								bd3edb5f8b 
								
							
								 
							
						 
						
							
							
								
								Naive enumeration of command set works.  
							
							
 
							
							
							Former-commit-id: 45466d1edc 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a7dda9131b 
								
							
								 
							
						 
						
							
							
								
								Intermediate commit to switch workplace.  
							
							
 
							
							
							Former-commit-id: 2ade4ee21f 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e3234b54f3 
								
							
								 
							
						 
						
							
							
								
								Step towards minimal command generator using MaxSAT and model checking.  
							
							
 
							
							
							Former-commit-id: 4237447c44 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f33bf69daa 
								
							
								 
							
						 
						
							
							
								
								Another merge.  
							
							
 
							
							
							Former-commit-id: 00450616d1 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2e570f6311 
								
							
								 
							
						 
						
							
							
								
								Merge.  
							
							
 
							
							
							Former-commit-id: 572cdb80fc 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								623d9ee7c4 
								
							
								 
							
						 
						
							
							
								
								Added capability to restrict model to certain action choices.  
							
							
 
							
							
							Former-commit-id: fb3c63c64f 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								121cbb7610 
								
							
								 
							
						 
						
							
							
								
								ExplicitModelAdapter now labels updates for synchronizing commands correctly.  
							
							
 
							
							
							Former-commit-id: ae9e6c9bda 
							
						 
						12 years ago