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
c328c4f3bc
Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
9 years ago
cb40302c13
Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules
9 years ago
1653003cf0
Implemented Leg generation from Race.xml format
...
- StreamedCourse now utilises StreamedCourseXMLReader as data source
#story[758]
9 years ago
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]
9 years ago
302f2c6869
Javadoc and commented RaceData class
...
#story[778]
9 years ago
3542827c29
Refactored RaceData class
...
#story[778]
9 years ago
84c518f89f
Timer now shows and updates correctly on the start menu. #story[761]
9 years ago
b346e10774
Refactored Constructors
...
- Constructors after adding AC35Data as a parent were failing as they took in an extra parameter
story[782]
9 years ago
03f63b2c61
Added boat data xml tests
...
#story[778]
9 years ago
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]
9 years ago
26380f2677
Merge branch 'story30_XMLs' into splitIntoTwoModules
9 years ago
e89a269565
initialised time in raceclock (1 line)
9 years ago
d05d7271fc
Removed output stream, started refactoring BoatDataClass
...
#story[778]
9 years ago
a3e87f2c61
Got rid of test using a deprecated method
9 years ago
ea79f47c83
Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs
9 years ago
3461a2c0b7
Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]
9 years ago
858db3f45e
Fixed interface implementation for StreamedCourse
...
#story[758]
9 years ago
6a35c40f77
Commented out test causing CI issues
...
#story[778]
9 years ago
a59342a668
Modified RaceClock to support arbitrary start times
...
- Amended RaceDataSource interface to require time instead of mark for calculating time.
#story[758]
9 years ago
a9f98b48b2
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
744caf0d29
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
e9578fc63b
refactored networking code from networkingTest
...
#story[778, 782]
9 years ago
d14446a12e
Added extra constructor in Race.
...
-Constructor is used for junit testing for Race class.
#story[778]
9 years ago
d960bc67a2
refactored networking code
...
#story[778, 782]
9 years ago
896589d1a5
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
0719720585
Moved boat xml creation from Event class to BoatData class
...
#story[778]
9 years ago
c2183a68a0
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
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]
9 years ago
67b73ec1db
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
fjc40
hba56
Fan-Wu Yang
Erika Savell
Joseph Gardner
cbt24
David Wu