diff --git a/src/main/java/ChunkStatus.java b/src/main/java/ChunkStatus.java index b17eb70..b30e3e8 100644 --- a/src/main/java/ChunkStatus.java +++ b/src/main/java/ChunkStatus.java @@ -107,6 +107,6 @@ public class ChunkStatus { } public void setStartTime(long startTime) { - + this.startTimeMs = startTime; } } diff --git a/src/main/java/ConfigReader.java b/src/main/java/ConfigReader.java index 5754060..1eae77d 100644 --- a/src/main/java/ConfigReader.java +++ b/src/main/java/ConfigReader.java @@ -20,6 +20,8 @@ public class ConfigReader { int maxStepDelayMs = 0; double minStepDownloadMB = 0; double maxStepDownloadMB = 0; + int minDelayMs = 0; + int maxDelayMs = 0; try (BufferedReader reader = new BufferedReader( new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { @@ -62,6 +64,12 @@ public class ConfigReader { case "maxStepDownloadMB": maxStepDownloadMB = Double.parseDouble(value); break; + case "minDelayMs": + minDelayMs = Integer.parseInt(value); + break; + case "maxDelayMs": + maxDelayMs = Integer.parseInt(value); + break; default: // Ignore unknown keys to keep parsing simple break; @@ -79,7 +87,9 @@ public class ConfigReader { minStepDelayMs, maxStepDelayMs, minStepDownloadMB, - maxStepDownloadMB + maxStepDownloadMB, + minDelayMs, + maxDelayMs ); } } diff --git a/src/main/java/DownloadConfig.java b/src/main/java/DownloadConfig.java index f6a1745..e765d75 100644 --- a/src/main/java/DownloadConfig.java +++ b/src/main/java/DownloadConfig.java @@ -10,13 +10,15 @@ public class DownloadConfig { private final int maxStepDelayMs; private final double minStepDownloadMB; private final double maxStepDownloadMB; + private final int maxDelayMs; + private final int minDelayMs; /** * Constructs a new DownloadConfig with specified simulation parameters. */ public DownloadConfig(String fileName, int totalSizeMB, int chunkCount, int minStepDelayMs, int maxStepDelayMs, - double minStepDownloadMB, double maxStepDownloadMB) { + double minStepDownloadMB, double maxStepDownloadMB, int maxDelayMs, int minDelayMs) { this.fileName = fileName; this.totalSizeMB = totalSizeMB; this.chunkCount = chunkCount; @@ -24,6 +26,8 @@ public class DownloadConfig { this.maxStepDelayMs = maxStepDelayMs; this.minStepDownloadMB = minStepDownloadMB; this.maxStepDownloadMB = maxStepDownloadMB; + this.maxDelayMs = maxDelayMs; + this.minDelayMs = minDelayMs; } // Getters @@ -69,8 +73,10 @@ public class DownloadConfig { } public int getMinDelayMs() { + return minDelayMs; } public int getMaxDelayMs() { + return maxDelayMs; } }