Mercurial > mxe-octave

annotate src/of-control-2-octave-9-compat.patch @ 6530:8ea9085d1f80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6530
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 Replace functions and classes deprecated in Octave 7 and removed from Octave 9.
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 --- control-3.4.0/src/sl_ab08nd.cc.orig 2022-01-16 15:17:03.000000000 +0100
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 +++ control-3.4.0/src/sl_ab08nd.cc 2022-11-17 10:22:24.964707565 +0100
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 @@ -136,10 +136,10 @@
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 F77_XFCN (ab08nd, AB08ND,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 (equil,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 n, m, p,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 - a.fortran_vec (), lda,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 - b.fortran_vec (), ldb,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 - c.fortran_vec (), ldc,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 - d.fortran_vec (), ldd,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 + a.data (), lda,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 + b.data (), ldb,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 + c.data (), ldc,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 + d.data (), ldd,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 nu, rank, dinfz,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 nkror, nkrol, infz,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 kronr, kronl,
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 @@ -198,7 +198,7 @@
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 if (m == 1 && p == 1)
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 {
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 if (nu < n)
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 - gain = c * xpow (a, double (n-1-nu)).matrix_value() * b;
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 + gain = c * octave::xpow (a, double (n-1-nu)).matrix_value () * b;
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 else
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 gain = d;
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 }
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 --- control-3.4.0/src/lti_input_idx.cc.orig 2022-01-16 15:17:03.000000000 +0100
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 +++ control-3.4.0/src/lti_input_idx.cc 2022-11-17 10:28:13.630086637 +0100
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 @@ -93,8 +93,8 @@
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 offset = 1;
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 }
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 - Range mat_idx (1, idx-offset);
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 - Range opt_idx (idx+1-offset, len);
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 + octave::range<double> mat_idx (1, idx-offset);
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 + octave::range<double> opt_idx (idx+1-offset, len);
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 retval(2) = offset; // abused as logical in the LTI constructors
8ea9085d1f80 of-control: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 retval(1) = opt_idx;