Mercurial > octave

comparison libinterp/corefcn/bsxfun.cc @ 23582:0cc2011d800e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Deprecate is_real_type and replace with isreal. * ov.h (is_real_type): Use OCTAVE_DEPRECATED macro around function. * ov.h (isreal): New function. * QtHandlesUtils.cc, __luinc__.cc, bsxfun.cc, cellfun.cc, conv2.cc, data.cc, det.cc, eig.cc, ellipj.cc, fft.cc, fft2.cc, fftn.cc, find.cc, graphics.cc, graphics.in.h, gsvd.cc, hess.cc, inv.cc, lu.cc, mex.cc, oct-stream.cc, pinv.cc, psi.cc, qz.cc, schur.cc, svd.cc, typecast.cc, chol.cc, dmperm.cc, qr.cc, symbfact.cc, symrcm.cc, ov-base-int.h, ov-base.h, ov-bool-mat.h, ov-bool-sparse.h, ov-bool.h, ov-ch-mat.h, ov-float.h, ov-flt-re-diag.h, ov-flt-re-mat.h, ov-java.cc, ov-lazy-idx.h, ov-perm.h, ov-range.h, ov-re-diag.h, ov-re-mat.h, ov-re-sparse.h, ov-scalar.h, pt-tm-const.cc: Replace instances of is_real_type with isreal.
author Rik <rik@octave.org>
date Tue, 13 Jun 2017 07:53:53 -0700
parents c3075ae020e1
children b7747a2c88b2
comparison
equal deleted inserted replaced
23581:c3075ae020e1 23582:0cc2011d800e
469 if (! tmp(0).is_sparse_type ()) 469 if (! tmp(0).is_sparse_type ())
470 { 470 {
471 std::string result_type = tmp(0).class_name (); 471 std::string result_type = tmp(0).class_name ();
472 if (result_type == "double") 472 if (result_type == "double")
473 { 473 {
474 if (tmp(0).is_real_type ()) 474 if (tmp(0).isreal ())
475 { 475 {
476 have_NDArray = true; 476 have_NDArray = true;
477 result_NDArray = tmp(0).array_value (); 477 result_NDArray = tmp(0).array_value ();
478 result_NDArray.resize (dvc); 478 result_NDArray.resize (dvc);
479 } 479 }
485 result_ComplexNDArray.resize (dvc); 485 result_ComplexNDArray.resize (dvc);
486 } 486 }
487 } 487 }
488 else if (result_type == "single") 488 else if (result_type == "single")
489 { 489 {
490 if (tmp(0).is_real_type ()) 490 if (tmp(0).isreal ())
491 { 491 {
492 have_FloatNDArray = true; 492 have_FloatNDArray = true;
493 result_FloatNDArray 493 result_FloatNDArray
494 = tmp(0).float_array_value (); 494 = tmp(0).float_array_value ();
495 result_FloatNDArray.resize (dvc); 495 result_FloatNDArray.resize (dvc);
564 (tmp(0).array_value (), ra_idx); 564 (tmp(0).array_value (), ra_idx);
565 have_FloatNDArray = false; 565 have_FloatNDArray = false;
566 have_NDArray = true; 566 have_NDArray = true;
567 } 567 }
568 } 568 }
569 else if (tmp(0).is_real_type ()) 569 else if (tmp(0).isreal ())
570 result_FloatNDArray.insert 570 result_FloatNDArray.insert
571 (tmp(0).float_array_value (), ra_idx); 571 (tmp(0).float_array_value (), ra_idx);
572 else 572 else
573 { 573 {
574 result_FloatComplexNDArray = 574 result_FloatComplexNDArray =
586 { 586 {
587 have_NDArray = false; 587 have_NDArray = false;
588 C = result_NDArray; 588 C = result_NDArray;
589 C = do_cat_op (C, tmp(0), ra_idx); 589 C = do_cat_op (C, tmp(0), ra_idx);
590 } 590 }
591 else if (tmp(0).is_real_type ()) 591 else if (tmp(0).isreal ())
592 result_NDArray.insert (tmp(0).array_value (), 592 result_NDArray.insert (tmp(0).array_value (),
593 ra_idx); 593 ra_idx);
594 else 594 else
595 { 595 {
596 result_ComplexNDArray = 596 result_ComplexNDArray =