[wip] Change @sym to a classdef.

inst/@sym/private/assert_same_shape.m → inst/@sym/assert_same_shape.m

@@ -17,7 +17,7 @@
 %% If not, see <http://www.gnu.org/licenses/>.
 
 function t = assert_same_shape(x,y)
-  if ~(is_same_shape(x,y))
+  if ~(sym.is_same_shape (x, y))
     error('array inputs must have same size and shape');
   end
 

inst/@sym/private/cell_array_to_sym.m → inst/@sym/cell_array_to_sym.m

@@ -29,7 +29,7 @@
     % not strictly necessary if sym calls this but maybe neater this way:
     item = L{i};
     if iscell (item)
-      s{i} = cell_array_to_sym (item, varargin{:});
+      s{i} = sym.cell_array_to_sym (item, varargin{:});
     else
       s{i} = sym (item, varargin{:});
     end

inst/@sym/charpoly.m

@@ -91,7 +91,7 @@
          'else:'
          '    return _ins[0].charpoly(_ins[1]).as_expr(),'};
 
-  y = python_cmd(cmd , sym(varargin){:});
+  y = python_cmd(cmd , sym.symarray (varargin){:});
 
   if (nargin == 1)
     y = cell2sym(y);

inst/@sym/coeffs.m

@@ -123,7 +123,7 @@
   if (nargin == 1)
     [c, t] = python_cmd (cmd, sym(p), {});
   else
-    [c, t] = python_cmd (cmd, sym(p), sym(x));
+    [c, t] = python_cmd (cmd, sym(p), sym.symarray (x));
   end
 
   %% matlab SMT bug?

inst/@sym/diff.m

@@ -104,7 +104,7 @@
           'args = _ins[1:]'
           'return f.diff(*args),' };
 
-  varargin = sym(varargin);
+  varargin = sym.symarray (varargin);
   z = python_cmd (cmd, sym(f), varargin{:});
 
 end

inst/@sym/eye.m

@@ -50,14 +50,14 @@
   end
 
   if (isa (varargin{nargin}, 'char'))
-    y = eye (cell2nosyms (varargin){:});
+    y = eye (sym.cell2nosyms (varargin){:});
     return
   end
 
   if nargin > 1 %%Sympy don't support eye(A, B)
-    y = sym(eye (cell2nosyms (varargin){:}));
+    y = sym(eye (sym.cell2nosyms (varargin){:}));
   else
-    y = python_cmd ('return eye(*_ins)', sym(varargin){:});
+    y = python_cmd ('return eye(*_ins)', sym.symarray (varargin){:});
   end
 
 end

inst/@sym/factor.m

@@ -98,7 +98,7 @@
 function [p, m] = factor(f, varargin)
 
   f = sym(f);
-  varargin = sym(varargin);
+  varargin = sym.symarray (varargin);
 
   if ((nargin > 1) || (~isempty (findsymbols (f))))
     %% have symbols, do polynomial factorization

inst/@sym/horzcat.m

@@ -60,7 +60,7 @@
           'return sp.MatrixBase.hstack(*_proc),'
           };
 
-  varargin = sym(varargin);
+  varargin = sym.symarray (varargin);
   h = python_cmd (cmd, varargin{:});
 
 end

inst/@sym/hypergeom.m

@@ -96,7 +96,7 @@
           '    return z.applyfunc(lambda x: hyper(a, b, x))'
           'return hyper(a, b, z)' };
 
-  F = python_cmd (cmd, sym(a), sym(b), sym(z));
+  F = python_cmd (cmd, sym.symarray (a), sym.symarray (b), sym(z));
 
 end
 

inst/@sym/interval.m

@@ -56,7 +56,7 @@
     print_usage();
   end
 
-  varargin = sym(varargin);
+  varargin = sym.symarray (varargin);
 
   I = python_cmd ('return Interval(*_ins),', varargin{:});
 

inst/@sym/private/mat_rccross_access.m → inst/@sym/mat_rccross_access.m

@@ -100,12 +100,12 @@
 % To run these in the test suite, you could move this mfile up to @sym.
 % However, note these are generally tested elsewhere indirectly.
 
-%!shared A,B
-%! B = [1 2 3 4; 5 6 7 9; 10 11 12 13];
-%! A = sym(B);
+%%!shared A,B
+%%! B = [1 2 3 4; 5 6 7 9; 10 11 12 13];
+%%! A = sym(B);
 
-%!assert (isequal (mat_rccross_access(A,[1 3],[2 3]), B([1 3], [2 3])  ))
-%!assert (isequal (mat_rccross_access(A,1,[2 3]), B(1,[2 3])  ))
-%!assert (isequal (mat_rccross_access(A,[1 2],4), B([1 2],4)  ))
-%!assert (isequal (mat_rccross_access(A,[2 1],[4 2]), B([2 1],[4 2])  ))
-%!assert (isequal (mat_rccross_access(A,[],[]), B([],[])  ))
+%%!assert (isequal (mat_rccross_access(A,[1 3],[2 3]), B([1 3], [2 3])  ))
+%%!assert (isequal (mat_rccross_access(A,1,[2 3]), B(1,[2 3])  ))
+%%!assert (isequal (mat_rccross_access(A,[1 2],4), B([1 2],4)  ))
+%%!assert (isequal (mat_rccross_access(A,[2 1],[4 2]), B([2 1],[4 2])  ))
+%%!assert (isequal (mat_rccross_access(A,[],[]), B([],[])  ))

inst/@sym/private/mat_rclist_access.m → inst/@sym/mat_rclist_access.m

@@ -53,7 +53,7 @@
 % To run these in the test suite, you could move this mfile up to @sym.
 % However, note these are generally tested elsewhere indirectly.
 
-%!test
-%! B = [1 2 3; 5 6 7];
-%! A = sym(B);
-%! assert (isequal (mat_rclist_access(A,[1 2],[2 3]), [B(1,2); B(2,3)]))
+%%!test
+%%! B = [1 2 3; 5 6 7];
+%%! A = sym(B);
+%%! assert (isequal (mat_rclist_access(A,[1 2],[2 3]), [B(1,2); B(2,3)]))

inst/@sym/private/mat_rclist_asgn.m → inst/@sym/mat_rclist_asgn.m

@@ -89,27 +89,27 @@
 % To run these in the test suite, you could move this mfile up to @sym.
 % However, note these are generally tested elsewhere indirectly.
 
-%!shared A, B
-%! B = [1 2 3; 4 5 6];
-%! A = sym(B);
-%!test
-%! C = B; C([1 6]) = [8 9];
-%! assert (isequal (mat_rclist_asgn(A,[1 2],[1 3],sym([8 9])), C))
+%%!shared A, B
+%%! B = [1 2 3; 4 5 6];
+%%! A = sym(B);
+%%!test
+%%! C = B; C([1 6]) = [8 9];
+%%! assert (isequal (mat_rclist_asgn(A,[1 2],[1 3],sym([8 9])), C))
 
-%!test
-%! % rhs scalar
-%! C = B; C([1 6]) = 88;
-%! assert (isequal (mat_rclist_asgn(A,[1 2],[1 3],sym(88)), C))
+%%!test
+%%! % rhs scalar
+%%! C = B; C([1 6]) = 88;
+%%! assert (isequal (mat_rclist_asgn(A,[1 2],[1 3],sym(88)), C))
 
-%!test
-%! % If rhs is not a vector, make sure col-based access works
-%! rhs = [18 20; 19 21];
-%! C = B; C([1 2 3 4]) = rhs;
-%! D = mat_rclist_asgn(A,[1 2 1 2],[1 1 2 2],sym(rhs));
-%! assert (isequal (D, C))
+%%!test
+%%! % If rhs is not a vector, make sure col-based access works
+%%! rhs = [18 20; 19 21];
+%%! C = B; C([1 2 3 4]) = rhs;
+%%! D = mat_rclist_asgn(A,[1 2 1 2],[1 1 2 2],sym(rhs));
+%%! assert (isequal (D, C))
 
-%!test
-%! % Growth
-%! C = B; C(1,5) = 10;
-%! D = mat_rclist_asgn(A,1,5,sym(10));
-%! assert (isequal (D, C))
+%%!test
+%%! % Growth
+%%! C = B; C(1,5) = 10;
+%%! D = mat_rclist_asgn(A,1,5,sym(10));
+%%! assert (isequal (D, C))

inst/@sym/ones.m

@@ -50,11 +50,11 @@
   end
 
   if (isa (varargin{nargin}, 'char'))
-    y = ones (cell2nosyms (varargin){:});
+    y = ones (sym.cell2nosyms (varargin){:});
     return
   end
 
-  y = python_cmd ('return ones(*_ins)', sym(varargin){:});
+  y = python_cmd ('return ones(*_ins)', sym.symarray (varargin){:});
 
 end
 

inst/@sym/size.m

@@ -65,7 +65,7 @@
 
   % Note: symbolic sized matrices should return double, not sym/string.
 
-  n = x.size;
+  n = x.symsize;
 
   % FIXME: for now, we artificially force symbolic sized objects
   % (where one or more dimension is recorded as NaN) to be 1x1.

inst/@sym/subs.m

@@ -123,13 +123,13 @@
   %% In general
   % We build a list of of pairs of substitutions.
 
-  in = sym(in);
-  out = sym(out);
+  in = sym.symarray (in);
+  out = sym.symarray (out);
 
 
 
   if ( (iscell(in))  ||  (numel(in) >= 2) )
-    assert_same_shape(in,out)
+    sym.assert_same_shape (in, out)
     sublist = cell(1, numel(in));
     for i = 1:numel(in)
       % not really Bug #17, but I doubt if I'd have done it this

inst/@sym/subsasgn.m

@@ -92,18 +92,18 @@
           end
         end
 	for i = 1:length(idx.subs)
-          if (~ is_valid_index(idx.subs{i}))
+          if (~ sym.is_valid_index (idx.subs{i}))
             error('OctSymPy:subsref:invalidIndices', ...
                   'invalid indices: should be integers or boolean');
           end
 	end
-        out = mat_replace(val, idx.subs, sym(rhs));
+        out = sym.mat_replace (val, idx.subs, sym(rhs));
       end
 
     case '.'
-      assert( isa(rhs, 'sym'))
-      assert( ~isa(idx.subs, 'sym'))
-      assert( ~isa(val, 'sym'))
+%      assert( isa(rhs, 'sym') || isa(rhs, 'symfun'))
+%      assert( ~isa(idx.subs, 'sym'))
+%      assert( ~isa(val, 'sym'))
       val.(idx.subs) = rhs;
       out = val;
 

inst/@sym/subsref.m

@@ -61,12 +61,12 @@
         end
       end
       for i = 1:length(idx.subs)
-        if (~ is_valid_index(idx.subs{i}))
+        if (~ sym.is_valid_index (idx.subs{i}))
           error('OctSymPy:subsref:invalidIndices', ...
                 'invalid indices: should be integers or boolean');
         end
       end
-      out = mat_access(f, idx.subs);
+      out = sym.mat_access (f, idx.subs);
 
     case '.'
       fld = idx.subs;
@@ -78,6 +78,8 @@
         out = f.ascii;
       elseif (strcmp (fld, 'unicode'))
         out = f.unicode;
+      elseif (strcmp (fld, 'symsize'))
+        out = f.symsize;
       %elseif (strcmp (fld, 'extra'))
       %  out = f.extra;
       % not part of the interface