first commit

.classpath

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<accessrules>
+			<accessrule kind="accessible" pattern="javafx/"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

src/design_patterns/horses/EarlySprinter.java

@@ -0,0 +1,35 @@
+package design_patterns.horses;
+
+
+public class EarlySprinter extends Horse{
+
+	public double speed;
+	public double reducedSpeed;
+
+	public EarlySprinter(String n, double s) {
+		name = n;
+		speed = s;
+		reducedSpeed = s*.75;
+	}
+
+	@Override
+	public void run() {
+		if (position < 10) {
+			if (position >= 2) {
+				speed = reducedSpeed;
+			}
+
+			position = position + speed*timeIncr;
+		}else {
+			finished = true;
+		}
+	}
+
+	public void display() {
+		if (!finished) {
+			System.out.println(name + " has run " + position + " miles.");
+		}else {
+			System.out.println(name + " has finished.");
+		}	
+	}
+}

src/design_patterns/horses/Horse.java

@@ -0,0 +1,21 @@
+package design_patterns.horses;
+
+public class Horse {
+
+	public String name;
+	public double timeIncr = .04;
+	public double position = 0;
+	public boolean finished = false;
+	public double speed;
+	public double reducedSpeed = 0;
+
+	public Horse(){
+	}
+
+	public void run(){
+	}
+
+	public void display() {
+	}
+
+}

src/design_patterns/horses/Main.java

@@ -0,0 +1,15 @@
+package design_patterns.horses;
+
+public class Main {
+
+	public static void main(String[] args) throws InterruptedException {
+		Race race1 = new Race();
+		race1.enrollHorse("Joe", 43, "steady");
+		race1.enrollHorse("Kendall", 46, "slow");
+		race1.enrollHorse("Fisher", 45, "early");
+		race1.enrollHorse("Sharley", 42, "slow");
+		race1.enrollHorse("Julius", 41, "steady");
+		race1.startRace();
+	}
+
+}

src/design_patterns/horses/Race.java

@@ -0,0 +1,46 @@
+package design_patterns.horses;
+
+public class Race {
+	public Horse[] arr = new Horse[5];
+	public int horseNum = 0;
+
+	public void enrollHorse(String n, double s, String t) {
+
+		if(t == "steady") {
+			arr[horseNum] = new SteadyRunner(n, s);
+		}else if (t == "slow") {
+			arr[horseNum] = new SlowStarter(n, s);
+		}else {
+			arr[horseNum] = new EarlySprinter(n, s);
+		}
+		horseNum++;
+
+	}
+
+	public Race(){
+	}
+
+	public void startRace() throws InterruptedException{
+		while (!arr[0].finished && !arr[1].finished && !arr[2].finished && !arr[3].finished && !arr[4].finished) {
+			for (int i = 0; i < 5; i++) {
+				arr[i].run();
+			}
+			for (int i = 0; i < 5; i++) {
+				arr[i].display();
+			}
+			if (arr[0].finished) {
+				System.out.println(arr[0].name + " HAS WON!");
+			}else if(arr[1].finished) {
+				System.out.println(arr[1].name + " HAS WON!");
+			}else if(arr[2].finished) {
+				System.out.println(arr[2].name + " HAS WON!");
+			}else if(arr[3].finished) {
+				System.out.println(arr[3].name + " HAS WON!");
+			}else if(arr[4].finished) {
+				System.out.println(arr[4].name + " HAS WON!");
+			}
+			Thread.sleep(500);
+		}
+	}
+
+}

src/design_patterns/horses/RaceTest2.java

@@ -0,0 +1,14 @@
+package design_patterns.horses;
+import org.junit.Test;
+
+public class RaceTest2 {
+	@Test
+	public void test() throws InterruptedException {
+		Horse test1 = new SteadyRunner(null, 0);
+		test1.run();
+		Horse test2 = new SlowStarter(null, 0);
+		test2.run();
+		Horse test3 = new EarlySprinter(null, 0);
+		test3.run();
+	}	
+}

src/design_patterns/horses/RaceTest3.java

@@ -0,0 +1,14 @@
+package design_patterns.horses;
+import org.junit.Test;
+
+public class RaceTest3 {
+	@Test
+	public void test() throws InterruptedException {
+		Horse test1 = new SteadyRunner(null, 0);
+		test1.display();
+		Horse test2 = new SlowStarter(null, 0);
+		test2.display();
+		Horse test3 = new EarlySprinter(null, 0);
+		test3.display();
+	}	
+}

src/design_patterns/horses/ReaceTest.java

@@ -0,0 +1,15 @@
+package design_patterns.horses;
+
+import org.junit.Test;
+
+public class ReaceTest {
+	@Test
+	public void test() throws InterruptedException {
+		Race race1 = new Race();
+		race1.enrollHorse("Jimmy", 43, "steady");
+		race1.enrollHorse("Klien", 46, "slow");
+		race1.enrollHorse("Dabo", 45, "early");
+		race1.enrollHorse("Sheen", 42, "slow");
+		race1.enrollHorse("Biscuit", 41, "steady");
+	}	
+}

src/design_patterns/horses/Reflection

@@ -0,0 +1,17 @@
+Elijah Hager
+9/9/2018
+
+                                        Horse Race
+
+          I used a Race class sort of as a base/main class in my project. This included a 
+enrollHorse method which allowed me to enroll 5 horses in the race and choose their strategy. 
+This was done with a array of the Horse objects. Then in a startRace method, the respective runs 
+and displays were running until one of them was finished in which cased it outputted the winner. 
+So, in the Horse class, all the universal variables for the horse were initialized, things 
+like position, name, speed etc. these would later be altered in their own strategy classes. 
+All the strategy classes were created as extensions from the Horse class. This was done so 
+they could alter and use the variables associated with the horse such as speed. In each strategy 
+the horses speed is updated when it should be, and the horse’s position is incremented based off 
+the updated speed, this is done until the horse passes 10 miles. I tinkered with what the type 
+of the strategies for hours figuring out ways to make them able to alter the horse’s values but 
+still be changeable outside the constructor, and this was the best solution I could come up with.

src/design_patterns/horses/SlowStarter.java

@@ -0,0 +1,44 @@
+package design_patterns.horses;
+
+
+
+public class SlowStarter extends Horse{
+
+	public double speed;
+	public double nonReducedSpeed;
+	public double reducedSpeed;
+	public double reducedSpeed_2;
+
+	public SlowStarter(String n, double s) {
+		name = n;
+		nonReducedSpeed = s;
+		reducedSpeed = s*.90;
+		reducedSpeed_2 = s*.75;
+	}
+
+	@Override
+	public void run() {
+		if (position < 10) {
+			if (position <= 6) {
+				speed = reducedSpeed_2;
+			}else if (position > 6 && position < 9) {
+				speed = reducedSpeed;
+			}else {
+				speed = nonReducedSpeed;
+			}
+
+			position = position + speed*timeIncr;
+		}else {
+			finished = true;
+		}
+	}
+
+	public void display() {
+		if (!finished) {
+			System.out.println(name + " has run " + position + " miles.");
+		}else {
+			System.out.println(name + " has finished.");
+		}
+
+	}
+}

src/design_patterns/horses/SteadyRunner.java

@@ -0,0 +1,29 @@
+package design_patterns.horses;
+
+public class SteadyRunner extends Horse{
+
+	public double speed;
+
+	public SteadyRunner(String n, double s) {
+		name = n;
+		speed = s*.8;
+	}
+
+	@Override
+	public void run() {
+		if (position < 10) {
+			position = position + speed*timeIncr;
+		}else {
+			finished = true;
+		}
+	}
+
+	public void display() {
+		if (!finished) {
+			System.out.println(name + " has run " + position + " miles.");
+		}else {
+			System.out.println(name + " has finished.");
+		}
+	}
+
+}

src/design_patterns/horses/package-info.java

@@ -0,0 +1,8 @@
+/**
+ * 
+ */
+/**
+ * @author elija
+ *
+ */
+package design_patterns.horses;

src/edu/nd/sarec/railwaycrossing/Simulation.java

@@ -9,6 +9,7 @@
 import edu.nd.sarec.railwaycrossing.model.infrastructure.gate.CrossingGate;
 import edu.nd.sarec.railwaycrossing.model.vehicles.Car;
 import edu.nd.sarec.railwaycrossing.model.vehicles.Train;
+import edu.nd.sarec.railwaycrossing.model.vehicles.Train2;
 import edu.nd.sarec.railwaycrossing.view.MapDisplay;
 import javafx.animation.AnimationTimer;
 import javafx.application.Application;
@@ -42,12 +43,16 @@ public void start(Stage stage) throws Exception {
 
 		// Train
 		RailwayTracks track = mapBuilder.getTrack("Royal");
+		RailwayTracks track2 = mapBuilder.getTrack("Magenta");
 		Train train = new Train(track.getEndX()+100,track.getEndY()-25);
+		Train2 train2 = new Train2(track2.getStartX()-100,track2.getStartY()-25);
 		root.getChildren().add(train.getImageView());
+		root.getChildren().add(train2.getImageView());
 
-		for(CrossingGate gate: mapBuilder.getAllGates())
-			train.addObserver(gate);
-
+		train.addObserver(mapBuilder.getGate("Gate1"));
+		train.addObserver(mapBuilder.getGate("Gate2"));
+		train2.addObserver(mapBuilder.getGate("Gate3"));
+		train2.addObserver(mapBuilder.getGate("Gate4"));
 		// Sets up a repetitive loop i.e., in handle that runs the actual simulation
 		new AnimationTimer(){
 
@@ -56,14 +61,17 @@ public void handle(long now) {
 
 				createCar();
 				train.move();
+				train2.move();
 
 				for(CrossingGate gate: mapBuilder.getAllGates())
 					gate.operateGate();
 
 				if (train.offScreen())
 					train.reset();
-
-				clearCars();				
+				if (train2.offScreen())
+					train2.reset();
+
+				clearCars();
 			}
 		}.start();
 	}

src/edu/nd/sarec/railwaycrossing/model/infrastructure/MapBuilder.java

@@ -30,21 +30,26 @@ public MapBuilder(){
 	private void buildRoads(){
 		roads.put("Western Highway",new Road(new Point(800,0),new Point (800,1000),Direction.SOUTH,true,false));
 		roads.put("Skyway",new Road(new Point(400,0),new Point (400,1000),Direction.SOUTH,true,false));		
-		roads.put("EastWest",new Road(new Point(415,800),new Point (785,800),Direction.EAST,true,true));	
+		roads.put("EastWest",new Road(new Point(415,630),new Point (785,630),Direction.EAST,true,true));	
 	}
 
 	private void buildCrossingGates(){
-		gates.put("Gate1", new CrossingGate(780,480, "Gate1"));
-		gates.put("Gate2", new CrossingGate(380,480, "Gate2"));		
+		gates.put("Gate1", new CrossingGate(780,340, "Gate1"));
+		gates.put("Gate2", new CrossingGate(380,340, "Gate2"));
+		gates.put("Gate3", new CrossingGate(780,540, "Gate3"));
+		gates.put("Gate4", new CrossingGate(380,540, "Gate4"));	
 	}
 
 	private void buildTracks(){
-		tracks.put("Royal", new RailwayTracks(new Point(0,500),new Point(1200,500)));
+		tracks.put("Royal", new RailwayTracks(new Point(0,360),new Point(1200,360)));
+		tracks.put("Magenta", new RailwayTracks(new Point(0,560),new Point(1200,560)));
 	}
 
 	private void assignGatesToRoads(){
 		roads.get("Western Highway").assignGate(gates.get("Gate1"));
 		roads.get("Skyway").assignGate(gates.get("Gate2"));
+		roads.get("Western Highway").assignGate(gates.get("Gate3"));
+		roads.get("Skyway").assignGate(gates.get("Gate4"));
 	}
 
 	private void buildCarFactories(){
@@ -56,6 +61,10 @@ public Collection<CrossingGate> getAllGates(){
 		return gates.values();
 	}
 
+	public CrossingGate getGate(String gate){
+		return gates.get(gate);
+	}
+
 	public Collection<RailwayTracks> getTracks(){
 		return tracks.values();
 	}
@@ -64,7 +73,11 @@ public Collection<Road> getRoads(){
 		return roads.values();
 	}
 
+	public Road getRoad(String road){
+		return roads.get(road);
+	}
+
 	public RailwayTracks getTrack(String name){
-		return tracks.get("Royal");
+		return tracks.get(name);
 	}
 }