Mercurial > octave-nkf

comparison libinterp/corefcn/gammainc.cc @ 20589:b10432a40432

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more simple uses of error_state * dasrt.cc, debug.cc, find.cc, gammainc.cc, matrix_type.cc, ov-usr-fcn.cc, pt-assign.cc, pt-binop.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 20:37:19 -0400
parents 4f45eaf83908
children fd0efcdb3718
comparison
equal deleted inserted replaced
20588:4bed806ee3d4 20589:b10432a40432
97 else 97 else
98 error ("gammainc: third argument must be \"lower\" or \"upper\""); 98 error ("gammainc: third argument must be \"lower\" or \"upper\"");
99 99
100 } 100 }
101 101
102 if (!error_state && nargin >= 2 && nargin <= 3) 102 if (nargin < 2 || nargin > 3)
103 print_usage ();
104
105 octave_value x_arg = args(0);
106 octave_value a_arg = args(1);
107
108 // FIXME: Can we make a template version of the duplicated code below
109 if (x_arg.is_single_type () || a_arg.is_single_type ())
103 { 110 {
104 octave_value x_arg = args(0); 111 if (x_arg.is_scalar_type ())
105 octave_value a_arg = args(1); 112 {
106 113 float x = x_arg.float_value ();
107 // FIXME: Can we make a template version of the duplicated code below 114
108 if (x_arg.is_single_type () || a_arg.is_single_type ()) 115 if (a_arg.is_scalar_type ())
109 { 116 {
110 if (x_arg.is_scalar_type ()) 117 float a = a_arg.float_value ();
111 { 118
112 float x = x_arg.float_value (); 119 retval = lower ? gammainc (x, a) : 1.0f - gammainc (x, a);
113 120 }
114 if (! error_state) 121 else
115 { 122 {
116 if (a_arg.is_scalar_type ()) 123 FloatNDArray a = a_arg.float_array_value ();
117 { 124
118 float a = a_arg.float_value (); 125 retval = lower ? gammainc (x, a) : 1.0f - gammainc (x, a);
119
120 if (! error_state)
121 retval = lower ? gammainc (x, a)
122 : 1.0f - gammainc (x, a);
123 }
124 else
125 {
126 FloatNDArray a = a_arg.float_array_value ();
127
128 if (! error_state)
129 retval = lower ? gammainc (x, a)
130 : 1.0f - gammainc (x, a);
131 }
132 }
133 }
134 else
135 {
136 FloatNDArray x = x_arg.float_array_value ();
137
138 if (! error_state)
139 {
140 if (a_arg.is_scalar_type ())
141 {
142 float a = a_arg.float_value ();
143
144 if (! error_state)
145 retval = lower ? gammainc (x, a)
146 : 1.0f - gammainc (x, a);
147 }
148 else
149 {
150 FloatNDArray a = a_arg.float_array_value ();
151
152 if (! error_state)
153 retval = lower ? gammainc (x, a)
154 : 1.0f - gammainc (x, a);
155 }
156 }
157 } 126 }
158 } 127 }
159 else 128 else
160 { 129 {
161 if (x_arg.is_scalar_type ()) 130 FloatNDArray x = x_arg.float_array_value ();
162 { 131
163 double x = x_arg.double_value (); 132 if (a_arg.is_scalar_type ())
164 133 {
165 if (! error_state) 134 float a = a_arg.float_value ();
166 { 135
167 if (a_arg.is_scalar_type ()) 136 retval = lower ? gammainc (x, a) : 1.0f - gammainc (x, a);
168 { 137 }
169 double a = a_arg.double_value (); 138 else
170 139 {
171 if (! error_state) 140 FloatNDArray a = a_arg.float_array_value ();
172 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a); 141
173 } 142 retval = lower ? gammainc (x, a) : 1.0f - gammainc (x, a);
174 else
175 {
176 NDArray a = a_arg.array_value ();
177
178 if (! error_state)
179 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a);
180 }
181 }
182 }
183 else
184 {
185 NDArray x = x_arg.array_value ();
186
187 if (! error_state)
188 {
189 if (a_arg.is_scalar_type ())
190 {
191 double a = a_arg.double_value ();
192
193 if (! error_state)
194 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a);
195 }
196 else
197 {
198 NDArray a = a_arg.array_value ();
199
200 if (! error_state)
201 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a);
202 }
203 }
204 } 143 }
205 } 144 }
206 } 145 }
207 else 146 else
208 print_usage (); 147 {
148 if (x_arg.is_scalar_type ())
149 {
150 double x = x_arg.double_value ();
151
152 if (a_arg.is_scalar_type ())
153 {
154 double a = a_arg.double_value ();
155
156 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a);
157 }
158 else
159 {
160 NDArray a = a_arg.array_value ();
161
162 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a);
163 }
164 }
165 else
166 {
167 NDArray x = x_arg.array_value ();
168
169 if (a_arg.is_scalar_type ())
170 {
171 double a = a_arg.double_value ();
172
173 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a);
174 }
175 else
176 {
177 NDArray a = a_arg.array_value ();
178
179 retval = lower ? gammainc (x, a) : 1. - gammainc (x, a);
180 }
181 }
182 }
209 183
210 return retval; 184 return retval;
211 } 185 }
212 186
213 /* 187 /*