comparison liboctave/numeric/oct-spparms.cc @ 31607:aac27ad79be6 stable

maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
comparison
equal deleted inserted replaced
31605:e88a07dec498 31607:aac27ad79be6
35 #include "oct-spparms.h" 35 #include "oct-spparms.h"
36 #include "singleton-cleanup.h" 36 #include "singleton-cleanup.h"
37 37
38 OCTAVE_BEGIN_NAMESPACE(octave) 38 OCTAVE_BEGIN_NAMESPACE(octave)
39 39
40 sparse_params *sparse_params::s_instance = nullptr; 40 sparse_params *sparse_params::s_instance = nullptr;
41 41
42 bool sparse_params::instance_ok (void) 42 bool sparse_params::instance_ok (void)
43 { 43 {
44 bool retval = true; 44 bool retval = true;
45 45
46 if (! s_instance) 46 if (! s_instance)
47 { 47 {
48 s_instance = new sparse_params (); 48 s_instance = new sparse_params ();
49 singleton_cleanup_list::add (cleanup_instance); 49 singleton_cleanup_list::add (cleanup_instance);
50 } 50 }
51 51
52 return retval; 52 return retval;
53 } 53 }
54 54
55 void sparse_params::defaults (void) 55 void sparse_params::defaults (void)
56 { 56 {
57 if (instance_ok ()) 57 if (instance_ok ())
58 s_instance->do_defaults (); 58 s_instance->do_defaults ();
59 } 59 }
60 60
61 void sparse_params::tight (void) 61 void sparse_params::tight (void)
62 { 62 {
63 if (instance_ok ()) 63 if (instance_ok ())
64 s_instance->do_tight (); 64 s_instance->do_tight ();
65 } 65 }
66 66
67 string_vector sparse_params::get_keys (void) 67 string_vector sparse_params::get_keys (void)
68 { 68 {
69 return instance_ok () ? s_instance->do_get_keys () : string_vector (); 69 return instance_ok () ? s_instance->do_get_keys () : string_vector ();
70 } 70 }
71 71
72 ColumnVector sparse_params::get_vals (void) 72 ColumnVector sparse_params::get_vals (void)
73 { 73 {
74 return instance_ok () ? s_instance->do_get_vals () : ColumnVector (); 74 return instance_ok () ? s_instance->do_get_vals () : ColumnVector ();
75 } 75 }
76 76
77 bool sparse_params::set_vals (const Array<double>& vals) 77 bool sparse_params::set_vals (const Array<double>& vals)
78 { 78 {
79 return instance_ok () ? s_instance->do_set_vals (vals) : false; 79 return instance_ok () ? s_instance->do_set_vals (vals) : false;
80 } 80 }
81 81
82 bool sparse_params::set_key (const std::string& key, const double& val) 82 bool sparse_params::set_key (const std::string& key, const double& val)
83 { 83 {
84 return instance_ok () ? s_instance->do_set_key (key, val) : false; 84 return instance_ok () ? s_instance->do_set_key (key, val) : false;
85 } 85 }
86 86
87 double sparse_params::get_key (const std::string& key) 87 double sparse_params::get_key (const std::string& key)
88 { 88 {
89 return (instance_ok () 89 return (instance_ok ()
90 ? s_instance->do_get_key (key) : numeric_limits<double>::NaN ()); 90 ? s_instance->do_get_key (key) : numeric_limits<double>::NaN ());
91 } 91 }
92 92
93 double sparse_params::get_bandden (void) 93 double sparse_params::get_bandden (void)
94 { 94 {
95 return instance_ok () ? s_instance->do_get_bandden () : 0.0; 95 return instance_ok () ? s_instance->do_get_bandden () : 0.0;
96 } 96 }
97 97
98 void sparse_params::print_info (std::ostream& os, const std::string& prefix) 98 void sparse_params::print_info (std::ostream& os, const std::string& prefix)
99 { 99 {
100 if (instance_ok ()) 100 if (instance_ok ())
101 s_instance->do_print_info (os, prefix); 101 s_instance->do_print_info (os, prefix);
102 } 102 }
103 103
104 void sparse_params::do_defaults (void) 104 void sparse_params::do_defaults (void)
105 { 105 {
106 m_params(0) = 0; // spumoni 106 m_params(0) = 0; // spumoni
107 m_params(1) = 1; // ths_rel 107 m_params(1) = 1; // ths_rel
108 m_params(2) = 1; // ths_abs 108 m_params(2) = 1; // ths_abs
109 m_params(3) = 0; // exact_d 109 m_params(3) = 0; // exact_d
110 m_params(4) = 3; // supernd 110 m_params(4) = 3; // supernd
111 m_params(5) = 3; // rreduce 111 m_params(5) = 3; // rreduce
112 m_params(6) = 0.5; // wh_frac 112 m_params(6) = 0.5; // wh_frac
113 m_params(7) = 1; // autommd 113 m_params(7) = 1; // autommd
114 m_params(8) = 1; // autoamd 114 m_params(8) = 1; // autoamd
115 m_params(9) = 0.1; // piv_tol 115 m_params(9) = 0.1; // piv_tol
116 m_params(10) = 0.5; // bandden 116 m_params(10) = 0.5; // bandden
117 m_params(11) = 1; // umfpack 117 m_params(11) = 1; // umfpack
118 m_params(12) = 0.001; // sym_tol 118 m_params(12) = 0.001; // sym_tol
119 } 119 }
120 120
121 void sparse_params::do_tight (void) 121 void sparse_params::do_tight (void)
122 { 122 {
123 m_params(0) = 0; // spumoni 123 m_params(0) = 0; // spumoni
124 m_params(1) = 1; // ths_rel 124 m_params(1) = 1; // ths_rel
125 m_params(2) = 0; // ths_abs 125 m_params(2) = 0; // ths_abs
126 m_params(3) = 1; // exact_d 126 m_params(3) = 1; // exact_d
127 m_params(4) = 1; // supernd 127 m_params(4) = 1; // supernd
128 m_params(5) = 1; // rreduce 128 m_params(5) = 1; // rreduce
129 m_params(6) = 0.5; // wh_frac 129 m_params(6) = 0.5; // wh_frac
130 m_params(7) = 1; // autommd 130 m_params(7) = 1; // autommd
131 m_params(8) = 1; // autoamd 131 m_params(8) = 1; // autoamd
132 m_params(9) = 0.1; // piv_tol 132 m_params(9) = 0.1; // piv_tol
133 m_params(10) = 0.5; // bandden 133 m_params(10) = 0.5; // bandden
134 m_params(11) = 1; // umfpack 134 m_params(11) = 1; // umfpack
135 m_params(12) = 0.001; // sym_tol 135 m_params(12) = 0.001; // sym_tol
136 } 136 }
137 137
138 void sparse_params::init_keys (void) 138 void sparse_params::init_keys (void)
139 { 139 {
140 m_keys(0) = "spumoni"; 140 m_keys(0) = "spumoni";
141 m_keys(1) = "ths_rel"; 141 m_keys(1) = "ths_rel";
142 m_keys(2) = "ths_abs"; 142 m_keys(2) = "ths_abs";
143 m_keys(3) = "exact_d"; 143 m_keys(3) = "exact_d";
144 m_keys(4) = "supernd"; 144 m_keys(4) = "supernd";
145 m_keys(5) = "rreduce"; 145 m_keys(5) = "rreduce";
146 m_keys(6) = "wh_frac"; 146 m_keys(6) = "wh_frac";
147 m_keys(7) = "autommd"; 147 m_keys(7) = "autommd";
148 m_keys(8) = "autoamd"; 148 m_keys(8) = "autoamd";
149 m_keys(9) = "piv_tol"; 149 m_keys(9) = "piv_tol";
150 m_keys(10) = "bandden"; 150 m_keys(10) = "bandden";
151 m_keys(11) = "umfpack"; 151 m_keys(11) = "umfpack";
152 m_keys(12) = "sym_tol"; 152 m_keys(12) = "sym_tol";
153 } 153 }
154 154
155 double sparse_params::do_get_bandden (void) 155 double sparse_params::do_get_bandden (void)
156 { 156 {
157 return m_params(10); 157 return m_params(10);
158 } 158 }
159 159
160 bool sparse_params::do_set_vals (const Array<double>& vals) 160 bool sparse_params::do_set_vals (const Array<double>& vals)
161 { 161 {
162 octave_idx_type len = vals.numel (); 162 octave_idx_type len = vals.numel ();
163 163
164 if (len > OCTAVE_SPARSE_CONTROLS_SIZE) 164 if (len > OCTAVE_SPARSE_CONTROLS_SIZE)
165 (*current_liboctave_error_handler) 165 (*current_liboctave_error_handler)
166 ("sparse_params::do_set_vals: too many values"); 166 ("sparse_params::do_set_vals: too many values");
167 167
168 for (int i = 0; i < len; i++) 168 for (int i = 0; i < len; i++)
169 m_params(i) = vals(i); 169 m_params(i) = vals(i);
170 170
171 return true; 171 return true;
172 } 172 }
173 173
174 bool sparse_params::do_set_key (const std::string& key, const double& val) 174 bool sparse_params::do_set_key (const std::string& key, const double& val)
175 { 175 {
176 for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++) 176 for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++)
177 { 177 {
178 if (m_keys (i) == key) 178 if (m_keys (i) == key)
179 { 179 {
180 m_params(i) = val; 180 m_params(i) = val;
181 return true; 181 return true;
182 } 182 }
183 } 183 }
184 184
185 return false; 185 return false;
186 } 186 }
187 187
188 double sparse_params::do_get_key (const std::string& key) 188 double sparse_params::do_get_key (const std::string& key)
189 { 189 {
190 for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++) 190 for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++)
191 { 191 {
192 if (m_keys (i) == key) 192 if (m_keys (i) == key)
193 return m_params(i); 193 return m_params(i);
194 } 194 }
195 195
196 return numeric_limits<double>::NaN (); 196 return numeric_limits<double>::NaN ();
197 } 197 }
198 198
199 void sparse_params::do_print_info (std::ostream& os, 199 void sparse_params::do_print_info (std::ostream& os,
200 const std::string& prefix) const 200 const std::string& prefix) const
201 { 201 {
202 for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++) 202 for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++)
203 os << prefix << m_keys(i) << ": " << m_params(i) << "\n"; 203 os << prefix << m_keys(i) << ": " << m_params(i) << "\n";
204 } 204 }
205 205
206 OCTAVE_END_NAMESPACE(octave) 206 OCTAVE_END_NAMESPACE(octave)