From 26fe83eb02804544d036efb7d06db45ed2778a09 Mon Sep 17 00:00:00 2001 From: SamUpid Date: Wed, 9 Oct 2024 13:02:05 +0200 Subject: [PATCH 1/2] Bug 2 fixed --- src/main/java/hu/bme/mit/spaceship/TorpedoStore.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java b/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java index 76a3cea..c4f12ea 100644 --- a/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java +++ b/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java @@ -14,8 +14,11 @@ public class TorpedoStore { private int torpedoCount = 0; + private Random generator; + public TorpedoStore(int numberOfTorpedos){ this.torpedoCount = numberOfTorpedos; + generator= new Random(); // update failure rate if it was specified in an environment variable String failureEnv = System.getenv("IVT_RATE"); @@ -36,12 +39,12 @@ public boolean fire(int numberOfTorpedos){ boolean success = false; // simulate random overheating of the launcher bay which prevents firing - Random generator = new Random(); + double r = generator.nextDouble(); if (r >= FAILURE_RATE) { // successful firing - this.torpedoCount =- numberOfTorpedos; + this.torpedoCount =this.torpedoCount- numberOfTorpedos; success = true; } else { // simulated failure From 1ed1f7e3b918490000e3af45d8fad171bfd17cd5 Mon Sep 17 00:00:00 2001 From: SamUpid Date: Wed, 9 Oct 2024 13:05:58 +0200 Subject: [PATCH 2/2] 3rd Fixed --- src/main/java/hu/bme/mit/spaceship/TorpedoStore.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java b/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java index c4f12ea..08fcf46 100644 --- a/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java +++ b/src/main/java/hu/bme/mit/spaceship/TorpedoStore.java @@ -31,9 +31,13 @@ public TorpedoStore(int numberOfTorpedos){ } } + /** + * @param numberOfTorpedos + * @return + */ public boolean fire(int numberOfTorpedos){ if(numberOfTorpedos < 1 || numberOfTorpedos > this.torpedoCount){ - new IllegalArgumentException("numberOfTorpedos"); + throw new IllegalArgumentException("numberOfTorpedos"); } boolean success = false;