c328c4f3bcLinked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
Joseph Gardner
2017-04-25 16:06:24 +1200
cb40302c13Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules
cbt24
2017-04-25 15:56:44 +1200
1653003cf0Implemented Leg generation from Race.xml format - StreamedCourse now utilises StreamedCourseXMLReader as data source
cbt24
2017-04-25 15:51:44 +1200
0257b9e18cChanged the temp tcp client and server to send packets made by us and other fixes
hba56
2017-04-25 15:34:49 +1200
302f2c6869Javadoc and commented RaceData class
Erika Savell
2017-04-25 15:34:29 +1200
3542827c29Refactored RaceData class
Erika Savell
2017-04-25 15:20:49 +1200
84c518f89fTimer now shows and updates correctly on the start menu. #story[761]
Joseph Gardner
2017-04-25 15:04:42 +1200
b346e10774Refactored Constructors - Constructors after adding AC35Data as a parent were failing as they took in an extra parameter story[782]
Fan-Wu Yang
2017-04-25 14:43:37 +1200
03f63b2c61Added boat data xml tests
Erika Savell
2017-04-25 14:42:14 +1200
c0bf5b1641Added 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]
Fan-Wu Yang
2017-04-25 14:26:58 +1200
26380f2677Merge branch 'story30_XMLs' into splitIntoTwoModules
Joseph Gardner
2017-04-25 14:01:09 +1200
e89a269565initialised time in raceclock (1 line)
Joseph Gardner
2017-04-25 14:00:41 +1200
3461a2c0b7Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]
Joseph Gardner
2017-04-25 13:13:15 +1200
858db3f45eFixed interface implementation for StreamedCourse #story[758]
cbt24
2017-04-25 13:08:57 +1200
6a35c40f77Commented out test causing CI issues
Erika Savell
2017-04-25 13:04:30 +1200
a59342a668Modified RaceClock to support arbitrary start times - Amended RaceDataSource interface to require time instead of mark for calculating time. #story[758]
cbt24
2017-04-25 13:00:45 +1200
0fd4de7ec7Fixed 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.
David Wu
2017-04-25 12:00:44 +1200
67b73ec1dbMerge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba56
2017-04-25 12:00:05 +1200
721fb5f28aRemoved regatta xml creation from Event class into RegattaData class
Erika Savell
2017-04-25 11:51:31 +1200
4b5ebbd9e4refactored networking code from networkingTest branch
hba56
2017-04-25 11:50:22 +1200
d995d5df45Fixed RegattaDataSource missing. -RegattaDataSource failed to push from before. It is now created and working.
David Wu
2017-04-25 11:28:28 +1200
2876eec1e4Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data.
fjc40
2017-04-25 11:24:33 +1200
22075ee415Started on the boat XML parser, reads only boat data from the XML and makes a StreamedBoat for each boat in the XML. #story[861]
Joseph
2017-04-25 02:13:57 +1200
bf5ea193afMock App now passes an OutputStream into the "Event" class. This is where data is written to (i.e., writing data over tcp socket). Updated Event and Race class to write to this stream, and added some TODO notes which point out where we need to properly serialize messages, when merged with networking code.
fjc40
2017-04-24 21:53:51 +1200
2ce84e3be4Added myself to the .mailmap file.
fjc40
2017-04-24 20:23:29 +1200
091ee4735bRace.simulateRace() function now generates a BoatLocationMessage after updating the position of each boat. Currently we just print the message to stdout. Added functions to convert knots (as a double) to mm/sec (as an int) to BoatLocationMessage class. Added toString function to BoatLocationMessage class. Added a sequence number member to the BoatInRace class. Added Knots to meters per second conversion factor to Contants class.
fjc40
2017-04-24 20:19:39 +1200
49fc4ec02eadded raceStatusDecpderTest and some debugging -added raceStatusDecpderTest -fix a problem where the encoder method for race status added 4 bytes where it should have put 1 -added getters to the info in raceStatusDecoder -fixed a problem with the values looked for in the decoder
hba56
2017-04-23 21:18:38 +1200
fdd994b7c0finished the raceStatusDecoder -added a new boat status class
hba56
2017-04-23 20:32:58 +1200
c5df90d276Created RegattaDataSource and regattaTest.xml. -Event regattaData will now get data from the XML instead of having static data.
zwu18
2017-04-23 19:59:07 +1200
23e007bd11test for RaceStartStatusDecoder added -update to race start status decoder
hba56
2017-04-23 19:43:45 +1200
f5000eea11added decoder test for courseWindDecoder -added test for coureswind decoder -changed windID in raceVisionEncoder to byte as char is 2 bytes and can only transport 1
hba56
2017-04-23 13:29:46 +1200
c9a968a5fdadded decoder test for boatlocation -refactered networking test file structure -boatlocationdecoder now makes a boatlocation message with its data -boatlocationmessage sequence number changed to an int -racevisionbyteencode changed device type to just be a byte -fixed the short conversion in racevisionbyteencode -added boatlocation decoder test
hba56
2017-04-23 12:20:05 +1200
615115160dadded decoders for avg wind, course wind and mark rounding -refactered networking test file structure -added average wind decoder -added course wind decoder -added mark rounding decoder -updated boat location decoder -added true wind direction to the boatLocationMessage class -added true wind direction to raceVisionByteEncoder method for boat location
hba56
2017-04-23 10:51:10 +1200
43d087c764Merge remote-tracking branch 'origin/networkingTest' into networkingTest
hba56
2017-04-21 17:41:32 +1200
ec0747ab9aadded decoders for race start status and race status -refactered decoders into own package -added race status decoder -added race start status decoder -started on the boat location decoder
hba56
2017-04-21 17:41:18 +1200
1b18eff3dbAdded CRC to Encoder - Added CRC to Message Encoder #story[778]
Fan-Wu Yang
2017-04-21 17:36:18 +1200
1d9b098f2bCreate XML Object for regatta data. -Regatta data XML is generated in class Event. -Regatta data is static as there isn't any information regarding it.
David Wu
2017-04-21 16:58:22 +1200
fdba50f9d2Added course limit, course and marker seq field to xml fiule of race info
Erika Savell
2017-04-21 16:52:07 +1200
0d0b9e143fWorked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782]
Joseph Gardner
2017-04-21 16:43:35 +1200
ee24ecaadcMerge remote-tracking branch 'origin/networkingTest' into networkingTest
hba56
2017-04-21 16:30:55 +1200
8e79164b69updated encoder and decoder with test for decoder -added binary message decoder test -updated binary message encoder -updated binary message decoder -added enum for message type
hba56
2017-04-21 16:30:39 +1200
5397d14d3cAdded sourceID to boats in race. -All boats in race will now have a sourceID. -SourceID will be used in XML object for boat.
David Wu
2017-04-21 16:22:23 +1200
94ba18cf0cBegan xml creator for race info message
Erika Savell
2017-04-21 15:33:37 +1200
655b5787a2binary message encoder as well test for the decoder -added binary message encoder -added test for the decoder -bug with the sync number 2
hba56
2017-04-21 14:22:47 +1200
687ffb41e6Create XML object of boat data. -XML object currently displaying out in terminal. -Reads in data from RaceDataSource. -TODO: Add sourceID to boats.
David Wu
2017-04-21 14:19:49 +1200
149c312080Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
fjc40
2017-04-21 13:38:01 +1200
9e3ca68df8added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782]
Joseph Gardner
2017-04-21 13:28:55 +1200
9e1b3365bfAdded helper functions to BoatLocationMessage which convert between the datatypes used by the message and datatypes used by our model. (Converts boat heading, wind angle, gps coordinate).
fjc40
2017-04-21 13:19:49 +1200
a99f91a075binary message decoder as well as refactor of xml encoder and decoder placement -added binary message decoder
hba56
2017-04-21 12:58:11 +1200
ef53dee7feChanged device type constants to bytes.
fjc40
2017-04-21 12:56:00 +1200
421663c145Added device type enumerations as static ints for BoatLocationMessage.
fjc40
2017-04-21 12:54:48 +1200
c63c6a3c77Added Encoding to RaceVisionByteEncoder - Added chatterText
Fan-Wu Yang
2017-04-21 12:47:02 +1200
a7e0ffae42Added class to encapsulate a BoatLocationMessage.
fjc40
2017-04-21 12:25:57 +1200
1a085e881dMerge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
fjc40
2017-04-21 12:26:34 +1200
8da67d1dbcAdded class to encapsulate a BoatLocationMessage.
fjc40
2017-04-21 12:25:57 +1200
4dd173261cAdded functions to the RaceVisionByteEncoder - Encodes Race Status - Encodes displayTextMessage - Encodes raceStartStatus - Encodes yachtEventCode #story[778]
Fan-Wu Yang
2017-04-21 12:24:21 +1200
a85bf292d5new branch for xml readers for the visuliser
Joseph Gardner
2017-04-21 12:23:02 +1200
231a1824d1Condensed Race and ConstantVelocityRace into one class
Erika Savell
2017-04-21 12:17:17 +1200
34c0aec0b9Mock race runs without an fx component
Erika Savell
2017-04-21 10:47:15 +1200
3326da4f5dStarted removing fx component from mock module.
Erika Savell
2017-04-20 15:09:55 +1200
9d9c491372XML Message Decoder added with test -added XMLMessageDecoder to decode xml files from byte array -added test class for xml decoder -renamed getByteArray method to encode -made longToSixBytes private
hba56
2017-04-20 14:26:09 +1200
79c5b93935XML Message Encoder and tests class added -added XMLMessageEncoder to encode xml files into byte array -added test class for xml encoder -added regatta.xml to the test resources
hba56
2017-04-20 13:36:09 +1200
a584400e24Actually added sub modules this time
Erika Savell
2017-04-20 11:16:19 +1200
669718d406Cloned the main project into two submodules, mock and visualiser
Erika Savell
2017-04-19 18:57:59 +1200
d12f70c8f8Merge remote-tracking branch 'origin/story_30' into story_30
cbt24
2017-04-19 18:08:35 +1200
0f22cf81efMoved implementational details of generated races to ConstantVelocityRace. - Boat headings are now treated as a property, not a calculation #story[758]
cbt24
2017-04-19 18:08:27 +1200
6046ba4cf1Added Some Encoding functions for ByteStrem - Created Heart Beat encoding - Created race Status encoding - Create display Text encoding - Created race Start status encoding #story[778]
Fan-Wu Yang
2017-04-19 17:55:04 +1200
Erika Savell 2017-04-25 17:41:10 +1200
Joseph Gardner 2017-04-25 16:06:24 +1200
cbt24 2017-04-25 15:56:44 +1200
hba56 2017-04-25 15:34:49 +1200
Fan-Wu Yang 2017-04-25 14:43:37 +1200
David Wu 2017-04-25 12:24:39 +1200
fjc40 2017-04-25 11:24:33 +1200