Erika Savell
b1bbef814b
Switching to use networking modules
...
#story[778]
9 years ago
fjc40
d29c0a9439
Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
...
#story[778]
9 years ago
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.
9 years ago
Erika Savell
1e3b816ff5
Added tests for BoatData and RaceData
...
#story[778]
9 years ago
Erika Savell
83dfe1a60c
Renamed some directories, optimized imports, general code clean up
...
#story[778]
9 years ago
Erika Savell
073102d1a3
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
e30aa02aac
Commented and javadoc-ed RegattaData and BoatData
...
#story[9]
9 years ago
Erika Savell
19224ba840
Refactored RegattaData
...
#story[778]
9 years ago
Erika Savell
ba5c965fd6
Refactored BoatData
...
#story[778]
9 years ago
Erika Savell
302f2c6869
Javadoc and commented RaceData class
...
#story[778]
9 years ago
Erika Savell
3542827c29
Refactored RaceData class
...
#story[778]
9 years ago
Erika Savell
03f63b2c61
Added boat data xml tests
...
#story[778]
9 years ago
Joseph Gardner
26380f2677
Merge branch 'story30_XMLs' into splitIntoTwoModules
9 years ago
Erika Savell
d05d7271fc
Removed output stream, started refactoring BoatDataClass
...
#story[778]
9 years ago
Erika Savell
6a35c40f77
Commented out test causing CI issues
...
#story[778]
9 years ago
Erika Savell
a9f98b48b2
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
744caf0d29
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
hba56
e9578fc63b
refactored networking code from networkingTest
...
#story[778, 782]
9 years ago
David Wu
d14446a12e
Added extra constructor in Race.
...
-Constructor is used for junit testing for Race class.
#story[778]
9 years ago
Erika Savell
896589d1a5
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
0719720585
Moved boat xml creation from Event class to BoatData class
...
#story[778]
9 years ago
David Wu
c2183a68a0
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
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
hba56
67b73ec1db
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Erika Savell
721fb5f28a
Removed regatta xml creation from Event class into RegattaData class
...
#story[778]
9 years ago
hba56
4b5ebbd9e4
refactored networking code from networkingTest branch
...
#story[778, 782]
9 years ago
Erika Savell
7f2d8107b8
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
David Wu
d995d5df45
Fixed RegattaDataSource missing.
...
-RegattaDataSource failed to push from before. It is now created and working.
#story[778]
9 years ago
fjc40
2876eec1e4
Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data.
...
#story[778]
9 years ago
fjc40
bf5ea193af
Mock 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.
9 years ago
fjc40
091ee4735b
Race.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.
#story[788]
9 years ago
zwu18
c5df90d276
Created RegattaDataSource and regattaTest.xml.
...
-Event regattaData will now get data from the XML instead of having static data.
#story[778]
9 years ago
Erika Savell
5304f7df7d
removed problematic import
...
#story[778]
9 years ago
Erika Savell
3ff2a07680
Temporarily ignored some tests in mock
...
#story[778]
9 years ago
Erika Savell
a7913a16f9
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
9764f448eb
Added participants field to xml generator
...
#story[778]
9 years ago
Erika Savell
c365d5a344
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
1d9b098f2b
Create 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.
#story[778]
9 years ago
Erika Savell
fdba50f9d2
Added course limit, course and marker seq field to xml fiule of race info
...
#story[778]
9 years ago
David Wu
5397d14d3c
Added sourceID to boats in race.
...
-All boats in race will now have a sourceID.
-SourceID will be used in XML object for boat.
#story[778]
9 years ago
Erika Savell
737755def6
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
94ba18cf0c
Began xml creator for race info message
...
#story[778]
9 years ago
David Wu
ec716058c6
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
687ffb41e6
Create XML object of boat data.
...
-XML object currently displaying out in terminal.
-Reads in data from RaceDataSource.
-TODO: Add sourceID to boats.
#story[778]
9 years ago
fjc40
149c312080
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
9 years ago
fjc40
9e1b3365bf
Added 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).
...
#story[778]
9 years ago
David Wu
be59bb853c
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
David Wu
265bece9ed
Added a heartbeat value to the race.
...
-Heartbeat will display and update every 5 seconds.
#story[778]
9 years ago
Erika Savell
33e3b3713c
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Erika Savell
97c5c9662b
Wrapped race in an event which sends out starting xml files
...
#story[778]
9 years ago