fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
339 Commits 1 Branch 0 Tags
f4e4a207bebec62f05640d96c3a223b98600c7f8
Commit Graph
339 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
hba56 246420ccf9 fixed bug with heartbeat 
#story[778]
 2017-04-27 15:53:38 +12:00
hba56 949b967abb visualiserInput update as well as refactor of number to bytes conversion 
#story[778]
 2017-04-27 15:33:23 +12:00
hba56 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]
 2017-04-26 14:38:57 +12:00
Fan-Wu Yang 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]
 2017-04-25 20:25:56 +12:00
Fan-Wu Yang 413ab7b768 Added Tests for bytesToLong 
- Tested for Bytes to long
- Fixed little endian and big endian being thewrong way around.
#story[782]
 2017-04-25 19:57:14 +12:00
Fan-Wu Yang df871b1242 Added tests to fix ByteConverter 
- Integers cutting and chopping now works
- Integer to bytes word
- bytes to integer also work
#story[782]
 2017-04-25 19:40:20 +12:00
Fan-Wu Yang be9f02997e Fixed issue where the new XML Decoder funtion was changed 
- Changed String XML Message to InputSource
#story[782]
 2017-04-25 18:36:39 +12:00
Fan-Wu Yang 7b4a428574 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-25 18:29:11 +12:00
Fan-Wu Yang 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]
 2017-04-25 18:29:05 +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 e30aa02aac Commented and javadoc-ed RegattaData and BoatData 
#story[9]
 2017-04-25 17:19:04 +12:00
Erika Savell 19224ba840 Refactored RegattaData 
#story[778]
 2017-04-25 16:56:11 +12:00
Erika Savell ba5c965fd6 Refactored BoatData 
#story[778]
 2017-04-25 16:45:39 +12:00
Joseph Gardner c328c4f3bc Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782] 2017-04-25 16:06:24 +12:00
cbt24 cb40302c13 Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules 2017-04-25 15:56:44 +12:00
cbt24 1653003cf0 Implemented Leg generation from Race.xml format 
- StreamedCourse now utilises StreamedCourseXMLReader as data source

#story[758]
 2017-04-25 15:51:44 +12:00
hba56 0257b9e18c Changed the temp tcp client and server to send packets made by us and other fixes 
-xmlmessagedecoder now outputs a inputsource for the vis team
-tests fixed for the new xmlmessagedecoder
-tcpclient now generates a packet encoded by our methods and sends it
-tcpserver now recieves a packet encoded by us and prints out some of its info

#story[778, 782]
 2017-04-25 15:34:49 +12:00
Erika Savell 302f2c6869 Javadoc and commented RaceData class 
#story[778]
 2017-04-25 15:34:29 +12:00
Erika Savell 3542827c29 Refactored RaceData class 
#story[778]
 2017-04-25 15:20:49 +12:00
Joseph Gardner 84c518f89f Timer now shows and updates correctly on the start menu. #story[761] 2017-04-25 15:04:42 +12:00
Fan-Wu Yang b346e10774 Refactored Constructors 
- Constructors after adding AC35Data as a parent were failing as they took in an extra parameter
story[782]
 2017-04-25 14:43:37 +12:00
Erika Savell 03f63b2c61 Added boat data xml tests 
#story[778]
 2017-04-25 14:42:14 +12:00
Fan-Wu Yang c0bf5b1641 Added Decoding testing and splitting 
- Binary Message Decoder now can determine whether the files are correct or not
- Boat Location Message is now a extension of AC35Data which will be read by the TCPClient
- Boat Status is now an extension of AC35Data which will be read by the TCPClient
- CourseWind is now an extension of AC35Data which will be read by TCPClient
- ValueOf static method added MessageType to assist in determining the packet that was received.
- Race Message is now an extension of AC35Data which will be read by TCPClient
- PacketDumpReader created to read the sample file that was provided.
- AC35Packet has been made to store each Dumped file packet.
- AC35 Data Dump has been added to resources/dataDumps as ac35.bin
#story[782]
 2017-04-25 14:26:58 +12:00
Joseph Gardner 26380f2677 Merge branch 'story30_XMLs' into splitIntoTwoModules 2017-04-25 14:01:09 +12:00
Joseph Gardner e89a269565 initialised time in raceclock (1 line) 2017-04-25 14:00:41 +12:00
Erika Savell d05d7271fc Removed output stream, started refactoring BoatDataClass 
#story[778]
 2017-04-25 13:28:48 +12:00
Joseph Gardner a3e87f2c61 Got rid of test using a deprecated method 2017-04-25 13:20:10 +12:00
Joseph Gardner ea79f47c83 Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs 2017-04-25 13:15:23 +12:00
Joseph Gardner 3461a2c0b7 Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782] 2017-04-25 13:14:59 +12:00
cbt24 858db3f45e Fixed interface implementation for StreamedCourse 
#story[758]
 2017-04-25 13:08:57 +12:00