michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Haoming Yin
2017-03-08 13:33:22 +13:00
parent 2b464d16f9 4a0776fcda
commit 2adf39ee43
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/Event.java
+1 -2
View File
@@ -93,8 +93,7 @@ public class Event {
*/
public String getEventString(){
String currentHeading = Integer.toString(this.getLeg().getHeading());
String velocityKnots = String.format("%1.2f", this.getBoat().getVelocity() * 1.943844492); // Convert meters/second to knots
return (this.getTimeString() + ", " + this.getBoat().getTeamName() + " passed " + this.getLeg().getMarkerLabel() + " going heading " + currentHeading + " at " + velocityKnots + " knots.");
return (this.getTimeString() + ", " + this.getBoat().getTeamName() + " passed " + this.getLeg().getMarkerLabel() + " going heading " + currentHeading + "°");
}
}
src/main/java/seng302/Race.java
+3 -1
View File
@@ -113,7 +113,9 @@ public class Race {
System.out.println("######################");
for (int i = 0; i < numberOfBoats; i++) {
System.out.println(boats[i].getTeamName());
String velocityKnots = String.format("%1.2f", boats[i].getVelocity() * 1.943844492);
System.out.println(boats[i].getTeamName() + " Velocity: " + velocityKnots);
}
}