Mercurial > hg > octave-nkf

comparison liboctave/numeric/sparse-base-chol.cc @ 19331:afd6179d2616

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow building with new version of SuiteSparse (bug #43063) * oct-sparse.h (SUITESPARSE_ASSIGN_FPTR, SUITESPARSE_ASSIGN_FPTR2): New macros. * amd.cc, symbfact.cc, CSparse.cc, dSparse.cc, sparse-base-chol.cc: Use as needed. From Andre da Costa Barros <andre.cbarros@yahoo.com>.
author John W. Eaton <jwe@octave.org>
date Sun, 21 Sep 2014 15:45:08 -0400
parents d63878346099
children 4197fc428c7d
comparison
equal deleted inserted replaced
19330:ebeb3defae37 19331:afd6179d2616
103 103
104 double spu = octave_sparse_params::get_key ("spumoni"); 104 double spu = octave_sparse_params::get_key ("spumoni");
105 if (spu == 0.) 105 if (spu == 0.)
106 { 106 {
107 cm->print = -1; 107 cm->print = -1;
108 cm->print_function = 0; 108 SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
109 } 109 }
110 else 110 else
111 { 111 {
112 cm->print = static_cast<int> (spu) + 2; 112 cm->print = static_cast<int> (spu) + 2;
113 cm->print_function =&SparseCholPrint; 113 SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
114 } 114 }
115 115
116 cm->error_handler = &SparseCholError; 116 cm->error_handler = &SparseCholError;
117 cm->complex_divide = CHOLMOD_NAME(divcomplex); 117 SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
118 cm->hypotenuse = CHOLMOD_NAME(hypot); 118 SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
119 119
120 cm->final_asis = false; 120 cm->final_asis = false;
121 cm->final_super = false; 121 cm->final_super = false;
122 cm->final_ll = true; 122 cm->final_ll = true;
123 cm->final_pack = true; 123 cm->final_pack = true;