From 37a9dd446363e12dc26fd277e3cf1209c776afe7 Mon Sep 17 00:00:00 2001 From: Jake Wooten Date: Wed, 24 Jul 2019 17:48:48 -0400 Subject: [PATCH 1/7] updated Passenger class here with next method because this branch has the pushUP and pushDown methods --- src/Passenger.java | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/Passenger.java b/src/Passenger.java index 9648e97..19dadbf 100644 --- a/src/Passenger.java +++ b/src/Passenger.java @@ -2,19 +2,45 @@ public class Passenger { private int startFloor; private int destinationFloor; - - public Passenger(int startFloor, int destinationFloor) + private boolean waiting; + Elevator elev; + public Passenger(Elevator, elev, int startFloor, int destinationFloor) { + this.elev = elev; this.startFloor = startFloor; this.destinationFloor = destinationFloor; + this.waiting = false; } - public Passenger(int destinationFloor) + public Passenger(Elevator elev, int destinationFloor) { + this.elev = elev; + this.waiting = false; this.startFloor = 1; this.destinationFloor = destinationFloor; } + public void next() + { + if(!this.waiting) + { + if(this.destinationFloor > elev.getCurrentFloor) + { + elev.pushUp(this.startFloor); + } + else + { + elev.pushDown(this.startFloor); + } + this.waiting = true; + } + } + + public boolean getWaiting() + { + return this.waiting; + } + public int getStartFloor() { return this.startFloor; From a3686163377be5b927af3f0d6f656660897848d6 Mon Sep 17 00:00:00 2001 From: jakewooten <42622871+jakewooten@users.noreply.github.com> Date: Wed, 24 Jul 2019 17:51:06 -0400 Subject: [PATCH 2/7] Update Passenger.java took out an unneeded comma --- src/Passenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Passenger.java b/src/Passenger.java index 19dadbf..25ba429 100644 --- a/src/Passenger.java +++ b/src/Passenger.java @@ -4,7 +4,7 @@ public class Passenger private int destinationFloor; private boolean waiting; Elevator elev; - public Passenger(Elevator, elev, int startFloor, int destinationFloor) + public Passenger(Elevator elev, int startFloor, int destinationFloor) { this.elev = elev; this.startFloor = startFloor; From 916754b8d026e5aadd0311d552f7a7eb2abb3aa0 Mon Sep 17 00:00:00 2001 From: jakewooten <42622871+jakewooten@users.noreply.github.com> Date: Wed, 24 Jul 2019 17:52:36 -0400 Subject: [PATCH 3/7] Update Passenger.java added parenthesis for a method call --- src/Passenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Passenger.java b/src/Passenger.java index 25ba429..640c788 100644 --- a/src/Passenger.java +++ b/src/Passenger.java @@ -24,7 +24,7 @@ public void next() { if(!this.waiting) { - if(this.destinationFloor > elev.getCurrentFloor) + if(this.destinationFloor > elev.getCurrentFloor()) { elev.pushUp(this.startFloor); } From f9921a9749a089fdecd2e198518e5b34a298e63d Mon Sep 17 00:00:00 2001 From: Elijah Smith Date: Thu, 25 Jul 2019 11:15:39 -0400 Subject: [PATCH 4/7] accessor methods for pushedUp and pushedDown arrays --- src/Elevator.java | 19 +++++++++++++++++-- tests/Tests.java | 32 +++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/Elevator.java b/src/Elevator.java index 7055947..d09fb76 100644 --- a/src/Elevator.java +++ b/src/Elevator.java @@ -17,8 +17,8 @@ public Elevator(int currentFloor, int destinationFloor, int numberOfFloors) { this.currentFloor = currentFloor; this.destinationFloor = destinationFloor; this.numberOfFloors = numberOfFloors; - pushedUp = new boolean[numberOfFloors]; - pushedDown = new boolean[numberOfFloors]; + pushedUp = new boolean[numberOfFloors]; + pushedDown = new boolean[numberOfFloors]; } /** @@ -67,6 +67,21 @@ public int getNumberOfFloors() { return this.numberOfFloors; } + /** + * Author: Elijah Smith + * Issue #67 pushedUp accessor + */ + public boolean[] getPushedUpArray() { + return this.pushedUp; + } + + /** + * Author: Elijah Smith + * Issue #67 pushedDown accessor + */ + public boolean[] getPushedDownArray() { + return this.pushedDown; + } public void stop() { this.stopped = true; } diff --git a/tests/Tests.java b/tests/Tests.java index 295f9a8..b2ab11f 100644 --- a/tests/Tests.java +++ b/tests/Tests.java @@ -62,23 +62,41 @@ public void testCurrentFloor() { int destinationFloor = 420; int totalFloors = 600; Elevator elevator = new Elevator(currentFloor, destinationFloor, totalFloors); + + assertEquals(60, elevator.getCurrentFloor()); } + /** + * Author: Elijah Smith + */ + public void testGetPushedUpArray() { + Elevator elev = new Elevator(100); + elev.pushUp(3); + elev.pushDown(4); + + boolean[] goingUp = elev.getPushedUpArray(); + boolean[] goingDown = elev.getPushedDownArray(); + + boolean up = goingUp[3]; + boolean down = goingDown[4]; + + assertEquals(true, up); + assertEquals(true, down); + } + + /** + * Author: Elijah Smith + + */ @Test public void testPassengerConstructor1() { - Passenger pass = new Passenger(3, 10); - - assertEquals(3, pass.getStartFloor()); - assertEquals(10, pass.getDestinationFloor()); + } @Test public void testPassengerConstructor2() { - Passenger pass = new Passenger(50); - assertEquals(1, pass.getStartFloor()); - assertEquals(50, pass.getDestinationFloor()); } } From 09cfcbceffa9ae6ae8f6d371da78119f5e6f69dc Mon Sep 17 00:00:00 2001 From: Jake Wooten Date: Wed, 24 Jul 2019 17:48:48 -0400 Subject: [PATCH 5/7] updated Passenger class here with next method because this branch has the pushUP and pushDown methods --- src/Passenger.java | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/Passenger.java b/src/Passenger.java index 9648e97..19dadbf 100644 --- a/src/Passenger.java +++ b/src/Passenger.java @@ -2,19 +2,45 @@ public class Passenger { private int startFloor; private int destinationFloor; - - public Passenger(int startFloor, int destinationFloor) + private boolean waiting; + Elevator elev; + public Passenger(Elevator, elev, int startFloor, int destinationFloor) { + this.elev = elev; this.startFloor = startFloor; this.destinationFloor = destinationFloor; + this.waiting = false; } - public Passenger(int destinationFloor) + public Passenger(Elevator elev, int destinationFloor) { + this.elev = elev; + this.waiting = false; this.startFloor = 1; this.destinationFloor = destinationFloor; } + public void next() + { + if(!this.waiting) + { + if(this.destinationFloor > elev.getCurrentFloor) + { + elev.pushUp(this.startFloor); + } + else + { + elev.pushDown(this.startFloor); + } + this.waiting = true; + } + } + + public boolean getWaiting() + { + return this.waiting; + } + public int getStartFloor() { return this.startFloor; From 5c3e475e609bb265d0bc941b1a889f9ebd00cd4d Mon Sep 17 00:00:00 2001 From: jakewooten <42622871+jakewooten@users.noreply.github.com> Date: Wed, 24 Jul 2019 17:51:06 -0400 Subject: [PATCH 6/7] Update Passenger.java took out an unneeded comma --- src/Passenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Passenger.java b/src/Passenger.java index 19dadbf..25ba429 100644 --- a/src/Passenger.java +++ b/src/Passenger.java @@ -4,7 +4,7 @@ public class Passenger private int destinationFloor; private boolean waiting; Elevator elev; - public Passenger(Elevator, elev, int startFloor, int destinationFloor) + public Passenger(Elevator elev, int startFloor, int destinationFloor) { this.elev = elev; this.startFloor = startFloor; From 60446d3f900c3a858be4ae1c0f16a9769213346b Mon Sep 17 00:00:00 2001 From: jakewooten <42622871+jakewooten@users.noreply.github.com> Date: Wed, 24 Jul 2019 17:52:36 -0400 Subject: [PATCH 7/7] Update Passenger.java added parenthesis for a method call --- src/Passenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Passenger.java b/src/Passenger.java index 25ba429..640c788 100644 --- a/src/Passenger.java +++ b/src/Passenger.java @@ -24,7 +24,7 @@ public void next() { if(!this.waiting) { - if(this.destinationFloor > elev.getCurrentFloor) + if(this.destinationFloor > elev.getCurrentFloor()) { elev.pushUp(this.startFloor); }