Snej69420 5 месяцев назад
Родитель
Сommit
8033a49a13
3 измененных файлов с 14 добавлено и 3 удалено
  1. 1 1
      Agents benchmarks.md
  2. 3 2
      benchmarks/compareMemory.py
  3. 10 0
      plotting Agents.md

+ 1 - 1
Agents benchmarks.md

@@ -17,7 +17,7 @@ julia --project=Agents Agents/main.jl -D 30 -W 30 -r 5 --ms HOmod -p Results/Age
 
 
 # --- MEMORY ---
 # --- MEMORY ---
 ## --- BIG Server mains ---
 ## --- BIG Server mains ---
-``` bash
+```bash
 nohup julia --project=Agents Agents/main.jl -D 400 -W 400 --ms LI -p Results/Agents -M -i 0.1 > Logs/Agents/Memory/LI.log 2>&1 & 
 nohup julia --project=Agents Agents/main.jl -D 400 -W 400 --ms LI -p Results/Agents -M -i 0.1 > Logs/Agents/Memory/LI.log 2>&1 & 
 nohup julia --project=Agents Agents/main.jl -D 400 -W 400 --ms HI -p Results/Agents -M -i 0.1 > Logs/Agents/Memory/HI.log 2>&1 &
 nohup julia --project=Agents Agents/main.jl -D 400 -W 400 --ms HI -p Results/Agents -M -i 0.1 > Logs/Agents/Memory/HI.log 2>&1 &
 nohup julia --project=Agents Agents/main.jl -D 400 -W 400 --ms HO -p Results/Agents -M -i 0.1 > Logs/Agents/Memory/HO.log 2>&1 &
 nohup julia --project=Agents Agents/main.jl -D 400 -W 400 --ms HO -p Results/Agents -M -i 0.1 > Logs/Agents/Memory/HO.log 2>&1 &

+ 3 - 2
benchmarks/compareMemory.py

@@ -15,6 +15,7 @@ SIMULATOR_MAPPING = {
     "parallel": "(p)",
     "parallel": "(p)",
     "dynamic": "(d)",
     "dynamic": "(d)",
     "dynamic-classic": "(dc)",
     "dynamic-classic": "(dc)",
+    "Memory": "(a)",
 }
 }
 
 
 TIME_UNITS = {
 TIME_UNITS = {
@@ -62,13 +63,13 @@ def get_memory_trace(db_path):
             query = """
             query = """
                     SELECT ts, stat_rss
                     SELECT ts, stat_rss
                     FROM record
                     FROM record
-                    WHERE stat_comm = 'python3'
+                    WHERE stat_comm IN ('python3', 'julia')
                     ORDER BY ts ASC \
                     ORDER BY ts ASC \
                     """
                     """
             df = pd.read_sql_query(query, conn)
             df = pd.read_sql_query(query, conn)
 
 
             if df.empty:
             if df.empty:
-                print(f"Warning: No 'python3' records found in {db_path}.")
+                print(f"Warning: No 'python3' or 'julia' records found in {db_path}.")
                 return None
                 return None
 
 
             return df
             return df

+ 10 - 0
plotting Agents.md

@@ -23,5 +23,15 @@ nohup uv run benchmarks/compare.py param $m/HOmod.csv $p/HOmod.csv $a/HOmod.csv
 nohup uv run benchmarks/compare.py param $m/HOmod.csv $p/HOmod.csv $a/HOmod.csv -d 30 -p Agents/HOmod > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $m/HOmod.csv $p/HOmod.csv $a/HOmod.csv -d 30 -p Agents/HOmod > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $p/HOmod.csv $a/HOmod.csv -p Agents/HOmod -n HOmod-parallel > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $p/HOmod.csv $a/HOmod.csv -p Agents/HOmod -n HOmod-parallel > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $m/HOmod.csv $a/HOmod.csv -p Agents/HOmod -n HOmod-minimal > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $m/HOmod.csv $a/HOmod.csv -p Agents/HOmod -n HOmod-minimal > /dev/null 2>&1 &
+```
 
 
+## Memory Comparison between Simulators
+```bash
+m=./benchmarks/Results/PyPDEVS/Memory/minimal
+p=./benchmarks/Results/PyPDEVS/Memory/parallel
+a=./benchmarks/Results/Agents/Memory
+nohup uv run benchmarks/compareMemory.py $m/LI.sqlite $p/LI.sqlite $a/LI.sqlite -n "LI-Agents-vs-PyPDEVS" > /dev/null 2>&1 &
+nohup uv run benchmarks/compareMemory.py $m/HI.sqlite $p/HI.sqlite $a/HI.sqlite -n "HI-Agents-vs-PyPDEVS" > /dev/null 2>&1 &
+nohup uv run benchmarks/compareMemory.py $m/HO.sqlite $p/HO.sqlite $a/HO.sqlite -n "HO-Agents-vs-PyPDEVS" > /dev/null 2>&1 &
+nohup uv run benchmarks/compareMemory.py $m/HOmod.sqlite $p/HOmod.sqlite $a/HOmod.sqlite -n "HOmod-Agents-vs-PyPDEVS" > /dev/null 2>&1 &
 ```
 ```