Mercurial > octave

changeset 31190:9a0e3f0b3823

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 15 Aug 2022 12:44:17 +0200
parents be5f23b39ee3 (current diff) 820d2c802247 (diff)
children 7401a2501be4
files libinterp/corefcn/quadcc.cc
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/__ichol__.cc	Mon Aug 15 13:49:54 2022 +0900
+++ b/libinterp/corefcn/__ichol__.cc	Mon Aug 15 12:44:17 2022 +0200
@@ -435,9 +435,10 @@
     {
       SparseMatrix L;
       SparseMatrix sm_l = Ftril (args(0))(0).sparse_matrix_value ();
+      RowVector sm_col_norms = xcolnorms (sm_l, 1);
       ichol_t <SparseMatrix,
                double, ichol_mult_real, ichol_checkpivot_real>
-        (sm_l, L, xcolnorms (sm_l, 1).fortran_vec (), droptol, michol);
+        (sm_l, L, sm_col_norms.fortran_vec (), droptol, michol);
 
       return ovl (L);
     }
--- a/libinterp/corefcn/__ilu__.cc	Mon Aug 15 13:49:54 2022 +0900
+++ b/libinterp/corefcn/__ilu__.cc	Mon Aug 15 12:44:17 2022 +0200
@@ -483,9 +483,11 @@
       SparseMatrix sm_l = Ftril (ovl (sm, -1))(0).sparse_matrix_value ();
       SparseMatrix U, L;
 
+      RowVector sm_col_norms = xcolnorms (sm);
+      ColumnVector sm_row_norms = xrownorms (sm);
       ilu_crout <SparseMatrix, double> (sm_l, sm_u, L, U,
-                                        xcolnorms (sm).fortran_vec (),
-                                        xrownorms (sm).fortran_vec (),
+                                        sm_col_norms.fortran_vec (),
+                                        sm_row_norms.fortran_vec (),
                                         droptol, milu);
 
       SparseMatrix speye (DiagMatrix (L.cols (), L.cols (), 1.0));
--- a/libinterp/corefcn/quadcc.cc	Mon Aug 15 13:49:54 2022 +0900
+++ b/libinterp/corefcn/quadcc.cc	Mon Aug 15 12:44:17 2022 +0200
@@ -1671,7 +1671,8 @@
   else
     {
       // Intervals around singularities.
-      sing = args(4).array_value ().fortran_vec ();
+      NDArray arr = args(4).array_value ();
+      sing = arr.fortran_vec ();
       iivals[0] = a;
       std::copy_n (sing, nivals-1, iivals+1);
       iivals[nivals] = b;