Mercurial > octave-nkf

comparison src/xpow.cc @ 14056:c3d401562410 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow warning (or error) for automatic bsxfun * liboctave/bsxfun.h (is_valid_bsxfun, is_valid_inplace_bsxfun): New argument, name. Change all callers. Call warning_with_id_handler.
author John W. Eaton <jwe@octave.org>
date Thu, 15 Dec 2011 11:23:51 -0500
parents 1bf8c244040a
children 72c96de7a403
comparison
equal deleted inserted replaced
14055:4000ad5fe0f6 14056:c3d401562410
1243 dim_vector a_dims = a.dims (); 1243 dim_vector a_dims = a.dims ();
1244 dim_vector b_dims = b.dims (); 1244 dim_vector b_dims = b.dims ();
1245 1245
1246 if (a_dims != b_dims) 1246 if (a_dims != b_dims)
1247 { 1247 {
1248 if (is_valid_bsxfun (a_dims, b_dims)) 1248 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
1249 { 1249 {
1250 //Potentially complex results 1250 //Potentially complex results
1251 NDArray xa = octave_value_extract<NDArray> (a); 1251 NDArray xa = octave_value_extract<NDArray> (a);
1252 NDArray xb = octave_value_extract<NDArray> (b); 1252 NDArray xb = octave_value_extract<NDArray> (b);
1253 if (! xb.all_integers () && xa.any_element_is_negative ()) 1253 if (! xb.all_integers () && xa.any_element_is_negative ())
1331 dim_vector a_dims = a.dims (); 1331 dim_vector a_dims = a.dims ();
1332 dim_vector b_dims = b.dims (); 1332 dim_vector b_dims = b.dims ();
1333 1333
1334 if (a_dims != b_dims) 1334 if (a_dims != b_dims)
1335 { 1335 {
1336 if (is_valid_bsxfun (a_dims, b_dims)) 1336 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
1337 { 1337 {
1338 return bsxfun_pow (a, b); 1338 return bsxfun_pow (a, b);
1339 } 1339 }
1340 else 1340 else
1341 { 1341 {
1430 dim_vector a_dims = a.dims (); 1430 dim_vector a_dims = a.dims ();
1431 dim_vector b_dims = b.dims (); 1431 dim_vector b_dims = b.dims ();
1432 1432
1433 if (a_dims != b_dims) 1433 if (a_dims != b_dims)
1434 { 1434 {
1435 if (is_valid_bsxfun (a_dims, b_dims)) 1435 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
1436 { 1436 {
1437 return bsxfun_pow (a, b); 1437 return bsxfun_pow (a, b);
1438 } 1438 }
1439 else 1439 else
1440 { 1440 {
1480 dim_vector a_dims = a.dims (); 1480 dim_vector a_dims = a.dims ();
1481 dim_vector b_dims = b.dims (); 1481 dim_vector b_dims = b.dims ();
1482 1482
1483 if (a_dims != b_dims) 1483 if (a_dims != b_dims)
1484 { 1484 {
1485 if (is_valid_bsxfun (a_dims, b_dims)) 1485 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
1486 { 1486 {
1487 return bsxfun_pow (a, b); 1487 return bsxfun_pow (a, b);
1488 } 1488 }
1489 else 1489 else
1490 { 1490 {
2596 dim_vector a_dims = a.dims (); 2596 dim_vector a_dims = a.dims ();
2597 dim_vector b_dims = b.dims (); 2597 dim_vector b_dims = b.dims ();
2598 2598
2599 if (a_dims != b_dims) 2599 if (a_dims != b_dims)
2600 { 2600 {
2601 if (is_valid_bsxfun (a_dims, b_dims)) 2601 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
2602 { 2602 {
2603 //Potentially complex results 2603 //Potentially complex results
2604 FloatNDArray xa = octave_value_extract<FloatNDArray> (a); 2604 FloatNDArray xa = octave_value_extract<FloatNDArray> (a);
2605 FloatNDArray xb = octave_value_extract<FloatNDArray> (b); 2605 FloatNDArray xb = octave_value_extract<FloatNDArray> (b);
2606 if (! xb.all_integers () && xa.any_element_is_negative ()) 2606 if (! xb.all_integers () && xa.any_element_is_negative ())
2684 dim_vector a_dims = a.dims (); 2684 dim_vector a_dims = a.dims ();
2685 dim_vector b_dims = b.dims (); 2685 dim_vector b_dims = b.dims ();
2686 2686
2687 if (a_dims != b_dims) 2687 if (a_dims != b_dims)
2688 { 2688 {
2689 if (is_valid_bsxfun (a_dims, b_dims)) 2689 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
2690 { 2690 {
2691 return bsxfun_pow (a, b); 2691 return bsxfun_pow (a, b);
2692 } 2692 }
2693 else 2693 else
2694 { 2694 {
2783 dim_vector a_dims = a.dims (); 2783 dim_vector a_dims = a.dims ();
2784 dim_vector b_dims = b.dims (); 2784 dim_vector b_dims = b.dims ();
2785 2785
2786 if (a_dims != b_dims) 2786 if (a_dims != b_dims)
2787 { 2787 {
2788 if (is_valid_bsxfun (a_dims, b_dims)) 2788 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
2789 { 2789 {
2790 return bsxfun_pow (a, b); 2790 return bsxfun_pow (a, b);
2791 } 2791 }
2792 else 2792 else
2793 { 2793 {
2833 dim_vector a_dims = a.dims (); 2833 dim_vector a_dims = a.dims ();
2834 dim_vector b_dims = b.dims (); 2834 dim_vector b_dims = b.dims ();
2835 2835
2836 if (a_dims != b_dims) 2836 if (a_dims != b_dims)
2837 { 2837 {
2838 if (is_valid_bsxfun (a_dims, b_dims)) 2838 if (is_valid_bsxfun ("operator .^", a_dims, b_dims))
2839 { 2839 {
2840 return bsxfun_pow (a, b); 2840 return bsxfun_pow (a, b);
2841 } 2841 }
2842 else 2842 else
2843 { 2843 {