Skip to content

Commit 89dee6a

Browse files
committed
removed NonLinMHE: starting to use branch for new features
1 parent f9f6924 commit 89dee6a

File tree

5 files changed

+2
-256
lines changed

5 files changed

+2
-256
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ for more detailed examples.
114114
- [x] extended Kalman filter
115115
- [x] unscented Kalman filter
116116
- [ ] moving horizon estimator
117-
- [x] observers in predictor form to ease control applications
117+
- [x] automatic model augmentation for offset-free tracking
118+
- [x] observers in predictor form to ease control applications
118119
- [ ] moving horizon estimator that supports:
119120
- [ ] inequality state constraints
120121
- [ ] zero process noise equality constraint to reduce the problem size

example/juMPC.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,8 @@ updatestate!(luenberger, [0,0], [0,0])
5757

5858
mpcluen = LinMPC(luenberger)
5959

60-
mhe = NonLinMHE(nonLinModel2)
6160

62-
updatestate!(mhe, [0, 0], [0, 0], [1])
6361

64-
#=
6562
kalmanFilter1 = KalmanFilter(linModel1)
6663
kalmanFilter2 = KalmanFilter(linModel1,nint_ym=0)
6764

@@ -213,4 +210,3 @@ display(pu)
213210
display(py)
214211
215212
=#
216-
=#

src/ModelPredictiveControl.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import OSQP, Ipopt
1414
export SimModel, LinModel, NonLinModel, setop!, setstate!, updatestate!, evaloutput
1515
export StateEstimator, InternalModel, Luenberger
1616
export SteadyKalmanFilter, KalmanFilter, UnscentedKalmanFilter, ExtendedKalmanFilter
17-
export NonLinMHE
1817
export initstate!
1918
export PredictiveController, LinMPC, NonLinMPC, setconstraint!, moveinput!, getinfo, sim!
2019

src/estimator/mhe.jl

Lines changed: 0 additions & 249 deletions
This file was deleted.

src/state_estim.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ end
303303
include("estimator/kalman.jl")
304304
include("estimator/luenberger.jl")
305305
include("estimator/internal_model.jl")
306-
include("estimator/mhe.jl")
307306

308307
"Get [`InternalModel`](@ref) output `ŷ` from current measured outputs `ym` and dist. `d`."
309308
evalŷ(estim::InternalModel, ym, d) = evaloutput(estim,ym, d)

0 commit comments

Comments
 (0)