Skip to content

Commit 14d4008

Browse files
committed
fix tests
1 parent 38a19ad commit 14d4008

16 files changed

+31
-35
lines changed

inst/@sym/contains.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
%% @group
2727
%% a = interval (sym (0), 10);
2828
%% contains (5, a)
29-
%% @result{} ans = 1
29+
%% @result{} ans = (sym) True
3030
%% @end group
3131
%% @end example
3232
%%

inst/@sym/imageset.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
%% syms y
4444
%% f = x^exp(y);
4545
%% imageset (f, [x y], domain ('Naturals0'))
46-
%% @result{} ans = (sym)
47-
%% ⎧ ⎛ y⎞
48-
%% ⎨ ⎝ℯ ⎠
49-
%% ⎩x | x, y ∊ ℕ₀⎭
46+
%% @result{} ans = (sym 1×2 matrix)
47+
%% ⎧ ⎛ y⎞ ⎫ ⎧ ⎛ y⎞ ⎫⎤
48+
%% ⎨ ⎝ℯ ⎠ ⎬ ⎨ ⎝ℯ ⎠ ⎬⎥
49+
%% ⎩x | x ∊ ℕ₀⎭ ⎩x | y ∊ ℕ₀⎭
5050
%% @end group
5151
%% @end example
5252
%%

inst/@sym/iscomplement.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
%% a = domain ('Reals');
2828
%% b = domain ('Complexes');
2929
%% iscomplement (b - a)
30-
%% @result{} ans = 1
30+
%% @result{} ans = (sym) True
3131
%% @end group
3232
%% @end example
3333
%%
@@ -45,4 +45,4 @@
4545
%!test
4646
%! a = domain ('Reals');
4747
%! b = domain ('Integers');
48-
%! assert (iscomplement (a - b))
48+
%! assert (logical (iscomplement (a - b)))

inst/@sym/isdisjoint.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
%% a = interval (sym (0), 10);
2828
%% b = interval (sym (11), 15);
2929
%% isdisjoint (a, b)
30-
%% @result{} ans = 1
30+
%% @result{} ans = (sym) True
3131
%% @end group
3232
%% @end example
3333
%%

inst/@sym/isemptyset.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
%% @example
2626
%% @group
2727
%% isemptyset (domain ('EmptySet'))
28-
%% @result{} ans = 1
28+
%% @result{} ans = (sym) True
2929
%% @end group
3030
%% @end example
3131
%%

inst/@sym/isintersection.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
%% a = interval (x, 1);
2929
%% b = interval (sym (-1), 3);
3030
%% isintersection (intersect (a, b))
31-
%% @result{} ans = 1
31+
%% @result{} ans = (sym) True
3232
%% @end group
3333
%% @end example
3434
%%

inst/@sym/isleftunbounded.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
%% @group
2727
%% a = interval (sym (-inf), 0);
2828
%% isleftunbounded (a)
29-
%% @result{} ans = 1
29+
%% @result{} ans = (sym) True
3030
%% @end group
3131
%% @end example
3232
%%
3333
%% @example
3434
%% @group
3535
%% a = interval (sym (0), inf);
3636
%% isleftunbounded (a)
37-
%% @result{} ans = 0
37+
%% @result{} ans = (sym) False
3838
%% @end group
3939
%% @end example
4040
%%

inst/@sym/ispropersubset.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
%% a = interval (sym (0), sym (1)/2);
2828
%% b = interval(sym (0), 1);
2929
%% ispropersubset (a, b)
30-
%% @result{} ans = 1
30+
%% @result{} ans = (sym) True
3131
%% @end group
3232
%% @end example
3333
%%

inst/@sym/ispropersuperset.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
%% a = interval (sym (0), 1);
2828
%% b = interval (sym (0), sym (1)/2);
2929
%% ispropersuperset (a, b)
30-
%% @result{} ans = 1
30+
%% @result{} ans = (sym) True
3131
%% @end group
3232
%% @end example
3333
%%

inst/@sym/isrightunbounded.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
%% @group
2727
%% a = interval (0, sym (inf));
2828
%% isrightunbounded (a)
29-
%% @result{} ans = 1
29+
%% @result{} ans = (sym) True
3030
%% @end group
3131
%% @end example
3232
%%
3333
%% @group
3434
%% a = interval (-inf, sym (0));
3535
%% isrightunbounded (a)
36-
%% @result{} ans = 1
36+
%% @result{} ans = (sym) True
3737
%% @end group
3838
%% @end example
3939
%%

inst/@sym/issubset.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
%% a = interval (sym (0), sym (1)/2);
2828
%% b = interval (sym (0), 1);
2929
%% issubset (a, b)
30-
%% @result{} ans = 1
30+
%% @result{} ans = (sym) True
3131
%% @end group
3232
%% @end example
3333
%%

inst/@sym/issuperset.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
%% a = interval (sym (0), 1);
2828
%% b = interval (sym (0), 1, true);
2929
%% issuperset (a, b)
30-
%% @result{} ans = 1
30+
%% @result{} ans = (sym) True
3131
%% @end group
3232
%% @end example
3333
%%

inst/@sym/isuniversalset.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
%% @example
2626
%% @group
2727
%% isuniversalset (domain ('UniversalSet'))
28-
%% @result{} ans = 1
28+
%% @result{} ans = (sym) True
2929
%% @end group
3030
%% @end example
3131
%%

inst/@sym/point.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
%% space = interval (sym (0), 7) * interval (sym (4), 9);
4949
%% p = point (sym (6), 7);
5050
%% contains (p, space)
51-
%% @result{} ans = 1
51+
%% @result{} ans = (sym) True
5252
%% @end group
5353
%% @end example
5454
%%

inst/@sym/psets.m

+6-10
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,17 @@
2929
%% c = interval (sym (1), 7);
3030
%%
3131
%% psets (complexregion (a * b))
32-
%% @result{} ans =
33-
%% @{
34-
%% (sym) [2, 3] × [4, 5]
35-
%% @}
32+
%% @result{} ans = (sym) [2, 3] × [4, 5]
3633
%% @end group
3734
%% @end example
3835
%%
3936
%% @example
4037
%% @group
4138
%% psets (complexregion (a * b + b * c))
42-
%% @result{} ans =
43-
%% @{
44-
%% (sym) [2, 3] × [4, 5]
45-
%% (sym) [4, 5] × [1, 7]
46-
%% @}
39+
%% @result{} ans = (sym 2×1 matrix)
40+
%% ⎡[2, 3] × [4, 5]⎤
41+
%% ⎢ ⎥
42+
%% ⎣[4, 5] × [1, 7]⎦
4743
%% @end group
4844
%% @end example
4945
%%
@@ -55,7 +51,7 @@
5551
print_usage ();
5652
end
5753

58-
out = elementwise_op ('lambda x: x.psets', sym (x));
54+
out = python_cmd ('return Matrix(_ins[0].psets)', sym (x));
5955

6056
if nargout == 0 || nargout == 1
6157
varargout = {out};

inst/@sym/rangeset.m

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
%% Example:
3535
%% @example
3636
%% @group
37-
%% rangeset (sym (10), 0, -2) % doctest: +SKIP
38-
%% @result{} ans = (sym) {10, 8, …, 2}
37+
%% rangeset (sym (10), 0, -2)
38+
%% @result{} ans = (sym) @{2, 4, …, 10@}
3939
%% @end group
4040
%% @end example
4141
%%
@@ -57,12 +57,12 @@
5757
%% Note, in Sympy 1.0 the negative steps produce a sorted
5858
%% output, over 1.0 don't is sorted.
5959

60-
varargin = cellfun(@sym, varargin, 'UniformOutput', false);
61-
6260
if strcmp (varargin{nargin}, 'list')
63-
y = python_cmd ('return list(Range(*_ins[:-1])),', varargin{:});
61+
varargin = cellfun(@sym, varargin, 'UniformOutput', false);
62+
y = python_cmd ('return list(Range(*_ins)),', varargin{1:3});
6463
y = cell2sym (y);
6564
else
65+
varargin = cellfun(@sym, varargin, 'UniformOutput', false);
6666
y = python_cmd ('return Range(*_ins),', varargin{:});
6767
end
6868

0 commit comments

Comments
 (0)