fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
170 Commits 1 Branch 0 Tags
2d74cdc5dca59f778311ce7ccb1f962a08e1ff12
Commit Graph
39 Commits
Author SHA1 Message Date
zwu18 c31ea51068 Temporarily removed test for countdown timer as countdown timer now uses animation timer. 2017-04-07 03:42:16 +12:00
Erika Savell a689ffc689 Added quick descriptions to params to get javadoc working 2017-04-06 14:31:11 +12:00
Erika Savell 6866f65adf Ignoring failing test to check CI is working. 
- Test will be fixed as part of another stoy
 2017-04-06 13:53:21 +12:00
Fan-Wu Yang 795b411f08 Added some doc strings 
- Added doc strings to RaceXML
- Added a few minor changes to bermuda_AC35.xml
- Changes to the RaceXMLReader Unit Test
 2017-03-31 00:51:08 +13:00
Erika Savell ee72d85f6a removed print messages 
#story[20]
 2017-03-30 14:33:28 +13:00
Erika Savell 0e7d210cea Amended wake tests to handle markers instead of direct coordinates 
#test
 2017-03-29 22:02:24 +13:00
Erika Savell 970f0d0116 Fixed race scaling 
- Races were completed far too quickly because a set SLEEPTIME was used as the time elapsed, instead of the actual break time

#story[16]
 2017-03-29 21:51:03 +13:00
Erika Savell fb409af23b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 19:54:53 +13:00
Erika Savell 495158a621 Amended and added tests to cope with marker change 
#test #story[20]
 2017-03-29 19:47:49 +13:00
Fan-Wu Yang edd9c2a48d Merge remote-tracking branch 'origin/heading-visualisation' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/Boat.java
#	src/main/java/seng302/Model/Race.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-03-29 14:36:24 +13:00
Erika Savell 40a6801477 Marker tests added 
#story[20]
 2017-03-29 12:37:53 +13:00
Erika Savell eb4c02557d Changing xml reader to take both coordinates of a marker 
- Have commented out tests for now because  a lot of rearranging and fixing needed

#story[20]
 2017-03-29 12:08:40 +13:00
Erika Savell d1d46f2cf5 Created Marker class 
- Holds the start and end coordinate of a gate or marker, and has a method to calculate the middle point
- Each leg will hold a start Marker and end Marker

#story[20]
 2017-03-29 11:16:37 +13:00
Erika Savell 2d2f4692a9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-28 14:42:22 +13:00
Erika Savell bb6b881392 Adding end coords to get test running gain 
#story[20]
 2017-03-28 14:38:08 +13:00
Fan-Wu Yang 879de9869b Implemented XML Reader 
-XMLReader class for generic XML Reading Created
- RaceXML Reader class made specifically for reading races
- RaceController COnstants now replced with XML file
#implement
 2017-03-27 02:09:59 +13:00
Erika Savell 306e98172b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into heading-visualisation 2017-03-25 22:11:31 +13:00
Erika Savell bd86690e85 Filled in javadoc, optimised imports, rearranged code 
#refactor #story[16]
 2017-03-25 21:49:43 +13:00
Connor Taylor-Brown e8cd9b2ee8 Implemented wake visualisation for each boat 
- Added and tested wake calculation for BoatInRace
- Draws boat in canvas between start and entering Finish leg
- Allow boat velocity to be set after initialisation for testing
#story [21]
 2017-03-25 20:41:16 +13:00
Erika Savell f5ba7c95c8 Fixing merge and resulting failing tests 
#fix #story[16]
 2017-03-25 19:01:03 +13:00
Erika Savell d23a80841a Tests for race clock being scaled correctly added 
#story[16] #test
 2017-03-24 11:57:54 +13:00
Erika Savell 944da81946 Test that boat velocities are being scaled correctly added 
#story[16] #implement
 2017-03-23 17:37:52 +13:00
Erika Savell 4c82a4594e Added a small test for the timer function 
-More needed once scaling is in effect

#test #story[16]
 2017-03-23 13:41:14 +13:00
Erika Savell 1c6bed7f37 Tests for the Race class added 
-Mostly to do with checking positions and updating correctly

#test #story 9
 2017-03-22 14:12:45 +13:00
Erika Savell df8b711cf5 Tests for BoatInRace, imported Mockito 
#test #story[24]
 2017-03-22 13:35:47 +13:00
Erika Savell 393fae2ec4 Tests for calculating leg distance and updating boat positions added 
#story[9] #test
 2017-03-22 11:03:16 +13:00
Erika Savell 74a9b1499c Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9 2017-03-22 10:09:09 +13:00
Erika Savell 0387bdc597 Tests for genreating new coordinate added 
#test #story[9]
 2017-03-22 10:07:14 +13:00
Connor Taylor-Brown 26f7b94e13 Fixed finish order 
- Added test to check order is determined by velocity
- Modified Race class to allow for unit testing

#story[15]
 2017-03-20 20:18:32 +13:00
Erika Savell a9601eb760 Switched latitude/longitude around 
We were using latitude on the x plane and longitude on the y plane

#story[9] #fix
 2017-03-20 16:40:32 +13:00
Erika 195ee10473 Added two test boats to race 
#story[9] #implement
 2017-03-19 23:05:18 +13:00
Erika cf5de5962a Loaded the rest of the legs of the bermuda course in as an example race 
#story[9] #implement
 2017-03-19 21:30:49 +13:00
Erika 192178760e Boat moves between legs and finishes 
- Have hard coded in first two legs
-Possibly found problem with lat and longitude coordinate system being switched
#story[9]
 2017-03-19 14:14:53 +13:00
Erika Savell e6e59e2df9 Changed POM file to recognise project as team-7 
-We had two project names, 'app' and 'team-7', which was causing problems with maven

#fix #story9
 2017-03-17 15:54:01 +13:00
cbt24 b25389f212 Implemented list of boats in order of last feature passed. 
- Update controller every time boats pass a mark
- Cleared info table to force update
#story [15]
 2017-03-17 13:29:33 +13:00
Erika Savell 1284cac68e Importing geotools library to calculate next coordinate for boat 
-Currently getting ClassDefNotFound error
- I think one of th elibraries dependencies is visible and compile time not runtime

#story[9] #implement
 2017-03-17 13:03:27 +13:00
Erika Savell 8090108b12 Began implementing function to calculate boat's new coordinates 
-Using haversine function
-current values being produced are too small

#implement #story[9]
 2017-03-16 16:40:34 +13:00
Erika Savell 2551dd7362 Added single test to debug race process 2017-03-15 22:02:13 +13:00
SENG302 9649f67863 initial commit 2016-03-01 19:08:07 +13:00