comparison liboctave/array/fCMatrix.cc @ 29931:7faff48840eb

prefer data over fortran_vec for read-only access to data See also the discussion here: https://octave.discourse.group/t/rename-uses-of-fortran-vec-to-data-for-clarity/1439 * Array.h (const T * Array<T>::fortran_vec (void) const): Deprecate. Change all uses to call data instead.
author John W. Eaton <jwe@octave.org>
date Fri, 30 Jul 2021 11:46:05 -0400
parents 3cb8519fed0f
children 1e277c6b6626
comparison
equal deleted inserted replaced
29930:aa98b5fdfbbb 29931:7faff48840eb
1350 typ = mattype.type (*this); 1350 typ = mattype.type (*this);
1351 1351
1352 // Only calculate the condition number for LU/Cholesky 1352 // Only calculate the condition number for LU/Cholesky
1353 if (typ == MatrixType::Upper) 1353 if (typ == MatrixType::Upper)
1354 { 1354 {
1355 const FloatComplex *tmp_data = fortran_vec (); 1355 const FloatComplex *tmp_data = data ();
1356 F77_INT info = 0; 1356 F77_INT info = 0;
1357 char norm = '1'; 1357 char norm = '1';
1358 char uplo = 'U'; 1358 char uplo = 'U';
1359 char dia = 'N'; 1359 char dia = 'N';
1360 1360
1378 else if (typ == MatrixType::Permuted_Upper) 1378 else if (typ == MatrixType::Permuted_Upper)
1379 (*current_liboctave_error_handler) 1379 (*current_liboctave_error_handler)
1380 ("permuted triangular matrix not implemented"); 1380 ("permuted triangular matrix not implemented");
1381 else if (typ == MatrixType::Lower) 1381 else if (typ == MatrixType::Lower)
1382 { 1382 {
1383 const FloatComplex *tmp_data = fortran_vec (); 1383 const FloatComplex *tmp_data = data ();
1384 F77_INT info = 0; 1384 F77_INT info = 0;
1385 char norm = '1'; 1385 char norm = '1';
1386 char uplo = 'L'; 1386 char uplo = 'L';
1387 char dia = 'N'; 1387 char dia = 'N';
1388 1388
1530 if (typ == MatrixType::Permuted_Upper) 1530 if (typ == MatrixType::Permuted_Upper)
1531 (*current_liboctave_error_handler) 1531 (*current_liboctave_error_handler)
1532 ("permuted triangular matrix not implemented"); 1532 ("permuted triangular matrix not implemented");
1533 else 1533 else
1534 { 1534 {
1535 const FloatComplex *tmp_data = fortran_vec (); 1535 const FloatComplex *tmp_data = data ();
1536 1536
1537 retval = b; 1537 retval = b;
1538 FloatComplex *result = retval.fortran_vec (); 1538 FloatComplex *result = retval.fortran_vec ();
1539 1539
1540 char uplo = 'U'; 1540 char uplo = 'U';
1632 if (typ == MatrixType::Permuted_Lower) 1632 if (typ == MatrixType::Permuted_Lower)
1633 (*current_liboctave_error_handler) 1633 (*current_liboctave_error_handler)
1634 ("permuted triangular matrix not implemented"); 1634 ("permuted triangular matrix not implemented");
1635 else 1635 else
1636 { 1636 {
1637 const FloatComplex *tmp_data = fortran_vec (); 1637 const FloatComplex *tmp_data = data ();
1638 1638
1639 retval = b; 1639 retval = b;
1640 FloatComplex *result = retval.fortran_vec (); 1640 FloatComplex *result = retval.fortran_vec ();
1641 1641
1642 char uplo = 'L'; 1642 char uplo = 'L';