Overview
Comment: | Simulation and real now compatible! |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/master | trunk |
Files: | files | file ages | folders |
SHA3-256: |
2e7eb80963858dc3cbd13a28a91b8500 |
User & Date: | gawthrop@users.sourceforge.net on 2003-10-15 16:21:20 |
Other Links: | branch diff | manifest | tags |
Context
2003-10-16
| ||
07:30:24 | ppp_int_obs now returns corrected as well as predicted output check-in: 4c9bb5509d user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
2003-10-15
| ||
16:21:20 | Simulation and real now compatible! check-in: 2e7eb80963 user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
16:14:38 | Correct on current value, predict next value check-in: a8c356c721 user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
Changes
Modified mttroot/mtt/lib/control/PPP/ppp_lin_run.m from [26fb8a410d] to [66d5fae7bd].
| 1 2 3 4 5 6 7 8 9 10 | - + - + |
|
︙ | |||
40 41 42 43 44 45 46 | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | - + - + | endif if nargin<5 x_0 = zeros(n_x,1); endif if nargin<6 |
︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | + - + | endif if !struct_contains(p_o,"method") ##p_o.method = "continuous"; p_o.method = "intermittent"; endif ## Check w. [n_w,m_w] = size(w); if ( (n_w!=n_y) || (m_w!=1) ) error(sprintf("ppp_lin_run: w must a column vector with %i elements",n_y)); endif ## Initialise x_est = p_o.x_0; |
︙ | |||
134 135 136 137 138 139 140 | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | - | endif ##Sanity check A_u [p_c.n_U,M_u] = size(p_c.A_u); if (p_c.n_U!=M_u) error("A_u must be square"); endif |
︙ | |||
190 191 192 193 194 195 196 | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 | - + - + - + - + + - - - - - + - | u = []; t = []; y_e = []; t_e = []; e_e = []; tick = time; i=0; |
︙ | |||
234 235 236 237 238 239 240 | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | - - + + - - + + - + + - + + + + + + - + | ## Save data if Simulate t = [t;ti']; y = [y;yi']; u = [u;ui']; else t = [t;t_i]; |