04fdeaf2e2
Optimised boundary checking #story[873]
9 years ago
493932b93f
Merged with visualiser side of mark boats
...
#story[881]
9 years ago
0ed02962a1
Merge branch 'Story49Vis' into 49Mock
...
# Conflicts:
# visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java
# visualiser/src/main/java/seng302/Model/CompoundMark.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
a91bc459f7
Implemented functionality for mock to parse marker boats throughout race.
...
-Added getter to CompoundMark to get the Mark value.
#story[881]
9 years ago
5708db1936
Ignoring all new race tests
...
- Thought they they would be ok bc not calling animation timer directly
- Was mistaken
#story[881]
9 years ago
799e588145
Unignored a couple of GPS tests
...
- The issue was with accuracy. Average of two coords is fine fo two point fairly close together (<1km), but not for very very large distances.
- We only ever use it for small ranges so changed tests to reflect that
#story[881]
9 years ago
eca6b7e374
Fixed imports
9 years ago
d294ee7994
Deleted redundant and deprecated code (Visualiser)
...
- References to deprecated objects replaced
- Deprecated Constants class removed
- general redundant code deleted
9 years ago
11f6dee301
Added a number of race tests.
...
- Still unable to get animation timer tests working. May be necessary to make handle() hold nothing but a method call
#story[881]
9 years ago
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
8c0c03dcf2
Fixed tests that were reading the file again making them fail. #story[873]
9 years ago
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
0bb18c7957
Temporarily ignoring animation tests
...
- The VMs don't have the necessary libraries to run them
#story[881]
9 years ago
3b2f99b7d7
Fixed Polars.calculateVMG function - it was using non-existent keys in some circumstances.
...
#story[873] #pair[fjc40,jam339]
9 years ago
238b97c016
Added a VMG class (has a speed and bearing).
...
Added the Polars.calculateVMG function, which calculates the VMG from a given wind angle, wind speed, and angle to destination. In may not be completely correct at the moment, so it's a work in progress.
#story[873]
9 years ago
892bfd9676
Began on tests for Race class.
...
- Made really good progress using Mockito and calling .handle() on animation timers
#story[881]
9 years ago
fd036c1835
Refactored countdown timer in race class
...
- Also fixed all boats having ame velocity
#story[881]
9 years ago
a35d9cbc5a
Re-refactored Event class
...
#story[881]
9 years ago
e7f84eaf83
Refactored Event Class
...
#story[881]
9 years ago
1a780d6955
Fixed spread starting positions being reset at start of race
...
#story[881]
9 years ago
af3dfbad05
Fixed boats not displayinggit stash
...
- Was gps coordinates being initialised with X and Y switched around
#story[881]
9 years ago
081a7d5666
Attempting to solve boats not apearing problem
...
- Appears to be becaus elat and long are getting switched somewhere
#story[881]
9 years ago
ce5a726153
Adjusted wind direction changing angles to a smaller angle.
...
#story[882]
9 years ago
ffa3d530ae
Event takes string and sets time of race
...
- RaceXmlReaders can handle strings now
- Not working with visualiser, gps coords may be worng
#story[881]
9 years ago
8390b19299
Created methods to initialise and change wind direction throughout race.
...
-Method initialiseWinDir assigns an unsigned short value to wind direction.
-Method changeWindDir randomly changes the wind direction throughout race.
-Issue found regarding showing wind direction.
#story[882]
9 years ago
693da8a82a
Removed some unneccessary code and comments from PolarParser.parse(...).
...
Fixed a bug where the polar parser would attempt to insert (wind speed, windspeed, windangle) instead of (windspeed, windangle, boatspeed).
Removed some unused constructors from RaceXMLReader, and fixed a bug where it wouldn't actually use the polar table correctly.
Boat's constructor now expects a Polars table.
Added some comments to the Polars class, and specified the HashMap's template parameters
Added PolarsTest - which needs to be implemented properly when the VMG calculations have been added.
#story[900]
9 years ago
91b1773703
Commented out obsolete tests, may be useful if refactored.
...
#story[881]
9 years ago
f31a987787
Reads BoatDataSource into StreamedCourseXMLReader so the latter can function as a single source of static information for the race.
...
- Mock.StreamedCourseXMLReader populates participant and mark list from BoatDataSource
- Added CompoundMarker class to accommodate Mark data from Boat XML
- Had to check for Yacht type in Visualiser.BoatXMLReader
- Added a missing coordinate value to raceTest.xml
- Marker class still exists due to large number of tests, which should be transitioned to CompoundMark
- IMPORTANT: race is no longer functional
#story[881]
9 years ago
3bc8ad0a07
Arrow is now displayed on screen more vividly, the arrow can be customised to a different colour scheme if needed. #story[882]
9 years ago
045e69a637
Deleted and Fixed some redundant code
...
- Deleted some unused functions
- Fixed NullPointerException for Marks
#story[881] #pair[fwy13,jam339]
9 years ago
4f8d6b14d4
updated app class to read the polar csv and pass it off to its parser
...
#story[900]
9 years ago
245914a69e
added the polars csv
...
#story[900]
9 years ago
e67f8fae4b
parser updated for the hashmap polars
...
#pair[hba56, fjc40]
#story[900]
9 years ago
1434892b51
Merge branch 'story31.1' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into story31.1
9 years ago
aeee8ca748
Added polar data file.
...
Added PolarParse class - currently commented out as it depends on polar table class.
#story[900]
9 years ago
f518c52c7b
changed the way we store polars
...
-removed polar class
-added in new hasmap polars class
-updated boat class to the changes
#story[900]
9 years ago
9e19ddb1f4
Story 49 Marks move with boat location.
...
- Commented out blocking array as it was unecessary
- Added Observable list for markers to the race canvas
- Added SourceId's to Marker
- Added updating Markers from the Streamed Race loop.
#story[881] #pair[fwy13, jam339]
9 years ago
1f554648ef
changed all polar values to doubles and added a empty constructor
...
#story[900]
9 years ago
a4480f3ccf
removed the get best heading method as it was incorrect and not related to this story
...
#story[900]
9 years ago
9902cec688
Added tests for BoatXMLReader
...
- Verifies correct operation on boat and mark reading from boatTest.xml
#story[782]
9 years ago
d7294f73a1
boats now have polars stored in the
...
-added getter and setter for a boats polars
#story[900]
9 years ago
9aa4183a7c
Merge remote-tracking branch 'origin/49Mock' into 49Mock
9 years ago
69cd44bda8
Reads data from boat XML file
...
- Creates marks for building CompoundMarks (formerly Markers)
- Rearranged Boat constructor and removed velocity
#story[782]
9 years ago
16d3fe2ef2
Added marker boats with correct gps positions into boats xml read by mock
...
#story[881]
9 years ago
5b010cad49
added the polar class for storing polars
...
#story[900]
9 years ago
83d6cdbd59
Edited race xml read by mock
...
- It now includes source ids
- Legs are in the correct sequence order for the example race
#story[881]
9 years ago
6e9386f4fb
Switched mock to send out official xmls.
...
- Not reading official xmls yet
#story[881], #pair[cbt24, esa46]
9 years ago
1b6693a19b
Added xml files for mock to read in
...
- In process of switching to reading official xml format instead of our own
#story[881]
9 years ago
187acc6960
added an empty polarparser class to push a new branch
...
#story[900]
9 years ago
43757b34d1
General code tidy up (Visualiser)
...
- access modifiers adjusted
- unused declarations removed
- spelling fixes
- removed redundant code
9 years ago
Joseph Gardner
Erika Savell
zwu18
Jessica McAuslin
fjc40
cbt24
Fan-Wu Yang
hba56