GitLab

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

Fixed errors occurring in ASASPTime SA and TROLE where the EXTRA_ADMIN (see roles created with 'suffixAdminExtra') roles, with suffix number 0, were not added into the RoleHelper internal table; added a test now to throw an error if there is ever a role asked for and not within the table; Fixed a problem where ASASPTime SA was using legacy code instead of using the TEMPLATE code to generate the converted file (it was leaving empty preconditions instead of TRUE)

Merge branch 'master' of bitbucket.org:jshahen/mohawk-t-conversion-tool into fix_bad_conversion_to_mohawk

Speed boost and the ability to handle larger files without having a OutOfMemeoryError occurring (this is done by not compiling the string and writing each role to a FileOutputStream)

Comparison between straight FileOutputStream, RandomAccessFile and BufferedWriter:
FileOutputStream:     convertToTRole (1):   83,476 ms
BufferedWriter:           convertToTRole (1): 113,001 ms
RandomAccessFile: convertToTRole (1):   98,838 ms

All Reductions done and no runtime errors were found when converting all of the regressiontests into Mohawk, ASAPTime SA, ASAPTime NSA, TRole, TRule

Bulk work for Always On Reduction is done, support for empty Role Schedules, FIXED a bug in the build script where the regression tests pointed to the wrong file

Finished work on Query conversion

Added some testcases to answer some fundamental questions about the other programs

Added debugging messages

simple tests show that the reduction from Mohawk-T to ASAPTime NSA is complete...still need to verify that the end result is correct, pushing to master because regression tests pass

Some work done on MOHAWK-23 (Reduction for Timeintervals)

Changed Commandline Options to a ENUM for better organization and to make sure that strings aren't misspelt

updated CUI, fixed Instance (always returning the help message), and moving reduction classes to the global repo (just in case the generator needs them)

Moving things around and changing the values that "Expected" can take (now it is more like the toString version in mohawk.global.pieces.ExpectedResult)

Reorganizing files and small fix needed in the parser: changed Role to MyRole because of a class with the class Role, and the Query now takes a TimeSlot instead of an Integer

better input method (don't need to create a run configuration); more control over the ConvertTo classes

Done adding the roleSchedule to the Uzun straight conversion - still requires testing (add test to the RegressionTests), but that will be done in the morning

Gotten through the straight conversion to Uzun and have in-place the essentials to help convert the rest (See RoleHelper and TimeIntervalHelper)

added regression tests; made the input language more forgiving with time-intervals and role schedules (they can now be single time-slots without the extra input); started the toRanise conversion; updated the base template for conversion