refac: restructuration

proto_SABjson_v2.SABjson

 {
-    "description": "Prototype for session-annotated Batsim JSON (SABjson) format. See diagram https://app.diagrams.net/#G1tbo7oHahsgxTmhICucCGam5XNtshOUOb.",
+    "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,

swf2depGraph.py → src/swf2depGraph.py

@@ -8,7 +8,7 @@ import json
 import re
 import networkx as nx
 
-from workload import SwfField
+from src.workload import SwfField
 
 # Global dictionnary
 users = {}

swf2uStat.py → src/swf2uStat.py

@@ -9,7 +9,7 @@ import json
 import re
 from copy import deepcopy
 
-from workload import SwfField
+from src.workload import SwfField
 
 # Global dictionnary
 users = {}

workload.py → src/workload.py

@@ -33,12 +33,12 @@ class Job:
     """Class representing a job in the workload."""
 
     def __init__(self,
-                 job_id,
-                 submit_time,
-                 finish_time,
-                 start_time=None,
-                 nb_requested_resources=None,
-                 walltime=None):
+                 job_id:int,
+                 submit_time:float,
+                 finish_time:float,
+                 start_time:float=None,
+                 nb_requested_resources:int=None,
+                 walltime:float=None):
         self.id = job_id
         self.submit_time = submit_time
         self.start_time = start_time

swf2sessions.py

 #!/usr/bin/env python3
 
 import argparse, json, re, os, sys
-from user_session_builder import User
-from workload import SwfField, Job
+from src.user_session_builder import User
+from src.workload import SwfField, Job
 
 
 def swf2sessions(input_swf, output_dir, delim_approach, delim_threshold,
@@ -29,7 +29,7 @@ def swf2sessions(input_swf, output_dir, delim_approach, delim_threshold,
         res = r.match(line)
         if res:
             # Retreive values
-            job_id = str(res.group((SwfField.JOB_ID.value)))
+            job_id = int(res.group((SwfField.JOB_ID.value)))
             submit_time = max(0, float(res.group(SwfField.SUBMIT_TIME.value)))
             wait_time = float(res.group(SwfField.WAIT_TIME.value))
             run_time = float(res.group(SwfField.RUN_TIME.value))