eab41315c5
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
760f1ed5a9
Added CRC
...
- CRC checking now works
#story[782]
9 years ago
214e26ad90
Switched port back to 4942
...
#story[778]
9 years ago
6befa24302
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
3b24d35677
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
bbd725d069
Merge
9 years ago
ce47818c94
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
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
9 years ago
9c24b0840e
Changed MockInput to thread
...
#story[778}
9 years ago
3b13f5bac1
swapping sockets so mock is the server rather than visualiser
...
#story[782]
9 years ago
39d3cc7c28
Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
9 years ago
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
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]
9 years ago
c95f5377f6
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
2289936f4f
Javadoc fix to get CI running
...
#story[778]
9 years ago
f4e4a207be
Merge branch 'networkingTest' into splitIntoTwoModules
9 years ago
7d35312644
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
5f3f3770bb
Temporarily ignore out-of-bound race markers in testing.
...
#story[758]
9 years ago
04a1e70920
small refactor of the VisualiserInput to better use the decoder
...
#story[782]
9 years ago
3d284c4a2b
Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
...
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
9 years ago
ecebace9f1
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
9 years ago
7f273f8ba0
Fixed time source for visualiser, replacing local time
...
- StreamedCourse now provides start time for clock from XML
#story[782]
9 years ago
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]
9 years ago
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]
9 years ago
d29c0a9439
Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
...
#story[778]
9 years ago
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.
9 years ago
033198ca2c
Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
9 years ago
a18eb86438
Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest
9 years ago
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]
9 years ago
50cb31b85f
Moved networking code into the network module.
9 years ago
06d786d581
Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules
...
# Conflicts:
# mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
# Selected copy from splitIntoTwoModules.
9 years ago
538f1bd6ba
removed all putInt and putShort methods for byte buffers to fix tests
...
#story[778]
9 years ago
7dd07b470a
update byte to int methods in decoders
...
#story[778]
9 years ago
137e85e14c
Merge remote-tracking branch 'origin/networkingTest' into networkingTest
9 years ago
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
9 years ago
246420ccf9
fixed bug with heartbeat
...
#story[778]
9 years ago
949b967abb
visualiserInput update as well as refactor of number to bytes conversion
...
#story[778]
9 years ago
bd7fefd67e
Worked on the MockOutput Class
...
-Renamed TCPclient to MockOutput
-Renamed TCPserver toVisualiserInput
-set up a heartbeat message to send every 5 seconds
-set up a method for mockoutput to handle xml strings
-minor edits to VisualiserInput to print the data it gets
#story[778]
9 years ago
8223ae46a1
Fixed some issues
...
- Fixed issue where everything was inputted as an integer when converting to a byte array.
- Seperated loops that are used often to make it more readable.
#story[782]
9 years ago
413ab7b768
Added Tests for bytesToLong
...
- Tested for Bytes to long
- Fixed little endian and big endian being thewrong way around.
#story[782]
9 years ago
df871b1242
Added tests to fix ByteConverter
...
- Integers cutting and chopping now works
- Integer to bytes word
- bytes to integer also work
#story[782]
9 years ago
be9f02997e
Fixed issue where the new XML Decoder funtion was changed
...
- Changed String XML Message to InputSource
#story[782]
9 years ago
7b4a428574
Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest
9 years ago
7d7564ce15
Added being able to decode everything into their respective classes
...
- Made classes for Heartbeat message, race status message, xml messag,e racestartstatus message, boat location message, mark rounding message, course wind message, average wind message.
- Made a statci calculation class for calculating bytes to int or long
- Message Decoder now kinda works!
#story[782]
9 years ago
1e3b816ff5
Added tests for BoatData and RaceData
...
#story[778]
9 years ago
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
073102d1a3
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
e30aa02aac
Commented and javadoc-ed RegattaData and BoatData
...
#story[9]
9 years ago
19224ba840
Refactored RegattaData
...
#story[778]
9 years ago
ba5c965fd6
Refactored BoatData
...
#story[778]
9 years ago
Fan-Wu Yang
Erika Savell
Joseph Gardner
hba56
cbt24
fjc40