Mercurial > mxe-octave
comparison src/of-control-2-octave-9-compat.patch @ 6530:8ea9085d1f80
of-control: Fix compatibility with Octave 9.
* src/of-control-2-octave-9-compat.patch: Add patch that replaces functions and
classes that have been deprecated in Octave 7 and removed from Octave 9.
* dist-files.mk: Add new file to list.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 17 Nov 2022 10:40:12 +0100 |
parents | |
children | e09548fd6932 |
comparison
equal
deleted
inserted
replaced
6529:91d5ee8ae175 | 6530:8ea9085d1f80 |
---|---|
1 Replace functions and classes deprecated in Octave 7 and removed from Octave 9. | |
2 | |
3 --- control-3.4.0/src/sl_ab08nd.cc.orig 2022-01-16 15:17:03.000000000 +0100 | |
4 +++ control-3.4.0/src/sl_ab08nd.cc 2022-11-17 10:22:24.964707565 +0100 | |
5 @@ -136,10 +136,10 @@ | |
6 F77_XFCN (ab08nd, AB08ND, | |
7 (equil, | |
8 n, m, p, | |
9 - a.fortran_vec (), lda, | |
10 - b.fortran_vec (), ldb, | |
11 - c.fortran_vec (), ldc, | |
12 - d.fortran_vec (), ldd, | |
13 + a.data (), lda, | |
14 + b.data (), ldb, | |
15 + c.data (), ldc, | |
16 + d.data (), ldd, | |
17 nu, rank, dinfz, | |
18 nkror, nkrol, infz, | |
19 kronr, kronl, | |
20 @@ -198,7 +198,7 @@ | |
21 if (m == 1 && p == 1) | |
22 { | |
23 if (nu < n) | |
24 - gain = c * xpow (a, double (n-1-nu)).matrix_value() * b; | |
25 + gain = c * octave::xpow (a, double (n-1-nu)).matrix_value () * b; | |
26 else | |
27 gain = d; | |
28 } | |
29 | |
30 --- control-3.4.0/src/lti_input_idx.cc.orig 2022-01-16 15:17:03.000000000 +0100 | |
31 +++ control-3.4.0/src/lti_input_idx.cc 2022-11-17 10:28:13.630086637 +0100 | |
32 @@ -93,8 +93,8 @@ | |
33 offset = 1; | |
34 } | |
35 | |
36 - Range mat_idx (1, idx-offset); | |
37 - Range opt_idx (idx+1-offset, len); | |
38 + octave::range<double> mat_idx (1, idx-offset); | |
39 + octave::range<double> opt_idx (idx+1-offset, len); | |
40 | |
41 retval(2) = offset; // abused as logical in the LTI constructors | |
42 retval(1) = opt_idx; |