fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
516 Commits 1 Branch 0 Tags
a13899b6a7e281524db41f2a0f0b2a95d2cb3e4b
Commit Graph
47 Commits
Author SHA1 Message Date
Joseph Gardner a13899b6a7 Implemented and tested to check if a point is inside or outside of a boundary using a ray tracing algorithm. The function is public static for a GPSCoordinate and takes a list of GPSCoordinates and the comparing coordinate. #story[873] 2017-05-11 14:40:24 +12:00
fjc40 693da8a82a Removed some unneccessary code and comments from PolarParser.parse(...). 
Fixed a bug where the polar parser would attempt to insert (wind speed, windspeed, windangle) instead of (windspeed, windangle, boatspeed).
Removed some unused constructors from RaceXMLReader, and fixed a bug where it wouldn't actually use the polar table correctly.
Boat's constructor now expects a Polars table.
Added some comments to the Polars class, and specified the HashMap's template parameters
Added PolarsTest - which needs to be implemented properly when the VMG calculations have been added.

#story[900]
 2017-05-10 17:21:18 +12:00
hba56 4f8d6b14d4 updated app class to read the polar csv and pass it off to its parser 
#story[900]
 2017-05-10 15:46:01 +12:00
hba56 245914a69e added the polars csv 
#story[900]
 2017-05-10 15:26:43 +12:00
fjc40 aeee8ca748 Added polar data file. 
Added PolarParse class - currently commented out as it depends on polar table class.

#story[900]
 2017-05-10 15:11:51 +12:00
hba56 a4480f3ccf removed the get best heading method as it was incorrect and not related to this story 
#story[900]
 2017-05-10 14:25:06 +12:00
hba56 5b010cad49 added the polar class for storing polars 
#story[900]
 2017-05-10 13:45:09 +12:00
David Wu 545ef7aa7f Fix lobby not entering race when race status is "started". 
-Race was previously stuck in lobby screen when race status was not 2.

#Story[782]
 2017-05-04 13:36:39 +12:00
Erika Savell 049f0f7331 Changed main loop so boats are looped through with a different starting boat 
-This was necessary because one boat (the last one to be processed) would lag and jump, as sometimes there was not enough time for all location messages to be sent before the next lot were added.
- The solution was to add a boatOffset, which means while the boats are still  processed with3 coming after 2 coming after 1 etc, the loop starts with boat 0, then the next run through it wiull start with boat 1 and so on.

-This eliminated the lag (or at least spread it evenly across all the boats)

#story[778]
 2017-05-02 19:50:12 +12:00
hba56 8bbea28cab refactored the boat message to not use boats 
#story[778]
 2017-05-01 17:35:30 +12:00
Joseph Gardner 9eefbbd7fa Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 16:51:48 +12:00
Joseph Gardner 8117e11ff2 Merge branch 'NetworkedVisualiser' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-01 16:51:03 +12:00
David Wu 4811b7f4ea Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	mock/src/test/java/seng302/Model/RaceTest.java
 2017-05-01 16:39:26 +12:00
David Wu 0bfc9a5a39 Added test for race dnf in Race class. 
-Unable to test animation timer.

#story[778]
 2017-05-01 16:37:55 +12:00
Erika Savell 9acd519d7b Removed the rest of the shared model classes needed by mock 
#story[778]
 2017-05-01 15:49:07 +12:00
cbt24 ccbe467090 Synchronised GUI with VisualiserInput thread. 
- Made StreamedCourse extend Observable
- Initialised StartController after data pulled from network
- Moved VisualiserInput to visualiser module
- Deleted Networking subpackage from visualiser module

#story[782]
 2017-05-01 15:21:12 +12:00
Erika Savell 3f748bfdb6 Removed BoatInRace from shared model, refactored 
#story[778]
 2017-05-01 15:06:56 +12:00
Erika Savell 7e569b59b7 Commenting out tests just to get CI working, will investigate on different branch 
#story[778]
 2017-04-30 21:26:57 +12:00
Erika Savell 2320675b7e Fixing build 
#story[778]
 2017-04-30 21:23:52 +12:00
Erika Savell 0126d29524 Fixing some of the SharedModel/seng302 import conflicts 
-Am really not liking the SharedModel structure, think reverting back to original structure is worth discussing

story[778]
 2017-04-30 21:21:09 +12:00
Erika Savell 067beed1e3 Attempted to write test for calls to MockOutput 
-Struggling because we use animation timers to run the race, and these don't seem to work from a JUnit context

#story[778]
 2017-04-30 20:55:40 +12:00
Erika Savell b1bbef814b Switching to use networking modules 
#story[778]
 2017-04-28 12:43:14 +12:00
fjc40 d29c0a9439 Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages. 
#story[778]
 2017-04-28 01:30:03 +12:00
fjc40 90f8bec415 Moved several classes from seng302.model to its own module - sharedModel (this is supposed to contain any shared data model code between mock and visualiser). Specifically, Regatta, Boat, BoatInRace, Constants, GPSCoordinate, Leg, Marker. 
Updated RaceVisionByteEncoder.raceStatus to accept a Racestatus object rather than a bunch of parameters.
Added getters to RaceStatus class.
Updated some tests.
Removed Network tests from Mock, as they were duplicated.
 2017-04-28 01:27:45 +12:00
Erika Savell 1e3b816ff5 Added tests for BoatData and RaceData 
#story[778]
 2017-04-25 17:59:06 +12:00
Erika Savell 83dfe1a60c Renamed some directories, optimized imports, general code clean up 
#story[778]
 2017-04-25 17:41:10 +12:00
Erika Savell 073102d1a3 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 17:19:28 +12:00
Erika Savell 19224ba840 Refactored RegattaData 
#story[778]
 2017-04-25 16:56:11 +12:00
Erika Savell 3542827c29 Refactored RaceData class 
#story[778]
 2017-04-25 15:20:49 +12:00
Erika Savell 03f63b2c61 Added boat data xml tests 
#story[778]
 2017-04-25 14:42:14 +12:00
Joseph Gardner 26380f2677 Merge branch 'story30_XMLs' into splitIntoTwoModules 2017-04-25 14:01:09 +12:00
Erika Savell 6a35c40f77 Commented out test causing CI issues 
#story[778]
 2017-04-25 13:04:30 +12:00
Erika Savell a9f98b48b2 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 13:00:21 +12:00
hba56 e9578fc63b refactored networking code from networkingTest 
#story[778, 782]
 2017-04-25 12:38:13 +12:00
David Wu d14446a12e Added extra constructor in Race. 
-Constructor is used for junit testing for Race class.

#story[778]
 2017-04-25 12:24:39 +12:00
David Wu 0fd4de7ec7 Fixed previously broken tests due to refactoring app. 
-ConstantVelocityRace doesn't exist anymore so tests had to be change to compensate for this.
-Boat in race had to be change due to the addition of the sourceID for each boat.

#story[778]
 2017-04-25 12:00:44 +12:00
zwu18 c5df90d276 Created RegattaDataSource and regattaTest.xml. 
-Event regattaData will now get data from the XML instead of having static data.

#story[778]
 2017-04-23 19:59:07 +12:00
Erika Savell 3ff2a07680 Temporarily ignored some tests in mock 
#story[778]
 2017-04-21 17:08:28 +12:00
Erika Savell c365d5a344 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 17:01:23 +12:00
David Wu 5397d14d3c Added sourceID to boats in race. 
-All boats in race will now have a sourceID.
-SourceID will be used in XML object for boat.

#story[778]
 2017-04-21 16:22:23 +12:00
Erika Savell 737755def6 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 15:33:47 +12:00
Erika Savell 94ba18cf0c Began xml creator for race info message 
#story[778]
 2017-04-21 15:33:37 +12:00
David Wu 687ffb41e6 Create XML object of boat data. 
-XML object currently displaying out in terminal.
-Reads in data from RaceDataSource.
-TODO: Add sourceID to boats.

#story[778]
 2017-04-21 14:19:49 +12:00
David Wu 265bece9ed Added a heartbeat value to the race. 
-Heartbeat will display and update every 5 seconds.

#story[778]
 2017-04-21 13:10:46 +12:00
Erika Savell 97c5c9662b Wrapped race in an event which sends out starting xml files 
#story[778]
 2017-04-21 13:10:30 +12:00
Joseph Gardner a85bf292d5 new branch for xml readers for the visuliser 2017-04-21 12:23:02 +12:00
Erika Savell a584400e24 Actually added sub modules this time 
#story[778]
 2017-04-20 11:16:19 +12:00