last changes

src/analysis.py

@@ -161,7 +161,7 @@ def output_report(components, core_summary):
         print(f"Core {core_id}: {core_stat}")
 
 
-def write_solution_csv(tasks, components, filename='solution.csv'):  # noqa: E302(tasks, components, filename='solution.csv'):(tasks, components, filename='solution.csv'):
+def write_solution_csv(tasks, components, filename='analysis_solution.csv'): 
     # CSV with task- and component-level results
     rows = []
     for cid, comp in components.items():

src/common/csvreader.py

@@ -86,7 +86,8 @@ def _get_csv_path(csv:str) -> str:
 
 def read_csv() -> tuple[list[Core], list[Component], list[Task]]:
     if len(sys.argv) != 4:
-        print("Usage: python analysis.py <architecture.csv> <budget.csv> <tasks.csv>")
+        script_name = os.path.basename(sys.argv[0])
+        print(f"Usage: python {script_name} <architecture.csv> <budget.csv> <tasks.csv>")
         sys.exit(1)
 
     architecture_file = sys.argv[1]

src/simulator.py

@@ -1,9 +1,7 @@
 import random as rand
 import numpy as np
 
-from common.csvreader import read_cores
-from common.csvreader import read_budgets
-from common.csvreader import read_tasks
+from common.csvreader import read_csv
 from common.component import Component
 from common.scheduler import Scheduler
 from common.core import Core
@@ -368,34 +366,12 @@ def _get_hyperperiod(self):
         return system_hyperperiod
 
 def main():
-    # Base path for test case files
-    base_path = 'data/testcases/10-unschedulable-test-case'
-
-    # Read architectures
-    architecture_path = f'{base_path}/architecture.csv'
-    cores = read_cores(architecture_path)
-    print("Architectures:")
-    for core in cores:
-        print(core)
-
-    # Read tasks
-    tasks_path = f'{base_path}/tasks.csv'
-    tasks = read_tasks(tasks_path)
-    print("\nTasks:")
-    for task in tasks:
-        print(task)
-
-    # Read components
-    budgets_path = f'{base_path}/budgets.csv'
-    components = read_budgets(budgets_path)
-    print("\nBudgets:")
-    for component in components:
-        print(component)
+    cores, components, tasks = read_csv()
 
     simulator = Simulator(cores, components, tasks)
     simulator.run()
 
-    simulator.generate_output_file("output.csv")
+    simulator.generate_output_file("simulation_solution.csv")
 
 if __name__ == "__main__":
     main()