Skip to content

Commit b0be83a

Browse files
authored
Merge pull request #1252 from cbm755/fixes
Fixes for SymPy 1.12
2 parents e13fd68 + 48af886 commit b0be83a

File tree

4 files changed

+39
-17
lines changed

4 files changed

+39
-17
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,26 @@ jobs:
5656
fail-fast: true
5757
matrix:
5858
octave: [8.1.0]
59-
sympy: [1.4, 1.5.1, 1.6.2, 1.7.1, 1.8, 1.9, 1.10.1, 1.11.1]
59+
sympy: [1.4, 1.5.1, 1.6.2, 1.7.1, 1.8, 1.9, 1.10.1, 1.11.1, 1.12rc1]
6060
include:
6161
- octave: 5.1.0
6262
sympy: 1.8
6363
- octave: 5.2.0
6464
sympy: 1.8
6565
- octave: 6.1.0
66-
sympy: 1.11.1
66+
sympy: 1.12rc1
6767
- octave: 6.2.0
68-
sympy: 1.11.1
68+
sympy: 1.12rc1
6969
- octave: 6.3.0
70-
sympy: 1.11.1
70+
sympy: 1.12rc1
7171
- octave: 6.4.0
72-
sympy: 1.11.1
72+
sympy: 1.12rc1
7373
- octave: 7.1.0
74-
sympy: 1.11.1
74+
sympy: 1.12rc1
7575
- octave: 7.2.0
76-
sympy: 1.11.1
76+
sympy: 1.12rc1
7777
- octave: 7.3.0
78-
sympy: 1.11.1
78+
sympy: 1.12rc1
7979
steps:
8080
- uses: actions/checkout@v3
8181
- name: Container setup
@@ -120,7 +120,7 @@ jobs:
120120
fail-fast: true
121121
matrix:
122122
octave: [7.3.0]
123-
sympy: [1.9, 1.10.1, 1.11.1]
123+
sympy: [1.11.1]
124124
steps:
125125
- uses: actions/checkout@v3
126126
- name: Container setup

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ octsympy 3.0.1+
1010

1111
* Indexing bounds checking to support Octave 8.
1212

13+
* Fix assumptions on SymPy 1.12.
14+
15+
* Other misc fixes and changes for SymPy 1.12.
16+
17+
1318

1419
octsympy 3.0.1 (2022-08-09)
1520
===========================

inst/@sym/euler.m

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%% Copyright (C) 2017-2019, 2022 Colin B. Macdonald
1+
%% Copyright (C) 2017-2019, 2022-2023 Colin B. Macdonald
22
%%
33
%% This file is part of OctSymPy.
44
%%
@@ -112,5 +112,14 @@
112112
%! vpa('4270.98066989140286451493108809574')*1i;
113113
%! z = vpa (exp(1), 32) + vpa(pi, 32)/13*1i;
114114
%! B = euler (13, z);
115-
%! relerr = double(abs((B - A)/A));
116-
%! assert (abs(relerr) < 2e-31);
115+
%! relerr = abs(double(abs((B - A)/A)));
116+
%! assert (relerr < 20*eps);
117+
118+
%!xtest
119+
%! % as above, high-prec result broken in 1.12: https://github.com/sympy/sympy/issues/24156
120+
%! A = vpa('1623.14184180556920918624604530515') + ...
121+
%! vpa('4270.98066989140286451493108809574')*1i;
122+
%! z = vpa (exp(1), 32) + vpa(pi, 32)/13*1i;
123+
%! B = euler (13, z);
124+
%! relerr = abs(double(abs((B - A)/A)));
125+
%! assert (relerr < 2e-31);

inst/@sym/ilaplace.m

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%% Copyright (C) 2014-2016 Andrés Prieto
2-
%% Copyright (C) 2015-2016, 2018-2019, 2022 Colin Macdonald
2+
%% Copyright (C) 2015-2016, 2018-2019, 2022-2023 Colin Macdonald
33
%%
44
%% This file is part of OctSymPy.
55
%%
@@ -181,10 +181,18 @@
181181

182182
%!test
183183
%! % Delta dirac test 2
184-
%! syms s c
185-
%! t = sym('t', 'positive');
186-
%! assert (isequal (ilaplace (5*exp(-3*s) + 2*exp(c*s) - 2*exp(-2*s)/s,t), ...
187-
%! 5*dirac(t-3) + 2*dirac(c+t) - 2*heaviside(t-2)))
184+
%! syms s t
185+
%! calc = ilaplace (5*exp (-3*s) - 2*exp (-2*s)/s, s, t);
186+
%! want = 5*dirac (t-3) - 2*heaviside (t-2);
187+
%! assert (isequal (calc, want))
188+
189+
%!test
190+
%! % Delta dirac test 3, coefficient
191+
%! syms s t
192+
%! syms c positive
193+
%! calc = ilaplace (2*exp (-c*s), s, t);
194+
%! want = 2*dirac (t - c);
195+
%! assert (isAlways (calc == want))
188196

189197
%!error <more than one> ilaplace (sym('s', 'positive')*sym('s'))
190198

0 commit comments

Comments
 (0)