Mercurial > octave-nkf

comparison scripts/plot/draw/private/__marching_cube__.m @ 19734:00e31f316a3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Matlab incompatibility of "ismatrix" (bug #42422). * data.cc (isvector): new tests * data.cc (isrow): documentation improved, new tests * data.cc (iscolumn): documentation improved, new tests * data.cc (ismatrix): is matrix now only checks the dimension due to Matlab compatibility, documentation improved, new tests * accumarray.m: use more appropriate function, than ismatrix * gradient.m: use more appropriate function, than ismatrix * num2str.m: use more appropriate functions, than ismatrix * ntsc2rgb.m: use more appropriate function, than ismatrix * condest.m: use more appropriate function, than ismatrix * expm.m: use more appropriate function, than ismatrix * onenormest.m: use more appropriate function, than ismatrix * isocolors.m: use more appropriate function, than ismatrix * isonormals.m: use more appropriate function, than ismatrix * isosurface.m: use more appropriate function, than ismatrix * __errcomm__.m: use more appropriate function, than ismatrix * __interp_cube__.m: use more appropriate function, than ismatrix * __marching_cube__.m: use more appropriate function, than ismatrix * __stem__.m: use more appropriate function, than ismatrix * stairs.m: use more appropriate function, than ismatrix * validsetargs.m: use more appropriate functions, than ismatrix * unique.m: use more appropriate functions, than ismatrix * bicg.m: additional tests for numerical value * bicgstab.m: additional tests for numerical value * cgs.m: additional tests for numerical value * gmres.m: additional tests for numerical value * qmr.m: additional tests for numerical value
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Thu, 12 Feb 2015 18:34:56 +0100
parents 4197fc428c7d
children 9fc020886ae9
comparison
equal deleted inserted replaced
19733:2e9f17872f36 19734:00e31f316a3a
96 96
97 if ((nargin != 5 && nargin != 6) || (nargout != 2 && nargout != 3)) 97 if ((nargin != 5 && nargin != 6) || (nargout != 2 && nargout != 3))
98 print_usage (); 98 print_usage ();
99 endif 99 endif
100 100
101 if (!ismatrix (xx) || !ismatrix (yy) || !ismatrix (zz) || !ismatrix (c) || ... 101 if (!isnumeric (xx) || !isnumeric (yy) || !isnumeric (zz) || !isnumeric (c) || ...
102 ndims (xx) != 3 || ndims (yy) != 3 || ndims (zz) != 3 || ndims (c) != 3) 102 ndims (xx) != 3 || ndims (yy) != 3 || ndims (zz) != 3 || ndims (c) != 3)
103 error ("__marching_cube__: XX, YY, ZZ, C must be matrices of dim 3"); 103 error ("__marching_cube__: XX, YY, ZZ, C must be matrices of dim 3");
104 endif 104 endif
105 105
106 if (!size_equal (xx, yy, zz, c)) 106 if (!size_equal (xx, yy, zz, c))
114 if (!isscalar (iso)) 114 if (!isscalar (iso))
115 error ("__marching_cube__: ISO must be scalar value"); 115 error ("__marching_cube__: ISO must be scalar value");
116 endif 116 endif
117 117
118 if (nargin == 6) 118 if (nargin == 6)
119 if ( !ismatrix (colors) || ndims (colors) != 3 || size (colors) != size (c) ) 119 if ( !isnumeric (colors) || ndims (colors) != 3 || size (colors) != size (c) )
120 error ( "COLORS must be a matrix of dim 3 and of same size as C" ); 120 error ( "COLORS must be a matrix of dim 3 and of same size as C" );
121 endif 121 endif
122 calc_cols = true; 122 calc_cols = true;
123 lindex = 5; 123 lindex = 5;
124 endif 124 endif