hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Testing time on events that are determined by simulation steppers shouldn't be

Browse Source 
more precise than the simulation time step.
This commit is contained in:
JoePfeiffer 2023-09-23 14:23:59 -06:00
parent faa7c03308
commit 1b29a6b767
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/test/net/sf/openrocket/simulation/FlightEventsTest.java
View File

@ -67,8 +67,12 @@ public class FlightEventsTest extends BaseTestCase {
// Test that the event times are correct // Test that the event times are correct
for (int i = 0; i < expectedEventTimes.length; i++) { for (int i = 0; i < expectedEventTimes.length; i++) {
FlightEvent actual = eventList.get(i);
double epsilon = ((actual.getType() == FlightEvent.Type.TUMBLE) ||
(actual.getType() == FlightEvent.Type.APOGEE)) ? sim.getOptions().getTimeStep() : EPSILON;
assertEquals(" Flight type " + expectedEventTypes[i] + " has wrong time ", assertEquals(" Flight type " + expectedEventTypes[i] + " has wrong time ",
expectedEventTimes[i], eventList.get(i).getTime(), EPSILON); expectedEventTimes[i], actual.getTime(), epsilon);
} }
@ -169,8 +173,10 @@ public class FlightEventsTest extends BaseTestCase {
expected.getType(), actual.getType()); expected.getType(), actual.getType());
if (1200 != expected.getTime()) { if (1200 != expected.getTime()) {
// Tumbling can have a very large time error, so implement a more course epsilon (otherwise unit tests just keep failing...) // Events whose timing depends on the results of the steppers can't be expected to be more accurate than
double epsilon = actual.getType() == FlightEvent.Type.TUMBLE ? 0.05 : EPSILON; // the length of a time step
double epsilon = ((actual.getType() == FlightEvent.Type.TUMBLE) ||
(actual.getType() == FlightEvent.Type.APOGEE)) ? sim.getOptions().getTimeStep() : EPSILON;
assertEquals("Branch " + b + " FlightEvent " + i + " type " + expected.getType() + " has wrong time ", assertEquals("Branch " + b + " FlightEvent " + i + " type " + expected.getType() + " has wrong time ",
expected.getTime(), actual.getTime(), epsilon); expected.getTime(), actual.getTime(), epsilon);
} }