From e5d9ed8184b451b4cc38253db90189cba0b4735c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Wed, 26 Oct 2022 13:52:21 +0200
Subject: [PATCH] refac: restructuration
---
proto_SABjson_v2.SABjson | 2 +-
swf2depGraph.py => src/swf2depGraph.py | 2 +-
swf2uStat.py => src/swf2uStat.py | 2 +-
.../user_session_builder.py | 0
workload.py => src/workload.py | 12 ++++++------
swf2sessions.py | 6 +++---
6 files changed, 12 insertions(+), 12 deletions(-)
rename swf2depGraph.py => src/swf2depGraph.py (99%)
rename swf2uStat.py => src/swf2uStat.py (99%)
rename user_session_builder.py => src/user_session_builder.py (100%)
rename workload.py => src/workload.py (90%)
diff --git a/proto_SABjson_v2.SABjson b/proto_SABjson_v2.SABjson
index 1cbd7fa..2fe627c 100644
--- a/proto_SABjson_v2.SABjson
+++ b/proto_SABjson_v2.SABjson
@@ -1,5 +1,5 @@
{
- "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,
diff --git a/swf2depGraph.py b/src/swf2depGraph.py
similarity index 99%
rename from swf2depGraph.py
rename to src/swf2depGraph.py
index 9ba44ef..d2275a1 100755
--- a/swf2depGraph.py
+++ b/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 = {}
diff --git a/swf2uStat.py b/src/swf2uStat.py
similarity index 99%
rename from swf2uStat.py
rename to src/swf2uStat.py
index e7a0a1b..6e9eaa3 100755
--- a/swf2uStat.py
+++ b/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 = {}
diff --git a/user_session_builder.py b/src/user_session_builder.py
similarity index 100%
rename from user_session_builder.py
rename to src/user_session_builder.py
diff --git a/workload.py b/src/workload.py
similarity index 90%
rename from workload.py
rename to src/workload.py
index b1c3370..3dab542 100644
--- a/workload.py
+++ b/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
diff --git a/swf2sessions.py b/swf2sessions.py
index 54ecb22..83af1f1 100755
--- a/swf2sessions.py
+++ b/swf2sessions.py
@@ -1,8 +1,8 @@
#!/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))
--
GitLab