From 0841f0f9a1e3f3708d8c511a6290344e73607aab Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 21 Jun 2025 21:27:31 +0300
Subject: Move test scripts to scripts/ directory and fix simulation completion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Moved test-protocols.sh, test-quick.sh, test-verbose.sh to scripts/
- Updated references in README.md and docs/testing-guide.md
- Fixed HeadlessSimulationRunner to properly run simulations to completion
- Fixed message delivery timing (now respects 500-2000ms delays)
- Added proper process time synchronization
- Fixed HeadlessProtocolRunner to exit cleanly

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../simulator/engine/AbstractSimulationEngine.java | 21 ++++++++-----
 .../simulator/engine/HeadlessSimulationEngine.java | 34 ++++++++--------------
 2 files changed, 25 insertions(+), 30 deletions(-)

(limited to 'src/main/java/simulator/engine')

diff --git a/src/main/java/simulator/engine/AbstractSimulationEngine.java b/src/main/java/simulator/engine/AbstractSimulationEngine.java
index 21be5c7..45b2522 100644
--- a/src/main/java/simulator/engine/AbstractSimulationEngine.java
+++ b/src/main/java/simulator/engine/AbstractSimulationEngine.java
@@ -16,7 +16,7 @@ public abstract class AbstractSimulationEngine implements SimulationEngine {
     protected final VSPrefs prefs;
     protected final List<VSInternalProcess> processes;
     protected final List<SimulationVisualizer> visualizers;
-    protected final VSTaskManager taskManager;
+    protected VSTaskManager taskManager;
     protected VSLogging loging;
     
     protected long time;
@@ -38,19 +38,16 @@ public abstract class AbstractSimulationEngine implements SimulationEngine {
     
     @Override
     public void sendMessage(VSMessage message) {
+        // Calculate proper delivery time
+        long deliveryTime = calculateDeliveryTime(message);
+        
         // Schedule message delivery to all processes (broadcast model)
-        scheduleMessageDelivery(message, time);
+        scheduleMessageDelivery(message, deliveryTime);
         
         // Notify visualizers
         for (SimulationVisualizer visualizer : visualizers) {
             visualizer.onMessageSent(message);
         }
-        
-        // Log the message
-        if (loging != null) {
-            loging.log("Message sent; ID: " + message.getMessageID() + 
-                      "; Protocol: " + message.getName());
-        }
     }
     
     protected abstract long calculateDeliveryTime(VSMessage message);
@@ -100,6 +97,14 @@ public abstract class AbstractSimulationEngine implements SimulationEngine {
         return taskManager;
     }
     
+    /**
+     * Set the task manager for this engine.
+     * Used when integrating with existing simulation infrastructure.
+     */
+    public void setTaskManager(VSTaskManager taskManager) {
+        this.taskManager = taskManager;
+    }
+    
     @Override
     public long getTime() {
         return time;
diff --git a/src/main/java/simulator/engine/HeadlessSimulationEngine.java b/src/main/java/simulator/engine/HeadlessSimulationEngine.java
index 36a64a7..fa6dde8 100644
--- a/src/main/java/simulator/engine/HeadlessSimulationEngine.java
+++ b/src/main/java/simulator/engine/HeadlessSimulationEngine.java
@@ -24,23 +24,12 @@ public class HeadlessSimulationEngine extends AbstractSimulationEngine {
             return time; // Deliver immediately if process not found
         }
         
-        // Calculate network delay
-        long networkDelay = prefs.getLong("sim.network.delay");
-        long variability = prefs.getLong("sim.network.variability");
+        // Use the process's getDurationTime method to get the message duration
+        // This respects the message.sendingtime.min and message.sendingtime.max preferences
+        long durationTime = source.getDurationTime();
         
-        // Add random variability
-        if (variability > 0) {
-            long variance = (long)(Math.random() * variability * 2) - variability;
-            networkDelay += variance;
-        }
-        
-        // Ensure minimum delay
-        if (networkDelay < 0) {
-            networkDelay = 0;
-        }
-        
-        // Calculate delivery time based on source process time
-        return source.getTime() + networkDelay;
+        // Calculate delivery time based on source process's global time + duration
+        return source.getGlobalTime() + durationTime;
     }
     
     @Override
@@ -49,6 +38,13 @@ public class HeadlessSimulationEngine extends AbstractSimulationEngine {
         VSInternalProcess sendingProcess = (VSInternalProcess) message.getSendingProcess();
         boolean recvOwn = prefs.getBoolean("sim.message.own.recv");
         
+        // Debug logging
+        if (loging != null) {
+            loging.log("Message " + message.getMessageID() + " scheduled for delivery at time " + 
+                      deliveryTime + " (sent at globalTime=" + sendingProcess.getGlobalTime() + 
+                      ", duration=" + (deliveryTime - sendingProcess.getGlobalTime()) + "ms)");
+        }
+        
         // Schedule delivery to all processes
         for (VSInternalProcess receiverProcess : processes) {
             if (receiverProcess.equals(sendingProcess)) {
@@ -62,12 +58,6 @@ public class HeadlessSimulationEngine extends AbstractSimulationEngine {
             VSMessageReceiveEvent receiveEvent = new VSMessageReceiveEvent(message);
             VSTask task = new VSTask(deliveryTime, receiverProcess, receiveEvent, VSTask.GLOBAL);
             taskManager.addTask(task);
-            
-            if (loging != null) {
-                loging.log("Message scheduled for delivery to process " + 
-                          receiverProcess.getProcessNum() + "; ID: " + 
-                          message.getMessageID() + "; Time: " + deliveryTime);
-            }
         }
     }
     
-- 
cgit v1.2.3