Commit Graph

1345 Commits

Author SHA1 Message Date
Haoming Yin 2adf39ee43 Merge remote-tracking branch 'origin/master' 2017-03-08 13:33:22 +13:00
Haoming Yin 2b464d16f9 Fixed some bugs
/#pair[hyi25, mra106]
2017-03-08 13:31:44 +13:00
Michael Rausch 4a0776fcda Merge branch 'add-speed-to-starting-list' into 'master'
Moved boat velocity to starting list

Tags: #fix

See merge request !12
2017-03-08 13:29:13 +13:00
Michael Rausch bc6762d2dd Moved boat velocity to starting list
Tags: #fix
2017-03-08 13:28:00 +13:00
Michael Rausch 88167773dd Merge branch 'story-7' into 'master'
Race events now display the boats heading and direction

- The boats velocity is being read from the config file
- The event text is now being printed when the leg starts #fix

Tags: #story[7] #implement

See merge request !11
2017-03-08 12:34:27 +13:00
Michael Rausch ab1445f1c2 Race events now display the boats heading and direction
- The boats velocity is being read from the config file
- The event text is now being printed when the leg starts #fix

Tags: #story[7] #implement
2017-03-08 12:31:31 +13:00
Haoming Yin 76faa53222 Merge branch 'calculate-time' into 'master'
Calculate time



See merge request !10
2017-03-07 21:33:12 +13:00
Haoming Yin 78dea7daac Added function to generate events for race
- added generateEvents() for creating event into a priority queue
- added iterateEvents() to pull out events when time passing
- changed default velocity to 70 just for testing. Pls change it back after testing

#story[5] #implement
2017-03-07 21:30:48 +13:00
Haoming Yin 17fbb1212d Added Event class and junit test
- event class contains the time of specific event, related team/boat and even location eg. leg.

#implement #story[5]
2017-03-07 20:30:23 +13:00
Haoming Yin a3c1630e2e Updated boat class constructor
- add a new constructor to accept boat velocity

#story[6]
2017-03-07 20:28:45 +13:00
Haoming Yin 5c362245a4 Added velocity related methods into Boat class.
- added setVelocity() and getVelocity()

#story[6]
2017-03-07 19:34:37 +13:00
Haoming Yin 6ce9674e64 Added method to calculate distance travelled given velocity
- added getDistanceTravelled(velocity) to calculate how far a boat has travelled
- added startTime for calculating time elapse between start point and enquiry point

#story[6]
2017-03-07 00:25:10 +13:00
Haoming Yin da896cddfd Merge branch 'update-app-to-read-team' into 'master'
Updated App class to read team names

- updated app class so that it reads an array of maps containing team names

See merge request !9
2017-03-06 22:23:45 +13:00
Haoming Yin f2c2f84b4c Updated App class to read team names
- updated app class so that it reads an array of maps containing team names
2017-03-06 22:17:38 +13:00
Haoming Yin 8284d32e23 Merge branch 'set-config-file' into 'master'
Added updated config file within team name, velocity and race-size.

- Changed ‘teams’ to an array containing maps of each team. In each team map, it contains team name and boat velocity.
- Added race size which represents how many boats would compete during a race.

#story[7] #story[8]

See merge request !8
2017-03-06 21:54:06 +13:00
Haoming Yin 0e562a38e2 Merge branch 'update-parser' into 'master'
Update parser



See merge request !7
2017-03-06 21:51:02 +13:00
Haoming Yin 85b8047229 Updated FileParser to read team name, boat velocity, and race size.
- minor code rearrange for readFile()
- changed getTeam() to read to an array of team maps, where map contains team name and boat velocity
- added getTotalNumberOfTeams() to get the total number of teams in file
- added getRaceSize to get the the number of boat competing in a race

#implement #story[6] #story[8]
2017-03-06 21:44:31 +13:00
Haoming Yin c9b0942e07 Updated unit test for future FileParser
- changed valid file test case

#test
2017-03-06 21:39:53 +13:00
Haoming Yin 90aed14ddc Updated test file for unit test
- added race size represented the number of teams who would compete in a race
- changed teams to an array containing maps of each team within team name and boat velocity

#test #story[8] #story[6]
2017-03-06 21:38:25 +13:00
Michael Rausch fd2b473a7e Merge branch 'story-4' into 'master'
Story 4



See merge request !6
2017-03-06 19:39:54 +13:00
Michael Rausch 9b1d90d2bf Added a class for the marker, and added documentation
- Added documentation for the Race class
- Added a class for the Marker instead of just storing the name of the marker in a string

Tags: #docs #implement #story[4]
2017-03-06 19:31:25 +13:00
Michael Rausch 8c0cc67ae3 Add tests for the Leg class
Tags: #test #story[4]
2017-03-06 19:29:47 +13:00
Haoming Yin 33efe57ba4 Added updated config file within team name, velocity and race-size.
- Changed ‘teams’ to an array containing maps of each team. In each team map, it contains team name and boat velocity.
- Added race size which represents how many boats would compete during a race.

#story[7] #story[8]
2017-03-06 18:40:39 +13:00
Michael Rausch 9453307fd4 Implemented leg class and added legs to the race
- #implement
2017-03-06 17:56:07 +13:00
Michael Rausch 597c1ae955 Merge branch 'use-config-file-to-load-boats' into 'master'
Added method to create the race with names from the config file

- # implement

See merge request !5
2017-03-06 12:10:17 +13:00
Michael Rausch 764aac4b7c Added method to create the race with names from the config file
- # implement
2017-03-06 12:07:21 +13:00
Haoming Yin 075395919c Merge branch 'file-parser' into 'master'
File parser



See merge request !4
2017-03-06 11:07:25 +13:00
Haoming Yin c197083d7c Created FileParser class
- Created FileParser class which processes team setting file in Json format.
- Implement get** methods, which extract information from setting file more efficient.
- Took more time than expected because need to learn Json-simple dependency first.
\#story[3]
2017-03-05 22:08:15 +13:00
Haoming Yin b9b3409591 Added tests for FileParser class, as well as test files 2017-03-05 21:21:22 +13:00
Haoming Yin 62fe8a3e01 Added Json-simple dependency to Maven 2017-03-05 18:01:37 +13:00
Michael Rausch e6d899f7b1 Fixed a test for the Race class
- Fixed a typo causing the test to fail
- #test #fix
2017-03-04 19:34:36 +13:00
Michael Rausch c1cc4f8b69 Merge branch 'story1-team-names' into 'master'
Now displays the names of teams entered into the race



See merge request !3
2017-03-04 19:32:33 +13:00
Michael Rausch 1b345d4747 Added tests for the Race class
- Added a test to ensure all boats entered into the race also finish it
- #test
2017-03-04 19:30:00 +13:00
Michael Rausch 5492ace1a3 Display the boats competing in the race
- Moved displayStartingBoats() and displayFinishingOrder() into the Race class
- Display the competing boats when the application starts

- #implement
2017-03-04 19:13:01 +13:00
Michael Rausch d4deedcf6b Merge branch 'create-race-class' into 'master'
Create race class



See merge request !2
2017-03-03 18:44:14 +13:00
Michael Rausch 6702d24fd5 Display the order the boats finished in
- Added a function in the App class to display the order in which the boats finished the race

 #implement
2017-03-03 18:39:15 +13:00
Michael Rausch 4b2141190d Added tests for the Race class #test 2017-03-03 18:23:24 +13:00
Michael Rausch 33994bd3e4 Implemented 'Race' class
- Boats can be added to a race
- calling getFinishedBoats() will return a list of boats in the order that they finished
2017-03-03 18:06:51 +13:00
Michael Rausch 45eec5a288 Added personal email address to .mailmap 2017-03-03 16:32:37 +13:00
Michael Rausch c72ec1b923 Merge branch 'create-team-class' into 'master'
Created boat class & tests



See merge request !1
2017-03-03 16:24:07 +13:00
Michael Rausch 527afdb4a9 Created boat class & tests 2017-03-03 16:22:31 +13:00
SENG302 7ef64ad7a0 Moved CI runner set-up instructions to student guide. 2017-02-03 00:22:39 +13:00
SENG302 fea7c98874 Added .mailmap file (includes basic info for students) 2016-07-31 14:50:37 +12:00
SENG302 bf3a0eb713 update maven pom
embed properties that were in a local settings.xml
fix tag names and properties that have changed from maven 2 and new plugin versions
specify compiler plugin version.
2016-03-02 12:57:45 +13:00
SENG302 9649f67863 initial commit 2016-03-01 19:08:07 +13:00