Skip to content

Commit 859e7a1

Browse files
committed
refactor: update realtime and async integrators to use diffeq::core namespace
1 parent 2470497 commit 859e7a1

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

include/async/async_integrator.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ struct Event {
148148
template<system_state S>
149149
class AsyncIntegrator {
150150
public:
151-
using base_integrator_type = AbstractIntegrator<S>;
151+
using base_integrator_type = core::AbstractIntegrator<S>;
152152
using state_type = typename base_integrator_type::state_type;
153153
using time_type = typename base_integrator_type::time_type;
154154
using value_type = typename base_integrator_type::value_type;
@@ -392,7 +392,7 @@ namespace factory {
392392

393393
template<system_state S>
394394
auto make_async_rk45(
395-
typename AbstractIntegrator<S>::system_function sys,
395+
typename core::AbstractIntegrator<S>::system_function sys,
396396
typename AsyncIntegrator<S>::Config config = {},
397397
typename S::value_type rtol = static_cast<typename S::value_type>(1e-6),
398398
typename S::value_type atol = static_cast<typename S::value_type>(1e-9)
@@ -403,7 +403,7 @@ auto make_async_rk45(
403403

404404
template<system_state S>
405405
auto make_async_dop853(
406-
typename AbstractIntegrator<S>::system_function sys,
406+
typename core::AbstractIntegrator<S>::system_function sys,
407407
typename AsyncIntegrator<S>::Config config = {},
408408
typename S::value_type rtol = static_cast<typename S::value_type>(1e-10),
409409
typename S::value_type atol = static_cast<typename S::value_type>(1e-15)
@@ -414,7 +414,7 @@ auto make_async_dop853(
414414

415415
template<system_state S>
416416
auto make_async_bdf(
417-
typename AbstractIntegrator<S>::system_function sys,
417+
typename core::AbstractIntegrator<S>::system_function sys,
418418
typename AsyncIntegrator<S>::Config config = {},
419419
typename S::value_type rtol = static_cast<typename S::value_type>(1e-6),
420420
typename S::value_type atol = static_cast<typename S::value_type>(1e-9)

include/core/realtime_integrator.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ class CustomExecutor {
180180
* - Safety mechanisms and emergency stops
181181
*/
182182
template<system_state S, can_be_time T = double>
183-
class RealtimeIntegrator : public AbstractIntegrator<S, T> {
183+
class RealtimeIntegrator : public core::AbstractIntegrator<S, T> {
184184
public:
185-
using base_type = AbstractIntegrator<S, T>;
185+
using base_type = core::AbstractIntegrator<S, T>;
186186
using state_type = typename base_type::state_type;
187187
using time_type = typename base_type::time_type;
188188
using value_type = typename base_type::value_type;
@@ -212,7 +212,7 @@ class RealtimeIntegrator : public AbstractIntegrator<S, T> {
212212
};
213213

214214
explicit RealtimeIntegrator(
215-
std::unique_ptr<AbstractIntegrator<S, T>> base_integrator,
215+
std::unique_ptr<core::AbstractIntegrator<S, T>> base_integrator,
216216
RealtimeConfig config = {}
217217
) : base_type(std::move(base_integrator->sys_))
218218
, base_integrator_(std::move(base_integrator))
@@ -438,7 +438,7 @@ class RealtimeIntegrator : public AbstractIntegrator<S, T> {
438438
}
439439

440440
private:
441-
std::unique_ptr<AbstractIntegrator<S, T>> base_integrator_;
441+
std::unique_ptr<core::AbstractIntegrator<S, T>> base_integrator_;
442442
RealtimeConfig config_;
443443
std::unique_ptr<communication::EventBus> event_bus_;
444444
std::unique_ptr<CustomExecutor> executor_;
@@ -612,7 +612,7 @@ namespace factory {
612612

613613
template<system_state S, can_be_time T = double>
614614
auto make_realtime_rk45(
615-
typename AbstractIntegrator<S, T>::system_function sys,
615+
typename core::AbstractIntegrator<S, T>::system_function sys,
616616
typename RealtimeIntegrator<S, T>::RealtimeConfig config = {},
617617
T rtol = static_cast<T>(1e-6),
618618
T atol = static_cast<T>(1e-9)
@@ -623,7 +623,7 @@ auto make_realtime_rk45(
623623

624624
template<system_state S, can_be_time T = double>
625625
auto make_realtime_dop853(
626-
typename AbstractIntegrator<S, T>::system_function sys,
626+
typename core::AbstractIntegrator<S, T>::system_function sys,
627627
typename RealtimeIntegrator<S, T>::RealtimeConfig config = {},
628628
T rtol = static_cast<T>(1e-10),
629629
T atol = static_cast<T>(1e-15)

0 commit comments

Comments
 (0)