Mercurial > octave

comparison libinterp/corefcn/xpow.cc @ 21100:e39e05d90788

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. * libinterp/corefcn/errwarn.h, libinterp/corefcn/errwarn.cc: New header and .cc file with common errors and warnings for libinterp. * libinterp/corefcn/module.mk: Add errwarn.h, errwarn.cc to build system. * liboctave/util/lo-array-errwarn.h, liboctave/util/lo-array-errwarn.cc: New header and .cc file with common errors and warnings for liboctave. * liboctave/util/module.mk: Add lo-array-errwarn.h, lo-array-errwarn.cc to build system. * lo-array-gripes.h: #include "lo-array-errwarn.h" for access to class index_exception. Remove const char *error_id_XXX prototypes. * lo-array-gripes.cc: Remove const char *error_id_XXX initializations. Remove index_exception method definitions. * Cell.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, betainc.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, det.cc, dirfns.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, graphics.in.h, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-typeinfo.cc, load-save.cc, lookup.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lsode.cc, lu.cc, luinc.cc, max.cc, mgorth.cc, oct-hist.cc, oct-procbuf.cc, oct-stream.cc, oct.h, pager.cc, pinv.cc, pr-output.cc, quad.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, syscalls.cc, typecast.cc, utils.cc, variables.cc, xdiv.cc, xnorm.cc, xpow.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, audiodevinfo.cc, audioread.cc, chol.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-complex.cc, ov-complex.h, ov-cs-list.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-mex-fcn.cc, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-struct.cc, ov-type-conv.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, ops.h, lex.ll, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt-loop.cc, pt-mat.cc, pt-stmt.cc, Array-util.cc, Array-util.h, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc, MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc, fCmplxGEPBAL.cc, floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, oct-binmap.h: Replace 'include "gripes.h"' with 'include "errwarn.h". Change all gripe_XXX to err_XXX or warn_XXX or errwarn_XXX.
author Rik <rik@octave.org>
date Mon, 18 Jan 2016 18:28:06 -0800
parents 5e00ed38a58b
children dfcb9d74b253
comparison
equal deleted inserted replaced
21099:52af4092f863 21100:e39e05d90788
791 791
792 octave_idx_type b_nr = b.rows (); 792 octave_idx_type b_nr = b.rows ();
793 octave_idx_type b_nc = b.cols (); 793 octave_idx_type b_nc = b.cols ();
794 794
795 if (nr != b_nr || nc != b_nc) 795 if (nr != b_nr || nc != b_nc)
796 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 796 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
797 797
798 int convert_to_complex = 0; 798 int convert_to_complex = 0;
799 for (octave_idx_type j = 0; j < nc; j++) 799 for (octave_idx_type j = 0; j < nc; j++)
800 for (octave_idx_type i = 0; i < nr; i++) 800 for (octave_idx_type i = 0; i < nr; i++)
801 { 801 {
871 871
872 octave_idx_type b_nr = b.rows (); 872 octave_idx_type b_nr = b.rows ();
873 octave_idx_type b_nc = b.cols (); 873 octave_idx_type b_nc = b.cols ();
874 874
875 if (nr != b_nr || nc != b_nc) 875 if (nr != b_nr || nc != b_nc)
876 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 876 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
877 877
878 ComplexMatrix result (nr, nc); 878 ComplexMatrix result (nr, nc);
879 879
880 for (octave_idx_type j = 0; j < nc; j++) 880 for (octave_idx_type j = 0; j < nc; j++)
881 for (octave_idx_type i = 0; i < nr; i++) 881 for (octave_idx_type i = 0; i < nr; i++)
1009 1009
1010 octave_idx_type b_nr = b.rows (); 1010 octave_idx_type b_nr = b.rows ();
1011 octave_idx_type b_nc = b.cols (); 1011 octave_idx_type b_nc = b.cols ();
1012 1012
1013 if (nr != b_nr || nc != b_nc) 1013 if (nr != b_nr || nc != b_nc)
1014 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 1014 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
1015 1015
1016 ComplexMatrix result (nr, nc); 1016 ComplexMatrix result (nr, nc);
1017 1017
1018 for (octave_idx_type j = 0; j < nc; j++) 1018 for (octave_idx_type j = 0; j < nc; j++)
1019 for (octave_idx_type i = 0; i < nr; i++) 1019 for (octave_idx_type i = 0; i < nr; i++)
1057 1057
1058 octave_idx_type b_nr = b.rows (); 1058 octave_idx_type b_nr = b.rows ();
1059 octave_idx_type b_nc = b.cols (); 1059 octave_idx_type b_nc = b.cols ();
1060 1060
1061 if (nr != b_nr || nc != b_nc) 1061 if (nr != b_nr || nc != b_nc)
1062 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 1062 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
1063 1063
1064 ComplexMatrix result (nr, nc); 1064 ComplexMatrix result (nr, nc);
1065 1065
1066 for (octave_idx_type j = 0; j < nc; j++) 1066 for (octave_idx_type j = 0; j < nc; j++)
1067 for (octave_idx_type i = 0; i < nr; i++) 1067 for (octave_idx_type i = 0; i < nr; i++)
1239 return octave_value (bsxfun_pow (ComplexNDArray (xa), xb)); 1239 return octave_value (bsxfun_pow (ComplexNDArray (xa), xb));
1240 else 1240 else
1241 return octave_value (bsxfun_pow (xa, xb)); 1241 return octave_value (bsxfun_pow (xa, xb));
1242 } 1242 }
1243 else 1243 else
1244 gripe_nonconformant ("operator .^", a_dims, b_dims); 1244 err_nonconformant ("operator .^", a_dims, b_dims);
1245 } 1245 }
1246 1246
1247 int len = a.numel (); 1247 int len = a.numel ();
1248 1248
1249 bool convert_to_complex = false; 1249 bool convert_to_complex = false;
1318 if (is_valid_bsxfun ("operator .^", a_dims, b_dims)) 1318 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
1319 { 1319 {
1320 return bsxfun_pow (a, b); 1320 return bsxfun_pow (a, b);
1321 } 1321 }
1322 else 1322 else
1323 gripe_nonconformant ("operator .^", a_dims, b_dims); 1323 err_nonconformant ("operator .^", a_dims, b_dims);
1324 } 1324 }
1325 1325
1326 ComplexNDArray result (a_dims); 1326 ComplexNDArray result (a_dims);
1327 1327
1328 for (octave_idx_type i = 0; i < a.numel (); i++) 1328 for (octave_idx_type i = 0; i < a.numel (); i++)
1414 if (is_valid_bsxfun ("operator .^", a_dims, b_dims)) 1414 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
1415 { 1415 {
1416 return bsxfun_pow (a, b); 1416 return bsxfun_pow (a, b);
1417 } 1417 }
1418 else 1418 else
1419 gripe_nonconformant ("operator .^", a_dims, b_dims); 1419 err_nonconformant ("operator .^", a_dims, b_dims);
1420 } 1420 }
1421 1421
1422 ComplexNDArray result (a_dims); 1422 ComplexNDArray result (a_dims);
1423 1423
1424 for (octave_idx_type i = 0; i < a.numel (); i++) 1424 for (octave_idx_type i = 0; i < a.numel (); i++)
1461 if (is_valid_bsxfun ("operator .^", a_dims, b_dims)) 1461 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
1462 { 1462 {
1463 return bsxfun_pow (a, b); 1463 return bsxfun_pow (a, b);
1464 } 1464 }
1465 else 1465 else
1466 gripe_nonconformant ("operator .^", a_dims, b_dims); 1466 err_nonconformant ("operator .^", a_dims, b_dims);
1467 } 1467 }
1468 1468
1469 ComplexNDArray result (a_dims); 1469 ComplexNDArray result (a_dims);
1470 1470
1471 for (octave_idx_type i = 0; i < a.numel (); i++) 1471 for (octave_idx_type i = 0; i < a.numel (); i++)
2153 2153
2154 octave_idx_type b_nr = b.rows (); 2154 octave_idx_type b_nr = b.rows ();
2155 octave_idx_type b_nc = b.cols (); 2155 octave_idx_type b_nc = b.cols ();
2156 2156
2157 if (nr != b_nr || nc != b_nc) 2157 if (nr != b_nr || nc != b_nc)
2158 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 2158 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
2159 2159
2160 int convert_to_complex = 0; 2160 int convert_to_complex = 0;
2161 for (octave_idx_type j = 0; j < nc; j++) 2161 for (octave_idx_type j = 0; j < nc; j++)
2162 for (octave_idx_type i = 0; i < nr; i++) 2162 for (octave_idx_type i = 0; i < nr; i++)
2163 { 2163 {
2233 2233
2234 octave_idx_type b_nr = b.rows (); 2234 octave_idx_type b_nr = b.rows ();
2235 octave_idx_type b_nc = b.cols (); 2235 octave_idx_type b_nc = b.cols ();
2236 2236
2237 if (nr != b_nr || nc != b_nc) 2237 if (nr != b_nr || nc != b_nc)
2238 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 2238 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
2239 2239
2240 FloatComplexMatrix result (nr, nc); 2240 FloatComplexMatrix result (nr, nc);
2241 2241
2242 for (octave_idx_type j = 0; j < nc; j++) 2242 for (octave_idx_type j = 0; j < nc; j++)
2243 for (octave_idx_type i = 0; i < nr; i++) 2243 for (octave_idx_type i = 0; i < nr; i++)
2331 2331
2332 octave_idx_type b_nr = b.rows (); 2332 octave_idx_type b_nr = b.rows ();
2333 octave_idx_type b_nc = b.cols (); 2333 octave_idx_type b_nc = b.cols ();
2334 2334
2335 if (nr != b_nr || nc != b_nc) 2335 if (nr != b_nr || nc != b_nc)
2336 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 2336 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
2337 2337
2338 FloatComplexMatrix result (nr, nc); 2338 FloatComplexMatrix result (nr, nc);
2339 2339
2340 for (octave_idx_type j = 0; j < nc; j++) 2340 for (octave_idx_type j = 0; j < nc; j++)
2341 for (octave_idx_type i = 0; i < nr; i++) 2341 for (octave_idx_type i = 0; i < nr; i++)
2379 2379
2380 octave_idx_type b_nr = b.rows (); 2380 octave_idx_type b_nr = b.rows ();
2381 octave_idx_type b_nc = b.cols (); 2381 octave_idx_type b_nc = b.cols ();
2382 2382
2383 if (nr != b_nr || nc != b_nc) 2383 if (nr != b_nr || nc != b_nc)
2384 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc); 2384 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
2385 2385
2386 FloatComplexMatrix result (nr, nc); 2386 FloatComplexMatrix result (nr, nc);
2387 2387
2388 for (octave_idx_type j = 0; j < nc; j++) 2388 for (octave_idx_type j = 0; j < nc; j++)
2389 for (octave_idx_type i = 0; i < nr; i++) 2389 for (octave_idx_type i = 0; i < nr; i++)
2561 return octave_value (bsxfun_pow (FloatComplexNDArray (xa), xb)); 2561 return octave_value (bsxfun_pow (FloatComplexNDArray (xa), xb));
2562 else 2562 else
2563 return octave_value (bsxfun_pow (xa, xb)); 2563 return octave_value (bsxfun_pow (xa, xb));
2564 } 2564 }
2565 else 2565 else
2566 gripe_nonconformant ("operator .^", a_dims, b_dims); 2566 err_nonconformant ("operator .^", a_dims, b_dims);
2567 } 2567 }
2568 2568
2569 int len = a.numel (); 2569 int len = a.numel ();
2570 2570
2571 bool convert_to_complex = false; 2571 bool convert_to_complex = false;
2640 if (is_valid_bsxfun ("operator .^", a_dims, b_dims)) 2640 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
2641 { 2641 {
2642 return bsxfun_pow (a, b); 2642 return bsxfun_pow (a, b);
2643 } 2643 }
2644 else 2644 else
2645 gripe_nonconformant ("operator .^", a_dims, b_dims); 2645 err_nonconformant ("operator .^", a_dims, b_dims);
2646 } 2646 }
2647 2647
2648 FloatComplexNDArray result (a_dims); 2648 FloatComplexNDArray result (a_dims);
2649 2649
2650 for (octave_idx_type i = 0; i < a.numel (); i++) 2650 for (octave_idx_type i = 0; i < a.numel (); i++)
2736 if (is_valid_bsxfun ("operator .^", a_dims, b_dims)) 2736 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
2737 { 2737 {
2738 return bsxfun_pow (a, b); 2738 return bsxfun_pow (a, b);
2739 } 2739 }
2740 else 2740 else
2741 gripe_nonconformant ("operator .^", a_dims, b_dims); 2741 err_nonconformant ("operator .^", a_dims, b_dims);
2742 } 2742 }
2743 2743
2744 FloatComplexNDArray result (a_dims); 2744 FloatComplexNDArray result (a_dims);
2745 2745
2746 for (octave_idx_type i = 0; i < a.numel (); i++) 2746 for (octave_idx_type i = 0; i < a.numel (); i++)
2783 if (is_valid_bsxfun ("operator .^", a_dims, b_dims)) 2783 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
2784 { 2784 {
2785 return bsxfun_pow (a, b); 2785 return bsxfun_pow (a, b);
2786 } 2786 }
2787 else 2787 else
2788 gripe_nonconformant ("operator .^", a_dims, b_dims); 2788 err_nonconformant ("operator .^", a_dims, b_dims);
2789 } 2789 }
2790 2790
2791 FloatComplexNDArray result (a_dims); 2791 FloatComplexNDArray result (a_dims);
2792 2792
2793 for (octave_idx_type i = 0; i < a.numel (); i++) 2793 for (octave_idx_type i = 0; i < a.numel (); i++)