comparison liboctave/Quad.h @ 3511:d92134062783

[project @ 2000-02-01 22:06:28 by jwe]
author jwe
date Tue, 01 Feb 2000 22:10:24 +0000
parents 8b262e771614
children f6df65db67f9
comparison
equal deleted inserted replaced
3510:81a6b40c0769 3511:d92134062783
114 114
115 virtual double integrate (void) 115 virtual double integrate (void)
116 { 116 {
117 int ier, neval; 117 int ier, neval;
118 double abserr; 118 double abserr;
119 return integrate (ier, neval, abserr); 119 return do_integrate (ier, neval, abserr);
120 } 120 }
121 121
122 virtual double integrate (int& ier) 122 virtual double integrate (int& ier)
123 { 123 {
124 int neval; 124 int neval;
125 double abserr; 125 double abserr;
126 return integrate (ier, neval, abserr); 126 return do_integrate (ier, neval, abserr);
127 } 127 }
128 128
129 virtual double integrate (int& ier, int& neval) 129 virtual double integrate (int& ier, int& neval)
130 { 130 {
131 double abserr; 131 double abserr;
132 return integrate (ier, neval, abserr); 132 return do_integrate (ier, neval, abserr);
133 } 133 }
134 134
135 virtual double integrate (int& ier, int& neval, double& abserr) = 0; 135 virtual double integrate (int& ier, int& neval, double& abserr)
136 {
137 return do_integrate (ier, neval, abserr);
138 }
139
140 virtual double do_integrate (int& ier, int& neval, double& abserr) = 0;
136 141
137 protected: 142 protected:
138 143
139 integrand_fcn f; 144 integrand_fcn f;
140 }; 145 };
174 : Quad (fcn, abs, rel), lower_limit (ll), upper_limit (ul), 179 : Quad (fcn, abs, rel), lower_limit (ll), upper_limit (ul),
175 singularities (sing) { } 180 singularities (sing) { }
176 181
177 ~DefQuad (void) { } 182 ~DefQuad (void) { }
178 183
179 double integrate (int& ier, int& neval, double& abserr); 184 double do_integrate (int& ier, int& neval, double& abserr);
180 185
181 private: 186 private:
182 187
183 double lower_limit; 188 double lower_limit;
184 double upper_limit; 189 double upper_limit;
206 IndefQuad (integrand_fcn fcn, double abs, double rel) 211 IndefQuad (integrand_fcn fcn, double abs, double rel)
207 : Quad (fcn, abs, rel), bound (0.0), type (bound_to_inf) { } 212 : Quad (fcn, abs, rel), bound (0.0), type (bound_to_inf) { }
208 213
209 ~IndefQuad (void) { } 214 ~IndefQuad (void) { }
210 215
211 double integrate (int& ier, int& neval, double& abserr); 216 double do_integrate (int& ier, int& neval, double& abserr);
212 217
213 private: 218 private:
214 219
215 double bound; 220 double bound;
216 IntegralType type; 221 IntegralType type;