GitLab

Intermediate commit: role mapping file produced to make it easier to understand the NuSMV file (role mapping to come)

intermediate commit: pipeline works for converting to NuSMV, progress made on the template but more work still needed

Adds the command '!prev' to execute the previous command: makes life easier; added commands for the bug hunt

Prevent long lines in Mohawk files by printing newlines for CA and CR rules (WARNING: this breaks older versions of Mohawk 2.0 and Mohawk 1.0)

Moving parsers to Global repo and created a ParserHelper instead of using the ConverterRegressionTests static function runParser

# Conflicts:
#	src/mohawk/converter/ConverterInstance.java - not really a conflict, took everything from NewCanEnable

Reordering of variables to allows for better error log messages; now dumps out the roles and their hashed values to a file if an error occurs

Implemented ONLY option which allows for running only 1 reduction on a MohawkT file (currently implemented Remove CanEnable v1 and Remove CanEnable v2)

Upgraded version; testing results show it is more correct than the Conference Version, but this means that it is now slower for some of the testcases (specifically AGTUniv10.txt)

This is the current version of Mohawk+T: it is more correct than the conference version (see the previous emails with Ahn and Silvio for the bugs they reported), it is slower on the big tests, and it returns the wrong result for the bigger cases of NSA.

Implemented ShortNames option: the converted file will shorten the names of all the rolenames so it is easier to read, and is a much smaller file size

 * The long time on AGTUniv10 is due to a simple System.out.prinln printing too much text to the screen. The fix is to reduce the amount that is outputted.
 * The CR Error did not appear in the conference paper because it was an assert that was old and should have been removed, but asserts are ignored in Java, except in debugging mode, so the conference code did not have this problem. Between the conference code and now I converted all asserts to IF statements with throws, but this assert should have been removed

More testing is required before version increase and merging into master

Bad Conversion fixed, tested Ahn's code and all versions returned reachable except ASASPTime SA; there appears to be no error in the converted file so I will ask the creators if this is a bug on my side; Version updated to reflect changes
Timing 2015-08-15 00:52:44.968 1439614364968 2015-08-15 00:52:46.017 1439614366017 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.mohawk 1049 Process Helper
Timing 2015-08-15 00:52:46.056 1439614366056 2015-08-15 00:52:46.433 1439614366433 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.mohawk 377 Process Helper
Timing 2015-08-15 00:52:46.434 1439614366434 2015-08-15 00:52:46.728 1439614366728 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.mohawk 294 Process Helper
Timing 2015-08-15 00:52:46.729 1439614366729 2015-08-15 00:52:47.052 1439614367052 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.mohawk 323 Process Helper
Timing 2015-08-15 00:52:47.053 1439614367053 2015-08-15 00:52:47.381 1439614367381 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.mohawk 328 Process Helper
Timing 2015-08-15 00:52:47.382 1439614367382 2015-08-15 00:52:47.465 1439614367465 GOAL_UNREACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.sa 83 Process Helper
Timing 2015-08-15 00:52:47.466 1439614367466 2015-08-15 00:52:47.491 1439614367491 GOAL_UNREACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.sa 25 Process Helper
Timing 2015-08-15 00:52:47.492 1439614367492 2015-08-15 00:52:47.519 1439614367519 GOAL_UNREACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.sa 27 Process Helper
Timing 2015-08-15 00:52:47.52 1439614367520 2015-08-15 00:52:47.544 1439614367544 GOAL_UNREACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.sa 24 Process Helper
Timing 2015-08-15 00:52:47.545 1439614367545 2015-08-15 00:52:47.573 1439614367573 GOAL_UNREACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.sa 28 Process Helper
Timing 2015-08-15 00:52:47.587 1439614367587 2015-08-15 00:53:01.412 1439614381412 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.nsa 13825 Process Helper
Timing 2015-08-15 00:53:01.414 1439614381414 2015-08-15 00:53:02.834 1439614382834 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.nsa 1420 Process Helper
Timing 2015-08-15 00:53:02.835 1439614382835 2015-08-15 00:53:04.208 1439614384208 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.nsa 1373 Process Helper
Timing 2015-08-15 00:53:04.209 1439614384209 2015-08-15 00:53:05.541 1439614385541 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.nsa 1332 Process Helper
Timing 2015-08-15 00:53:05.542 1439614385542 2015-08-15 00:53:06.916 1439614386916 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.asaptime.nsa 1374 Process Helper
Timing 2015-08-15 00:53:06.918 1439614386918 2015-08-15 00:53:06.934 1439614386934 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.trole 16 Process Helper
Timing 2015-08-15 00:53:06.934 1439614386934 2015-08-15 00:53:06.938 1439614386938 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.trole 4 Process Helper
Timing 2015-08-15 00:53:06.938 1439614386938 2015-08-15 00:53:06.941 1439614386941 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.trole 3 Process Helper
Timing 2015-08-15 00:53:06.942 1439614386942 2015-08-15 00:53:06.944 1439614386944 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.trole 2 Process Helper
Timing 2015-08-15 00:53:06.945 1439614386945 2015-08-15 00:53:06.948 1439614386948 GOAL_REACHABLE /home/jmshahen/repo/mohawk-t-testing-tool/data/Ahn/test.st.mohawk.T.trole 3 Process Helper