From e942cfb819ebe84139d0ed08c5c05a520fb3c3c7 Mon Sep 17 00:00:00 2001 From: Travis Hunter Date: Sat, 15 Apr 2023 16:41:42 -0600 Subject: [PATCH] Fix bug in Thrustcurve::setThrustCurveVector that didn't recalculate maxTime after setting a new thrust curve --- model/Rocket.cpp | 5 ++++- model/Thrustcurve.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/model/Rocket.cpp b/model/Rocket.cpp index 486fa4c..d83535e 100644 --- a/model/Rocket.cpp +++ b/model/Rocket.cpp @@ -13,9 +13,12 @@ void Rocket::launch() std::vector> temp; temp.push_back(std::make_pair(0.0, 0.0)); temp.push_back(std::make_pair(0.1, 10.0)); - temp.push_back(std::make_pair(0.2, 50.0)); + temp.push_back(std::make_pair(0.2, 100.0)); temp.push_back(std::make_pair(1.2, 50.0)); temp.push_back(std::make_pair(1.3, 0.0)); + temp.push_back(std::make_pair(8.0, 0.0)); + temp.push_back(std::make_pair(9.0, 100.0)); + temp.push_back(std::make_pair(10.0, 0.0)); tc.setThrustCurveVector(temp); propagator.runUntilTerminate(); } diff --git a/model/Thrustcurve.cpp b/model/Thrustcurve.cpp index c7b954e..d693c84 100644 --- a/model/Thrustcurve.cpp +++ b/model/Thrustcurve.cpp @@ -29,12 +29,18 @@ void Thrustcurve::setThrustCurveVector(const std::vectorfirst; } void Thrustcurve::setIgnitionTime(double t) { ignitionTime = t; - maxTime += ignitionTime; + //maxTime += ignitionTime; } double Thrustcurve::getThrust(double t)