fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
421 Commits 1 Branch 0 Tags
d2e08fa8e11ed1ccf77d40ffc44435acc82fb3af
Commit Graph
421 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Gardner 10dd066302 Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782] 2017-05-01 14:15:34 +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 c972dd7caf Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-30 21:20:04 +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 bbd282bd9b Set race to send out status messages (including boat location details) 
- Untested, so not sure of accuracy yet

#story[778]
 2017-04-30 20:18:04 +12:00
Fan-Wu Yang c3717b7fc5 Added Classes to help Visualiser 
- Added Get Boat GPS Coordinate
- Added Get Heading as Degrees
- Added Get True Wind Angle as Degrees
#story[782]
 2017-04-29 18:26:02 +12:00
Connor Taylor-Brown 06e65c2cd2 Generate StreamedCourse from VisualiserInput 
- Allow Race to get boat location messages (added last commit)
- Removed faulty import statement (this commit)

#story[782]
 2017-04-28 20:33:58 +12:00
Connor Taylor-Brown 68a8f64fd3 Generate StreamedCourse from VisualiserInput 
#story[782]
 2017-04-28 20:29:03 +12:00
Erika Savell e2f3abffc6 WIP adding race status messages 
#story[778]
 2017-04-28 18:11:28 +12:00
Fan-Wu Yang 8569d3f2dc Added a few decoders and unit converters 
- Units can be converted from int to degrees as a double
- XML message now keeps the most recent XML file
#story[782]
 2017-04-28 17:00:04 +12:00
hba56 5a972c855e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 14:32:32 +12:00
hba56 5bbdd6e00d updated the visualiserinput to be a thread 
#story[782]
 2017-04-28 14:32:25 +12:00
Fan-Wu Yang eab41315c5 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 13:44:19 +12:00
Fan-Wu Yang 760f1ed5a9 Added CRC 
- CRC checking now works
#story[782]
 2017-04-28 13:44:14 +12:00
hba56 db4792452f added run statement to mock thread 
#story[782]
 2017-04-28 13:34:50 +12:00
Erika Savell 214e26ad90 Switched port back to 4942 
#story[778]
 2017-04-28 13:30:19 +12:00
Erika Savell 6befa24302 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 13:27:53 +12:00
Joseph Gardner 3b24d35677 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 13:27:38 +12:00
Joseph Gardner bbd725d069 Merge 2017-04-28 13:27:32 +12:00
Erika Savell ce47818c94 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 13:27:27 +12:00
Joseph Gardner d977d3f146 Merge branch 'visualiserAndDataLink' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Controllers/StartController.java
#	visualiser/src/main/java/seng302/Mock/BoatXMLReader.java
#	visualiser/src/main/java/seng302/Mock/StreamedBoat.java
#	visualiser/src/main/java/seng302/Mock/StreamedCourse.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/BoatInRace.java
#	visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java
#	visualiser/src/main/java/seng302/Model/Race.java
#	visualiser/src/main/java/seng302/RaceXMLReader.java
#	visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java
 2017-04-28 13:26:12 +12:00
Erika Savell 9c24b0840e Changed MockInput to thread 
#story[778}
 2017-04-28 13:18:07 +12:00
hba56 3b13f5bac1 swapping sockets so mock is the server rather than visualiser 
#story[782]
 2017-04-28 13:17:01 +12:00
Joseph Gardner 39d3cc7c28 Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782] 2017-04-28 12:44:53 +12:00
Erika Savell b1bbef814b Switching to use networking modules 
#story[778]
 2017-04-28 12:43:14 +12:00
Joseph Gardner f377cf6471 Changed it so Boat can be used as a superclass for StreamedBoat and BoatInRace properly and removed ConstantVelocityRace. Everything that used to use BoatInRace or StreamedBoat now uses it superclass (boat). #pair[jjg64, cbt24] #refactor #story[782] 2017-04-28 12:35:00 +12:00
hba56 c95f5377f6 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 11:37:23 +12:00
Erika Savell 2289936f4f Javadoc fix to get CI running 
#story[778]
 2017-04-28 11:36:30 +12:00
hba56 f4e4a207be Merge branch 'networkingTest' into splitIntoTwoModules 2017-04-28 11:34:47 +12:00
cbt24 7d35312644 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-28 11:30:58 +12:00
cbt24 5f3f3770bb Temporarily ignore out-of-bound race markers in testing. 
#story[758]
 2017-04-28 11:30:50 +12:00
hba56 04a1e70920 small refactor of the VisualiserInput to better use the decoder 
#story[782]
 2017-04-28 11:30:43 +12:00
Joseph Gardner 3d284c4a2b Merge branch 'splitIntoTwoModules' into visualiserAndDataLink 
# Conflicts:
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
 2017-04-28 11:23:59 +12:00
fjc40 ecebace9f1 Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 11:22:05 +12:00
Connor Taylor-Brown 7f273f8ba0 Fixed time source for visualiser, replacing local time 
- StreamedCourse now provides start time for clock from XML

#story[782]
 2017-04-28 02:37:50 +12:00
Connor Taylor-Brown 02511db2b9 Implemented marker visualisation from XML in ResizableRaceCanvas 
- Replaced and deprecated Constants
- Added getMarkers to RaceDataSource interface
- Added boundary testing for source data

#story[782]
 2017-04-28 01:58:55 +12:00
fjc40 873089707d Fixed the RaceStatusDecoder not deserializing BoatStatus (a subobject of RaceStatus) properly. 
RaceVisionByteEncoder.heartBeat now uses a long (and grabs the low 4 bytes from it), as the streaming spec requires a 4 byte unsigned int.
#story[778] #story[782]
 2017-04-28 01:32:39 +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
Joseph 033198ca2c Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768] 2017-04-28 00:53:07 +12:00
Fan-Wu Yang a18eb86438 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-27 22:44:25 +12:00
Fan-Wu Yang 278a7dbde0 Added rare bug which would cause system crash 
- Fixed Array Index out of Bounds when they try to send a message of 9 length and it is to be turned into a number
#story[782]
 2017-04-27 22:44:21 +12:00
fjc40 50cb31b85f Moved networking code into the network module. 2017-04-27 20:28:07 +12:00
fjc40 06d786d581 Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules 
# Conflicts:
#	mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
#             Selected copy from splitIntoTwoModules.
 2017-04-27 20:02:18 +12:00
hba56 538f1bd6ba removed all putInt and putShort methods for byte buffers to fix tests 
#story[778]
 2017-04-27 16:23:31 +12:00
hba56 7dd07b470a update byte to int methods in decoders 
#story[778]
 2017-04-27 16:01:50 +12:00
hba56 137e85e14c Merge remote-tracking branch 'origin/networkingTest' into networkingTest 2017-04-27 15:59:41 +12:00
Fan-Wu Yang 1d33015925 Fixed a small array out of bounds exception error 
- Error in Byte ConverterTest where the array was pointing at the wrong place which could make an error
 2017-04-27 15:58:04 +12:00