Mercurial > octave-nkf

comparison libinterp/corefcn/__ilu__.cc @ 20549:71e60880105a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding convention for parenthesis in __ilu__.cc. * __ilu__.cc: Use Octave coding convention for parenthesis.cc.
author Rik <rik@octave.org>
date Fri, 25 Sep 2015 18:50:41 -0700
parents 4f45eaf83908
children f90c8372b7ba
comparison
equal deleted inserted replaced
20548:96153b16febe 20549:71e60880105a
527 else 527 else
528 { 528 {
529 Array<Complex> cols_norm, rows_norm; 529 Array<Complex> cols_norm, rows_norm;
530 param_list.append (args(0).sparse_complex_matrix_value ()); 530 param_list.append (args(0).sparse_complex_matrix_value ());
531 SparseComplexMatrix sm_u = 531 SparseComplexMatrix sm_u =
532 feval("triu", param_list)(0).sparse_complex_matrix_value (); 532 feval ("triu", param_list)(0).sparse_complex_matrix_value ();
533 param_list.append (-1); 533 param_list.append (-1);
534 SparseComplexMatrix sm_l = 534 SparseComplexMatrix sm_l =
535 feval("tril", param_list)(0).sparse_complex_matrix_value (); 535 feval ("tril", param_list)(0).sparse_complex_matrix_value ();
536 param_list(1) = "rows"; 536 param_list(1) = "rows";
537 rows_norm = feval ("norm", param_list)(0).complex_vector_value (); 537 rows_norm = feval ("norm", param_list)(0).complex_vector_value ();
538 param_list(1) = "cols"; 538 param_list(1) = "cols";
539 cols_norm = feval ("norm", param_list)(0).complex_vector_value (); 539 cols_norm = feval ("norm", param_list)(0).complex_vector_value ();
540 param_list.clear (); 540 param_list.clear ();
582 582
583 const octave_idx_type n = sm.cols (); 583 const octave_idx_type n = sm.cols ();
584 584
585 // That is necessary for the JKI (milu = "row") variant. 585 // That is necessary for the JKI (milu = "row") variant.
586 if (opt == ROW) 586 if (opt == ROW)
587 sm = sm.transpose(); 587 sm = sm.transpose ();
588 588
589 // Extract pointers to the arrays for faster access inside loops 589 // Extract pointers to the arrays for faster access inside loops
590 octave_idx_type* cidx_in = sm.cidx (); 590 octave_idx_type* cidx_in = sm.cidx ();
591 octave_idx_type* ridx_in = sm.ridx (); 591 octave_idx_type* ridx_in = sm.ridx ();
592 T* data_in = sm.data (); 592 T* data_in = sm.data ();
611 Array <octave_idx_type> cidx_out_u (dim_vector (n + 1, 1)); 611 Array <octave_idx_type> cidx_out_u (dim_vector (n + 1, 1));
612 octave_idx_type* cidx_u = cidx_out_u.fortran_vec (); 612 octave_idx_type* cidx_u = cidx_out_u.fortran_vec ();
613 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1)); 613 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1));
614 octave_idx_type* ridx_u = ridx_out_u.fortran_vec (); 614 octave_idx_type* ridx_u = ridx_out_u.fortran_vec ();
615 Array <T> data_out_u (dim_vector (max_len_u, 1)); 615 Array <T> data_out_u (dim_vector (max_len_u, 1));
616 T* data_u = data_out_u.fortran_vec(); 616 T* data_u = data_out_u.fortran_vec ();
617 617
618 // Working arrays and permutation arrays 618 // Working arrays and permutation arrays
619 octave_idx_type w_len_u, w_len_l; 619 octave_idx_type w_len_u, w_len_l;
620 T total_sum, partial_col_sum = zero, partial_row_sum = zero; 620 T total_sum, partial_col_sum = zero, partial_row_sum = zero;
621 std::set <octave_idx_type> iw_l; 621 std::set <octave_idx_type> iw_l;