168 Commits (1bd9fdd93106fc8e2cf882af00969053efb0fccd)

Author SHA1 Message Date
Joseph Gardner 602bc0686e Changed public functions in the RaceXMLReader to make a new list every time and reassign the list to avoid duplicates in a list. #story[873]
9 years ago
Joseph Gardner a13899b6a7 Implemented and tested to check if a point is inside or outside of a boundary using a ray tracing algorithm. The function is public static for a GPSCoordinate and takes a list of GPSCoordinates and the comparing coordinate. #story[873]
9 years ago
fjc40 3b2f99b7d7 Fixed Polars.calculateVMG function - it was using non-existent keys in some circumstances.
9 years ago
fjc40 238b97c016 Added a VMG class (has a speed and bearing).
9 years ago
Erika Savell 892bfd9676 Began on tests for Race class.
9 years ago
Erika Savell fd036c1835 Refactored countdown timer in race class
9 years ago
Erika Savell a35d9cbc5a Re-refactored Event class
9 years ago
Erika Savell e7f84eaf83 Refactored Event Class
9 years ago
Erika Savell 1a780d6955 Fixed spread starting positions being reset at start of race
9 years ago
Erika Savell af3dfbad05 Fixed boats not displayinggit stash
9 years ago
Erika Savell 081a7d5666 Attempting to solve boats not apearing problem
9 years ago
Erika Savell ffa3d530ae Event takes string and sets time of race
9 years ago
fjc40 693da8a82a Removed some unneccessary code and comments from PolarParser.parse(...).
9 years ago
cbt24 f31a987787 Reads BoatDataSource into StreamedCourseXMLReader so the latter can function as a single source of static information for the race.
9 years ago
hba56 4f8d6b14d4 updated app class to read the polar csv and pass it off to its parser
9 years ago
hba56 e67f8fae4b parser updated for the hashmap polars
9 years ago
fjc40 1434892b51 Merge branch 'story31.1' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into story31.1
9 years ago
fjc40 aeee8ca748 Added polar data file.
9 years ago
hba56 f518c52c7b changed the way we store polars
9 years ago
hba56 1f554648ef changed all polar values to doubles and added a empty constructor
9 years ago
hba56 a4480f3ccf removed the get best heading method as it was incorrect and not related to this story
9 years ago
cbt24 9902cec688 Added tests for BoatXMLReader
9 years ago
hba56 d7294f73a1 boats now have polars stored in the
9 years ago
cbt24 9aa4183a7c Merge remote-tracking branch 'origin/49Mock' into 49Mock
9 years ago
cbt24 69cd44bda8 Reads data from boat XML file
9 years ago
Erika Savell 16d3fe2ef2 Added marker boats with correct gps positions into boats xml read by mock
9 years ago
hba56 5b010cad49 added the polar class for storing polars
9 years ago
Erika Savell 83d6cdbd59 Edited race xml read by mock
9 years ago
cbt24 6e9386f4fb Switched mock to send out official xmls.
9 years ago
Erika Savell 1b6693a19b Added xml files for mock to read in
9 years ago
hba56 187acc6960 added an empty polarparser class to push a new branch
9 years ago
fjc40 b247244665 Did some large tidy ups, refactoring, and documenting.
9 years ago
fjc40 466e22437b Visualiser. The nullptr issues relating to the XML data files appears to be fixed. Essentially, the StartController.startRaceNoScaling() function was being called as soon possible, before it was even ready - setRaceClock either hadn't been called or hadn't finished executing yet, so the StartController.raceClock member was null, causing crashes.
9 years ago
fjc40 83ce9b99d2 Mockoutput's main loop now pops messages off the message queue, rather than iterating over it like an array, and clearing it (this could have threading issues where the iteration starts (with e.g., 5 messages), as it is sending the messages another one is added, and then it ends up clearing the sent messages, and the unsent message.
9 years ago
fjc40 01224c509a Added some comments to MockOutput. Also removed instance of RaceVisionByteEncoder, as it has no state, and the functions used are all static.
9 years ago
fjc40 3481a882de Fixed Team Oracle's boat name in mock data file.
9 years ago
David Wu 61afe8d608 Created finish view to see when a race finishes.
9 years ago
David Wu a95a0c2543 Added documentation for multiple classes.
9 years ago
Erika Savell 62db7f333c Frantically cherry-picking commit by commit
9 years ago
Erika Savell 8ed0ca5b4f Quick way of adding extra leg to mock data
9 years ago
hba56 6888d0bddc fixed all java doc errors
9 years ago
David Wu 545ef7aa7f Fix lobby not entering race when race status is "started".
9 years ago
Erika Savell 5ebd4251e2 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell c3ee3ec9e2 Added new lines to the other two xml creators
9 years ago
David Wu bf12f77796 Set it so the lobby view switches to race view depending on the race status passed in by the mock.
9 years ago
David Wu b60b4b257f Remove start button from StartController.
9 years ago
Erika Savell 311cd99457 Added newlines to xml created by mock
9 years ago
Erika Savell eb58581e83 Fixed velocity issues with mock data
9 years ago
Erika Savell b9901a252a Moved speed conversion to BoatMessage class
9 years ago
Erika Savell 7c59632c41 Fixes to get race running
9 years ago
Erika Savell d2e08fa8e1 Added boat velocity to information provided by mock
9 years ago
Erika Savell 08f203a0f8 Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory.
9 years ago
Erika Savell 049f0f7331 Changed main loop so boats are looped through with a different starting boat
9 years ago
Erika Savell 42ad1f78fc Added heading to boatlocation messages
9 years ago
Erika Savell f2e0eec212 Fixed date time parsing problem
9 years ago
Erika Savell 7d1f4209e4 Got mock data being used by visualiser.
9 years ago
Erika Savell 63ee51d938 Fixed compoundMarkID typo that was causing a parse int exception
9 years ago
Erika Savell 060db182a8 Minor tweaks to get streaming from mock working
9 years ago
Erika Savell 185c65e54d Editing MockOutput to send actual generated boat/race/regatta xmls
9 years ago
hba56 8bbea28cab refactored the boat message to not use boats
9 years ago
David Wu 4811b7f4ea Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
David Wu 0bfc9a5a39 Added test for race dnf in Race class.
9 years ago
Erika Savell 9acd519d7b Removed the rest of the shared model classes needed by mock
9 years ago
Erika Savell 3f748bfdb6 Removed BoatInRace from shared model, refactored
9 years ago
Erika Savell 0126d29524 Fixing some of the SharedModel/seng302 import conflicts
9 years ago
Erika Savell bbd282bd9b Set race to send out status messages (including boat location details)
9 years ago
Erika Savell e2f3abffc6 WIP adding race status messages
9 years ago
Erika Savell 9c24b0840e Changed MockInput to thread
9 years ago
Erika Savell b1bbef814b Switching to use networking modules
9 years ago
fjc40 d29c0a9439 Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
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.
9 years ago
Erika Savell 83dfe1a60c Renamed some directories, optimized imports, general code clean up
9 years ago
Erika Savell e30aa02aac Commented and javadoc-ed RegattaData and BoatData
9 years ago
Erika Savell 19224ba840 Refactored RegattaData
9 years ago
Erika Savell ba5c965fd6 Refactored BoatData
9 years ago
Erika Savell 302f2c6869 Javadoc and commented RaceData class
9 years ago
Erika Savell 3542827c29 Refactored RaceData class
9 years ago
Erika Savell 03f63b2c61 Added boat data xml tests
9 years ago
Erika Savell d05d7271fc Removed output stream, started refactoring BoatDataClass
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
9 years ago
David Wu d14446a12e Added extra constructor in Race.
9 years ago
Erika Savell 0719720585 Moved boat xml creation from Event class to BoatData class
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
9 years ago
hba56 4b5ebbd9e4 refactored networking code from networkingTest branch
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.
9 years ago
fjc40 2876eec1e4 Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data.
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).
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.
9 years ago
zwu18 c5df90d276 Created RegattaDataSource and regattaTest.xml.
9 years ago
Erika Savell 5304f7df7d removed problematic import
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
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.
9 years ago
Erika Savell fdba50f9d2 Added course limit, course and marker seq field to xml fiule of race info
9 years ago
David Wu 5397d14d3c Added sourceID to boats in race.
9 years ago