diff --git a/proto_SABjson_v1.json b/proto_SABjson_v1.json deleted file mode 100644 index d9a5c9d7684d335e76766d1989f5dca58893a675..0000000000000000000000000000000000000000 --- a/proto_SABjson_v1.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "description": "Prototype for session-annotated Batsim JSON (SABjson) format. See diagram https://app.diagrams.net/#G1tbo7oHahsgxTmhICucCGam5XNtshOUOb.", - "command": "command used to generate the file. We can suppose that it's generated with arrival delimitation approach and threshold = 60mn = 3600s.", - "date": "data of generation of the file", - "nb_res": 4, - "version": 1, - "jobs": [ - { - "id": 1, - "profile": "2400", - "res": 4, - "subtime": 0.0, - "walltime": 2592000.0, - "session": 1 - }, - { - "id": 2, - "profile": "9600", - "res": 4, - "subtime": 3000.0, - "walltime": 2592000.0, - "session": 1 - }, - { - "id": 3, - "profile": "13200", - "res": 4, - "subtime": 7800.0, - "walltime": 2592000.0, - "session": 2 - }, - { - "id": 4, - "profile": "3600", - "res": 4, - "subtime": 16200.0, - "walltime": 2592000.0, - "session": 3 - }, - { - "id": 5, - "profile": "5400", - "res": 4, - "subtime": 24000.0, - "walltime": 2592000.0, - "session": 4 - }, - { - "id": 6, - "profile": "4200", - "res": 4, - "subtime": 24600.0, - "walltime": 2592000.0, - "session": 4 - } - ], - "sessions": { - "1": { - "first_submit_time": 0.0, - "preceding_sessions": [], - "thinking_time_after_preceding_session": [], - "following_sessions": ["3"], - "nb_jobs": 2 - }, - "2": { - "first_submit_time": 7800.0, - "preceding_sessions": [], - "thinking_time_after_preceding_session": [], - "following_sessions": ["4"], - "nb_jobs": 1 - }, - "3": { - "first_submit_time": 16200.0, - "preceding_sessions": ["1"], - "thinking_time_after_preceding_session": [3600.0], - "following_sessions": ["4"], - "nb_jobs": 1 - }, - "4": { - "first_submit_time": 24000.0, - "preceding_sessions": ["2","3"], - "thinking_time_after_preceding_session": [5400.0, 4200.0], - "following_sessions": [], - "nb_jobs": 2 - } - - } -} \ No newline at end of file diff --git a/proto_SABjson_v2.SABjson b/proto_SABjson_v2.SABjson deleted file mode 100644 index 2fe627c70c41582f6177f144ae5ae146c6c6865a..0000000000000000000000000000000000000000 --- a/proto_SABjson_v2.SABjson +++ /dev/null @@ -1,97 +0,0 @@ -{ - "description": "Prototype for session-annotated Batsim JSON (SABjson) format. See diagram https://app.diagrams.net/#G1tbo7oHahsgxTmhICucCGam5XNtshOUOb", - "command": "command used to generate the file. We can suppose that it's generated with arrival delimitation approach and threshold = 60mn = 3600s.", - "date": "data of generation of the file", - "nb_res": 4, - "version": 2, - "sessions": [ - { - "id": 1, - "first_submit_time": 0.0, - "preceding_sessions": [], - "thinking_time_after_preceding_session": [], - "nb_jobs": 2, - "jobs": [ - { - "id": 1, - "profile": "2400", - "res": 4, - "subtime": 0.0, - "walltime": 2592000.0 - }, - { - "id": 2, - "profile": "9600", - "res": 4, - "subtime": 3000.0, - "walltime": 2592000.0 - } - ] - }, - { - "id": 2, - "first_submit_time": 7800.0, - "preceding_sessions": [], - "thinking_time_after_preceding_session": [], - "nb_jobs": 1, - "jobs": [ - { - "id": 3, - "profile": "10800", - "res": 4, - "subtime": 0.0, - "walltime": 2592000.0 - } - ] - }, - { - "id": 3, - "first_submit_time": 16200.0, - "preceding_sessions": [ - 1 - ], - "thinking_time_after_preceding_session": [ - 3600.0 - ], - "nb_jobs": 1, - "jobs": [ - { - "id": 4, - "profile": "3600", - "res": 4, - "subtime": 0.0, - "walltime": 2592000.0 - } - ] - }, - { - "id": 4, - "first_submit_time": 24000.0, - "preceding_sessions": [ - 2, - 3 - ], - "thinking_time_after_preceding_session": [ - 5400.0, - 4200.0 - ], - "nb_jobs": 2, - "jobs": [ - { - "id": 5, - "profile": "5400", - "res": 4, - "subtime": 0.0, - "walltime": 2592000.0 - }, - { - "id": 6, - "profile": "4200", - "res": 4, - "subtime": 600.0, - "walltime": 2592000.0 - } - ] - } - ] -} \ No newline at end of file diff --git a/swf2sessions.py b/swf2userSessions.py similarity index 100% rename from swf2sessions.py rename to swf2userSessions.py diff --git a/test/conftest.py b/test/conftest.py index dbf24292b81e33aa34640270a6896cfd921a307c..bbc43a6e4e10d163ca88f5adb617efcaf890991d 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -28,11 +28,11 @@ def run_script(delim, create_dir_rec_if_needed(out_dir) if not graph: - cp = subprocess.run(['python3', 'swf2sessions.py', + cp = subprocess.run(['python3', 'swf2userSessions.py', '-at', str(threshold), '-q', input_swf, out_dir], check=True) else: - cp = subprocess.run(['python3', 'swf2sessions.py', + cp = subprocess.run(['python3', 'swf2userSessions.py', '-at', str(threshold), '--graph', '-q', input_swf, out_dir], check=True)