refac: renamed and cleaned project

proto_SABjson_v1.json

-{
-    "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

proto_SABjson_v2.SABjson

-{
-    "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

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)