diff --git a/include/xo/kalmanfilter/KalmanFilter.hpp b/include/xo/kalmanfilter/KalmanFilter.hpp index 0df87a61..896b19ca 100644 --- a/include/xo/kalmanfilter/KalmanFilter.hpp +++ b/include/xo/kalmanfilter/KalmanFilter.hpp @@ -85,7 +85,7 @@ namespace xo { utc_nanos tm() const { return state_ext_->tm(); } KalmanFilterSpec const & filter_spec() const { return filter_spec_; } KalmanFilterStep const & step() const { return step_; } - ref::rp const & state_ext() const { return state_ext_; } + rp const & state_ext() const { return state_ext_; } /* notify kalman filter with input for time t(k+1) = input_kp1.tkp1() * Require: input.tkp1() >= .current_tm() @@ -95,7 +95,7 @@ namespace xo { * - .filter_spec_k, .step_k, .state_k updated * for observations in input_kp1 */ - void notify_input(ref::rp const & input_kp1); + void notify_input(rp const & input_kp1); void display(std::ostream & os) const; std::string display_string() const; @@ -112,7 +112,7 @@ namespace xo { /* filter state as of most recent observation; * result of applying KalmanFilterEngine::step() to contents of .step */ - ref::rp state_ext_; + rp state_ext_; }; /*KalmanFilter*/ inline std::ostream & diff --git a/include/xo/kalmanfilter/KalmanFilterEngine.hpp b/include/xo/kalmanfilter/KalmanFilterEngine.hpp index ce21bf3c..5ac6ef9a 100644 --- a/include/xo/kalmanfilter/KalmanFilterEngine.hpp +++ b/include/xo/kalmanfilter/KalmanFilterEngine.hpp @@ -39,8 +39,8 @@ namespace xo { * retval.x = x(k+1|k) * retval.P = P(k+1|k) */ - static ref::rp extrapolate(utc_nanos tkp1, - ref::rp const & sk, + static rp extrapolate(utc_nanos tkp1, + rp const & sk, KalmanFilterTransition const & Fk); /* compute kalman gain matrix for filter step t(k) -> t(k+1) @@ -59,7 +59,7 @@ namespace xo { * Hkp1. relates model state to observable variables, * for step t(k) -> t(k+1) */ - static MatrixXd kalman_gain(ref::rp const & skp1_ext, + static MatrixXd kalman_gain(rp const & skp1_ext, KalmanFilterObservable const & Hkp1); /* compute kalman gain for a single observation z(k)[j]. @@ -80,7 +80,7 @@ namespace xo { * amount of innovation in observable #j, i.e. for difference between * expected and actual value for that observable. */ - static VectorXd kalman_gain1(ref::rp const & skp1_ext, + static VectorXd kalman_gain1(rp const & skp1_ext, KalmanFilterObservable const & Hkp1, uint32_t j); @@ -98,9 +98,9 @@ namespace xo { * * return new filter state+cov */ - static ref::rp correct(ref::rp const & skp1_ext, + static rp correct(rp const & skp1_ext, KalmanFilterObservable const & Hkp1, - ref::rp const & zkp1); + rp const & zkp1); /* correct extrapolated filter state for observation * of j'th filter observable z(k+1)[j] @@ -108,9 +108,9 @@ namespace xo { * Can use this when observation errors are uncorrelated * (i.e. observation error matrix R is diagonal) */ - static ref::rp correct1(ref::rp const & skp1_ext, + static rp correct1(rp const & skp1_ext, KalmanFilterObservable const & Hkp1, - ref::rp const & zkp1, + rp const & zkp1, uint32_t j); /* step filter from t(k) -> t(k+1) @@ -123,11 +123,11 @@ namespace xo { * H (coupling matrix), R (error covar matrix) * zkp1. observations z(k+1) for time t(k+1) */ - static ref::rp step(utc_nanos tkp1, - ref::rp const & sk, + static rp step(utc_nanos tkp1, + rp const & sk, KalmanFilterTransition const & Fk, KalmanFilterObservable const & Hkp1, - ref::rp const & zkp1); + rp const & zkp1); /* step filter from t(k) -> tk(k+1) * same as @@ -136,7 +136,7 @@ namespace xo { * step_spec. encapsulates Fk (transition-related params) * and Q (system noise covar matrix) */ - static ref::rp step(KalmanFilterStep const & step_spec); + static rp step(KalmanFilterStep const & step_spec); /* step filter from t(k) -> t(k+1) * @@ -150,11 +150,11 @@ namespace xo { * j. identifies a single filter observable -- * step will only consume observation z(k+1)[j] */ - static ref::rp step1(utc_nanos tkp1, - ref::rp const & sk, + static rp step1(utc_nanos tkp1, + rp const & sk, KalmanFilterTransition const & Fk, KalmanFilterObservable const & Hkp1, - ref::rp const & zkp1, + rp const & zkp1, uint32_t j); /* step filter from t(k) -> t(k+1) @@ -176,7 +176,7 @@ namespace xo { * j. identifies a single filter observable -- * step will only consume observation z(k+1)[j] */ - static ref::rp step1(KalmanFilterStep const & step_spec, + static rp step1(KalmanFilterStep const & step_spec, uint32_t j); }; /*KalmanFilterEngine*/ } /*namespace kalman*/ diff --git a/include/xo/kalmanfilter/KalmanFilterInput.hpp b/include/xo/kalmanfilter/KalmanFilterInput.hpp index 70fee5af..9319ce58 100644 --- a/include/xo/kalmanfilter/KalmanFilterInput.hpp +++ b/include/xo/kalmanfilter/KalmanFilterInput.hpp @@ -32,13 +32,13 @@ namespace xo { public: KalmanFilterInput() = default; - static ref::rp make(utc_nanos tkp1, + static rp make(utc_nanos tkp1, VectorXb const & presence, VectorXd const & z, VectorXd const & Rd); /* create input, with all presence bits set + not using Rd */ - static ref::rp make_present(utc_nanos tkp1, + static rp make_present(utc_nanos tkp1, VectorXd const & z); /* reflect KalmanFilterInput object representation */ @@ -106,7 +106,7 @@ namespace xo { VectorXd Rd_; }; /*KalmanFilterInput*/ - using KalmanFilterInputPtr = ref::rp; + using KalmanFilterInputPtr = rp; inline std::ostream & operator<<(std::ostream & os, KalmanFilterInput const & x) diff --git a/include/xo/kalmanfilter/KalmanFilterInputCallback.hpp b/include/xo/kalmanfilter/KalmanFilterInputCallback.hpp index df86a16b..d89c6b68 100644 --- a/include/xo/kalmanfilter/KalmanFilterInputCallback.hpp +++ b/include/xo/kalmanfilter/KalmanFilterInputCallback.hpp @@ -7,7 +7,7 @@ namespace xo { namespace kalman { - using KalmanFilterInputCallback = reactor::Sink1>; + using KalmanFilterInputCallback = reactor::Sink1>; } /*namespace kalman*/ } /*namespace xo*/ diff --git a/include/xo/kalmanfilter/KalmanFilterInputToConsole.hpp b/include/xo/kalmanfilter/KalmanFilterInputToConsole.hpp index 7d81226a..bdc00e10 100644 --- a/include/xo/kalmanfilter/KalmanFilterInputToConsole.hpp +++ b/include/xo/kalmanfilter/KalmanFilterInputToConsole.hpp @@ -8,12 +8,12 @@ namespace xo { namespace kalman { class KalmanFilterInputToConsole - : public xo::reactor::SinkToConsole> + : public xo::reactor::SinkToConsole> { public: KalmanFilterInputToConsole() = default; - static ref::rp make(); + static rp make(); virtual void display(std::ostream & os) const; //virtual std::string display_string() const; diff --git a/include/xo/kalmanfilter/KalmanFilterOutputCallback.hpp b/include/xo/kalmanfilter/KalmanFilterOutputCallback.hpp index cd858606..69cfb4bc 100644 --- a/include/xo/kalmanfilter/KalmanFilterOutputCallback.hpp +++ b/include/xo/kalmanfilter/KalmanFilterOutputCallback.hpp @@ -8,7 +8,7 @@ namespace xo { namespace kalman { /* callback for consuming kalman filter output */ - using KalmanFilterOutputCallback = reactor::Sink1>; + using KalmanFilterOutputCallback = reactor::Sink1>; } /*namespace kalman*/ } /*namespace xo*/ diff --git a/include/xo/kalmanfilter/KalmanFilterSpec.hpp b/include/xo/kalmanfilter/KalmanFilterSpec.hpp index 306f298a..3bcca6ad 100644 --- a/include/xo/kalmanfilter/KalmanFilterSpec.hpp +++ b/include/xo/kalmanfilter/KalmanFilterSpec.hpp @@ -40,15 +40,15 @@ namespace xo { * } */ using MkStepFn = std::function const & sk, + (rp const & sk, KalmanFilterInputPtr const & zkp1)>; public: - explicit KalmanFilterSpec(ref::rp s0, MkStepFn mkstepfn) + explicit KalmanFilterSpec(rp s0, MkStepFn mkstepfn) : start_ext_{std::move(s0)}, mk_step_fn_{std::move(mkstepfn)} {} - ref::rp const & start_ext() const { return start_ext_; } + rp const & start_ext() const { return start_ext_; } /* get step parameters (i.e. matrices F, Q, H, R) * for step t(k) -> t(k+1). * @@ -56,8 +56,8 @@ namespace xo { * - to allow time stepping to be observation-driven * - to allow for selective outlier removal */ - KalmanFilterStep make_step(ref::rp const & sk, - ref::rp const & zkp1) { + KalmanFilterStep make_step(rp const & sk, + rp const & zkp1) { return this->mk_step_fn_(sk, zkp1); } /*make_step*/ @@ -66,7 +66,7 @@ namespace xo { private: /* starting state */ - ref::rp start_ext_; + rp start_ext_; /* creates kalman filter step object on demand; * step object specifies inputs to 1 step in discrete diff --git a/include/xo/kalmanfilter/KalmanFilterState.hpp b/include/xo/kalmanfilter/KalmanFilterState.hpp index 504def9c..fe814b9a 100644 --- a/include/xo/kalmanfilter/KalmanFilterState.hpp +++ b/include/xo/kalmanfilter/KalmanFilterState.hpp @@ -24,8 +24,8 @@ namespace xo { using uint32_t = std::uint32_t; public: - static ref::rp make(); - static ref::rp make(uint32_t k, + static rp make(); + static rp make(uint32_t k, utc_nanos tk, VectorXd x, MatrixXd P, @@ -100,18 +100,18 @@ namespace xo { using int32_t = std::int32_t; public: - static ref::rp make(); - static ref::rp make(uint32_t k, + static rp make(); + static rp make(uint32_t k, utc_nanos tk, VectorXd x, MatrixXd P, KalmanFilterTransition transition, MatrixXd K, int32_t j, - ref::rp zk); + rp zk); /* create state object for initial filter state */ - static ref::rp initial(utc_nanos t0, + static rp initial(utc_nanos t0, VectorXd x0, MatrixXd P0); @@ -120,7 +120,7 @@ namespace xo { int32_t observable() const { return j_; } MatrixXd const & gain() const { return K_; } - ref::rp const & zk() const { return zk_; } + rp const & zk() const { return zk_; } virtual void display(std::ostream & os) const override; @@ -137,7 +137,7 @@ namespace xo { KalmanFilterTransition transition, MatrixXd K, int32_t j, - ref::rp zk); + rp zk); private: /* if -1: not used; @@ -155,7 +155,7 @@ namespace xo { /* input leading to state k. * empty for initial state (i.e. when .k is 0) */ - ref::rp zk_; + rp zk_; }; /*KalamnFilterStateExt*/ } /*namespace filter*/ } /*namespace xo*/ diff --git a/include/xo/kalmanfilter/KalmanFilterStateToConsole.hpp b/include/xo/kalmanfilter/KalmanFilterStateToConsole.hpp index 9d072035..4f86b574 100644 --- a/include/xo/kalmanfilter/KalmanFilterStateToConsole.hpp +++ b/include/xo/kalmanfilter/KalmanFilterStateToConsole.hpp @@ -13,7 +13,7 @@ namespace xo { public: KalmanFilterStateToConsole() = default; - static ref::rp make(); + static rp make(); virtual void display(std::ostream & os) const; //virtual std::string display_string() const; diff --git a/include/xo/kalmanfilter/KalmanFilterStep.hpp b/include/xo/kalmanfilter/KalmanFilterStep.hpp index 432ac570..781b63a6 100644 --- a/include/xo/kalmanfilter/KalmanFilterStep.hpp +++ b/include/xo/kalmanfilter/KalmanFilterStep.hpp @@ -55,16 +55,16 @@ namespace xo { public: KalmanFilterStep() = default; - KalmanFilterStep(ref::rp state, + KalmanFilterStep(rp state, KalmanFilterTransition model, KalmanFilterObservable obs, - ref::rp zkp1) + rp zkp1) : KalmanFilterStepBase(model, obs), state_{std::move(state)}, input_{std::move(zkp1)} {} - ref::rp const & state() const { return state_; } - ref::rp const & input() const { return input_; } + rp const & state() const { return state_; } + rp const & input() const { return input_; } utc_nanos tkp1() const { return input_->tkp1(); } @@ -74,14 +74,14 @@ namespace xo { * P(k+1|k) * does not use the t(k+1) observations .input.z */ - ref::rp extrapolate() const; + rp extrapolate() const; /* compute kalman gain matrix K(k+1) * given extrapolated t(k+1) state skp1_ext = {x(k+1|k), P(k+1|k)} * * note that .state() != skp1_ext; .state() reports {x(k), P(k)} */ - MatrixXd gain(ref::rp const & skp1_ext) const; + MatrixXd gain(rp const & skp1_ext) const; /* compute kalman gain vector K(k+1) * given extrapolated t(k+1) state skp1_ext = {x(k+1|k), P(k+1|k)}, @@ -90,18 +90,18 @@ namespace xo { * just computing the gain vector. i'th member of gain vector * gives effect of innovation on i'th member of kalman filter state. */ - VectorXd gain1(ref::rp const & skp1_ext, + VectorXd gain1(rp const & skp1_ext, uint32_t j) const; /* compute correction to extrapolated filter state {x(k+1|k), P(k+1|k)}, * for observation z(k+1) = .input.z() */ - ref::rp correct(ref::rp const & skp1_ext); + rp correct(rp const & skp1_ext); /* compute correction to extrapolated filter state skp1_ext = {x(k+1|k), P(k+1|k)}, * for a single observation z(k+1, j) = .input.z()[j] */ - ref::rp correct1(ref::rp const & skp1_ext, + rp correct1(rp const & skp1_ext, uint32_t j); void display(std::ostream & os) const; @@ -111,7 +111,7 @@ namespace xo { /* system state: timestamp, estimated process state, process covariance * asof beginning of this step */ - ref::rp state_; + rp state_; /* input: observations at time t(k+1) */ KalmanFilterInputPtr input_; }; /*KalmanFilterStep*/ diff --git a/include/xo/kalmanfilter/KalmanFilterSvc.hpp b/include/xo/kalmanfilter/KalmanFilterSvc.hpp index 94702a52..4b63cbee 100644 --- a/include/xo/kalmanfilter/KalmanFilterSvc.hpp +++ b/include/xo/kalmanfilter/KalmanFilterSvc.hpp @@ -15,19 +15,19 @@ namespace xo { * sinks that want to consume KalmanFilterSvc events will use * .attach_sink() (or .add_callback()) */ - class KalmanFilterSvc : public xo::reactor::Sink1>, - public xo::reactor::DirectSourcePtr> { + class KalmanFilterSvc : public xo::reactor::Sink1>, + public xo::reactor::DirectSourcePtr> { public: using AbstractSource = xo::reactor::AbstractSource; public: /* named ctor idiom */ - static ref::rp make(KalmanFilterSpec spec); + static rp make(KalmanFilterSpec spec); KalmanFilter const & filter() const { return filter_; } /* notify incoming observations; will trigger kalman filter step */ - void notify_ev(ref::rp const & input_kp1) override; + void notify_ev(rp const & input_kp1) override; // ----- inherited from reactor::AbstractSink ----- @@ -52,7 +52,7 @@ namespace xo { /* passive kalman filter */ KalmanFilter filter_; /* receive filter input from this source; see .attach_input() */ - ref::rp input_src_; + rp input_src_; /* counts lifetime #of input events (see .notify_ev()) */ uint32_t n_in_ev_ = 0; /* publish filter state updates to these callbacks */ diff --git a/src/kalmanfilter/KalmanFilter.cpp b/src/kalmanfilter/KalmanFilter.cpp index 56507650..5c415580 100644 --- a/src/kalmanfilter/KalmanFilter.cpp +++ b/src/kalmanfilter/KalmanFilter.cpp @@ -24,7 +24,7 @@ namespace xo { {} /*ctor*/ void - KalmanFilter::notify_input(ref::rp const & input_kp1) + KalmanFilter::notify_input(rp const & input_kp1) { scope log(XO_ENTER0(info)); diff --git a/src/kalmanfilter/KalmanFilterEngine.cpp b/src/kalmanfilter/KalmanFilterEngine.cpp index e9533549..fe783e8a 100644 --- a/src/kalmanfilter/KalmanFilterEngine.cpp +++ b/src/kalmanfilter/KalmanFilterEngine.cpp @@ -19,9 +19,9 @@ namespace xo { namespace kalman { // ----- KalmanFilterEngine ----- - ref::rp + rp KalmanFilterEngine::extrapolate(utc_nanos tkp1, - ref::rp const & s, + rp const & s, KalmanFilterTransition const & f) { //constexpr char const * c_self_name @@ -60,7 +60,7 @@ namespace xo { } /*extrapolate*/ VectorXd - KalmanFilterEngine::kalman_gain1(ref::rp const & skp1_ext, + KalmanFilterEngine::kalman_gain1(rp const & skp1_ext, KalmanFilterObservable const & h, uint32_t j) { @@ -110,7 +110,7 @@ namespace xo { } /*kalman_gain1*/ MatrixXd - KalmanFilterEngine::kalman_gain(ref::rp const & skp1_ext, + KalmanFilterEngine::kalman_gain(rp const & skp1_ext, KalmanFilterObservable const & h) { scope log(XO_DEBUG(false /*debug_enabled*/)); @@ -214,10 +214,10 @@ namespace xo { return K; } /*kalman_gain*/ - ref::rp - KalmanFilterEngine::correct1(ref::rp const & skp1_ext, + rp + KalmanFilterEngine::correct1(rp const & skp1_ext, KalmanFilterObservable const & h, - ref::rp const & zkp1, + rp const & zkp1, uint32_t j) { uint32_t n = skp1_ext->n_state(); @@ -261,10 +261,10 @@ namespace xo { zkp1); } /*correct1*/ - ref::rp - KalmanFilterEngine::correct(ref::rp const & skp1_ext, + rp + KalmanFilterEngine::correct(rp const & skp1_ext, KalmanFilterObservable const & h, - ref::rp const & zkp1) + rp const & zkp1) { uint32_t n = skp1_ext->n_state(); /* K :: [n x m] */ @@ -300,23 +300,23 @@ namespace xo { zkp1); } /*correct*/ - ref::rp + rp KalmanFilterEngine::step(utc_nanos tkp1, - ref::rp const & sk, + rp const & sk, KalmanFilterTransition const & Fk, KalmanFilterObservable const & Hkp1, - ref::rp const & zkp1) + rp const & zkp1) { - ref::rp skp1_ext + rp skp1_ext = KalmanFilterEngine::extrapolate(tkp1, sk, Fk); - ref::rp skp1 + rp skp1 = KalmanFilterEngine::correct(skp1_ext, Hkp1, zkp1); return skp1; } /*step*/ - ref::rp + rp KalmanFilterEngine::step(KalmanFilterStep const & step_spec) { return step(step_spec.tkp1(), @@ -326,24 +326,24 @@ namespace xo { step_spec.input()); } /*step*/ - ref::rp + rp KalmanFilterEngine::step1(utc_nanos tkp1, - ref::rp const & sk, + rp const & sk, KalmanFilterTransition const & Fk, KalmanFilterObservable const & Hkp1, - ref::rp const & zkp1, + rp const & zkp1, uint32_t j) { - ref::rp skp1_ext + rp skp1_ext = KalmanFilterEngine::extrapolate(tkp1, sk, Fk); - ref::rp skp1 + rp skp1 = KalmanFilterEngine::correct1(skp1_ext, Hkp1, zkp1, j); return skp1; } /*step1*/ - ref::rp + rp KalmanFilterEngine::step1(KalmanFilterStep const & step_spec, uint32_t j) { diff --git a/src/kalmanfilter/KalmanFilterInput.cpp b/src/kalmanfilter/KalmanFilterInput.cpp index 96f0d6ca..a93a855c 100644 --- a/src/kalmanfilter/KalmanFilterInput.cpp +++ b/src/kalmanfilter/KalmanFilterInput.cpp @@ -19,7 +19,7 @@ namespace xo { using std::uint32_t; namespace kalman { - ref::rp + rp KalmanFilterInput::make(utc_nanos tkp1, VectorXb const & presence, VectorXd const & z, @@ -28,7 +28,7 @@ namespace xo { return new KalmanFilterInput(tkp1, presence, z, Rd); } /*make*/ - ref::rp + rp KalmanFilterInput::make_present(utc_nanos tkp1, VectorXd const & z) { diff --git a/src/kalmanfilter/KalmanFilterInputToConsole.cpp b/src/kalmanfilter/KalmanFilterInputToConsole.cpp index 8fadf031..b3cd9d21 100644 --- a/src/kalmanfilter/KalmanFilterInputToConsole.cpp +++ b/src/kalmanfilter/KalmanFilterInputToConsole.cpp @@ -7,7 +7,7 @@ namespace xo { using xo::xtag; namespace kalman { - ref::rp + rp KalmanFilterInputToConsole::make() { return new KalmanFilterInputToConsole(); } /*make*/ diff --git a/src/kalmanfilter/KalmanFilterState.cpp b/src/kalmanfilter/KalmanFilterState.cpp index 4b5679e3..411e6a26 100644 --- a/src/kalmanfilter/KalmanFilterState.cpp +++ b/src/kalmanfilter/KalmanFilterState.cpp @@ -14,7 +14,7 @@ namespace xo { using xo::reflect::TaggedRcptr; using xo::reflect::StructReflector; using xo::time::utc_nanos; - using xo::ref::rp; + using xo::rp; using logutil::matrix; using logutil::vector; //using xo::scope; @@ -190,7 +190,7 @@ namespace xo { // ----- KalmanFilterStateExt ----- - ref::rp + rp KalmanFilterStateExt::initial(utc_nanos t0, VectorXd x0, MatrixXd P0) diff --git a/src/kalmanfilter/KalmanFilterStateToConsole.cpp b/src/kalmanfilter/KalmanFilterStateToConsole.cpp index 9559d339..c7043e2c 100644 --- a/src/kalmanfilter/KalmanFilterStateToConsole.cpp +++ b/src/kalmanfilter/KalmanFilterStateToConsole.cpp @@ -7,7 +7,7 @@ namespace xo { using xo::xtag; namespace kalman { - ref::rp + rp KalmanFilterStateToConsole::make() { return new KalmanFilterStateToConsole(); } /*make*/ diff --git a/src/kalmanfilter/KalmanFilterStep.cpp b/src/kalmanfilter/KalmanFilterStep.cpp index 8ca90211..7313924f 100644 --- a/src/kalmanfilter/KalmanFilterStep.cpp +++ b/src/kalmanfilter/KalmanFilterStep.cpp @@ -13,7 +13,7 @@ namespace xo { using Eigen::VectorXd; namespace kalman { - ref::rp + rp KalmanFilterStep::extrapolate() const { return KalmanFilterEngine::extrapolate(this->tkp1(), @@ -22,14 +22,14 @@ namespace xo { } /*extrapolate*/ MatrixXd - KalmanFilterStep::gain(ref::rp const & skp1_ext) const + KalmanFilterStep::gain(rp const & skp1_ext) const { return KalmanFilterEngine::kalman_gain(skp1_ext, this->obs()); } /*gain*/ VectorXd - KalmanFilterStep::gain1(ref::rp const & skp1_ext, + KalmanFilterStep::gain1(rp const & skp1_ext, uint32_t j) const { return KalmanFilterEngine::kalman_gain1(skp1_ext, @@ -38,16 +38,16 @@ namespace xo { } /*gain1*/ - ref::rp - KalmanFilterStep::correct(ref::rp const & skp1_ext) + rp + KalmanFilterStep::correct(rp const & skp1_ext) { return KalmanFilterEngine::correct(skp1_ext, this->obs(), this->input()); } /*correct*/ - ref::rp - KalmanFilterStep::correct1(ref::rp const & skp1_ext, + rp + KalmanFilterStep::correct1(rp const & skp1_ext, uint32_t j) { return KalmanFilterEngine::correct1(skp1_ext, diff --git a/src/kalmanfilter/KalmanFilterSvc.cpp b/src/kalmanfilter/KalmanFilterSvc.cpp index 5e32b102..c1392dfd 100644 --- a/src/kalmanfilter/KalmanFilterSvc.cpp +++ b/src/kalmanfilter/KalmanFilterSvc.cpp @@ -3,7 +3,7 @@ #include "KalmanFilterSvc.hpp" namespace xo { - using xo::ref::rp; + using xo::rp; using xo::scope; using xo::xtag; @@ -19,7 +19,7 @@ namespace xo { {} void - KalmanFilterSvc::notify_ev(ref::rp const & input_kp1) + KalmanFilterSvc::notify_ev(rp const & input_kp1) { this->filter_.notify_input(input_kp1); diff --git a/utest/KalmanFilter.test.cpp b/utest/KalmanFilter.test.cpp index fea572ec..a310adb4 100644 --- a/utest/KalmanFilter.test.cpp +++ b/utest/KalmanFilter.test.cpp @@ -26,7 +26,7 @@ namespace xo { using xo::time::timeutil; using xo::time::utc_nanos; using xo::time::seconds; - using xo::ref::rp; + using xo::rp; using xo::log_level; using logutil::matrix; using xo::print::ccs; @@ -144,7 +144,7 @@ namespace xo { z_stats.include_sample(z[0]); - ref::rp inputk + rp inputk = KalmanFilterInput::make_present(tkp1, z); KalmanFilterStep step_spec = spec.make_step(sk, inputk); @@ -259,7 +259,7 @@ namespace xo { z_stats.include_sample(z[0]); - ref::rp inputk + rp inputk = KalmanFilterInput::make_present(tkp1, z); KalmanFilterStep step_spec @@ -408,7 +408,7 @@ namespace xo { INFO(tostr(xtag("i_step", i_step), xtag("z", z))); - ref::rp inputk + rp inputk = KalmanFilterInput::make_present(tkp1, z); KalmanFilterStep step_spec = spec.make_step(sk, inputk); @@ -571,7 +571,7 @@ namespace xo { z_stats.include_sample(z[0]); - ref::rp inputk + rp inputk = KalmanFilterInput::make_present(tkp1, z); KalmanFilterStep step_spec = spec.make_step(sk, inputk); rp skp1 = KalmanFilterEngine::step(step_spec);