103
103
continue
104
104
end
105
105
for i in 1 : length (integrands)
106
- prob = IntegralProblem (integrands[i], lb, ub)
106
+ prob = IntegralProblem (integrands[i], ( lb, ub) )
107
107
@info " Alg = $(nameof (typeof (alg))) , Integrand = $i , Dimension = $dim , Output Dimension = $nout "
108
108
sol = @inferred solve (prob, alg, reltol = reltol, abstol = abstol)
109
109
@test sol. alg == alg
118
118
for i in 1 : length (integrands)
119
119
for dim in 1 : max_dim_test
120
120
lb, ub = (ones (dim), 3 ones (dim))
121
- prob = IntegralProblem (integrands[i], lb, ub)
121
+ prob = IntegralProblem (integrands[i], ( lb, ub) )
122
122
if dim > req. max_dim || dim < req. min_dim
123
123
continue
124
124
end
137
137
for i in 1 : length (iip_integrands)
138
138
for dim in 1 : max_dim_test
139
139
lb, ub = (ones (dim), 3 ones (dim))
140
- prob = IntegralProblem (iip_integrands[i], lb, ub)
140
+ prob = IntegralProblem (iip_integrands[i], ( lb, ub) )
141
141
if dim > req. max_dim || dim < req. min_dim || ! req. allows_iip
142
142
continue
143
143
end
159
159
(dim, nout) = (1 , 1 )
160
160
for (alg, req) in pairs (alg_req)
161
161
for i in 1 : length (integrands)
162
- prob = IntegralProblem (batch_f (integrands[i]), lb, ub, batch = 1000 )
162
+ prob = IntegralProblem (BatchIntegralFunction ( batch_f (integrands[i])), ( lb, ub) )
163
163
if req. min_dim > 1 || ! req. allows_batch
164
164
continue
165
165
end
177
177
for i in 1 : length (integrands)
178
178
for dim in 1 : max_dim_test
179
179
(lb, ub) = (ones (dim), 3 ones (dim))
180
- prob = IntegralProblem (batch_f (integrands[i]), lb, ub, batch = 1000 )
180
+ prob = IntegralProblem (BatchIntegralFunction ( batch_f (integrands[i])), ( lb, ub) )
181
181
if dim > req. max_dim || dim < req. min_dim || ! req. allows_batch
182
182
continue
183
183
end
200
200
for i in 1 : length (iip_integrands)
201
201
for dim in 1 : max_dim_test
202
202
(lb, ub) = (ones (dim), 3 ones (dim))
203
- prob = IntegralProblem (batch_iip_f (integrands[i]), lb, ub, batch = 1000 )
203
+ prob = IntegralProblem (BatchIntegralFunction ( batch_iip_f (integrands[i]), zeros ( 0 )), (lb, ub) )
204
204
if dim > req. max_dim || dim < req. min_dim || ! req. allows_batch ||
205
205
! req. allows_iip
206
206
continue
@@ -225,10 +225,10 @@ end
225
225
for (alg, req) in pairs (alg_req)
226
226
for i in 1 : length (integrands_v)
227
227
for nout in 1 : max_nout_test
228
- prob = IntegralProblem ( let f = integrands_v[i], nout = nout
229
- ( x, p) -> f (x, p, nout)
230
- end , lb, ub,
231
- nout = nout )
228
+ integrand_f = let f = integrands_v[i], nout = nout
229
+ IntegralFunction (( x, p) -> f (x, p, nout), zeros (nout) )
230
+ end
231
+ prob = IntegralProblem (integrand_f, (lb, ub) )
232
232
if req. min_dim > 1 || req. nout < nout
233
233
continue
234
234
end
@@ -254,10 +254,10 @@ end
254
254
if dim > req. max_dim || dim < req. min_dim || req. nout < nout
255
255
continue
256
256
end
257
- prob = IntegralProblem ( let f = integrands_v[i], nout = nout
258
- ( x, p) -> f (x, p, nout)
259
- end , lb, ub,
260
- nout = nout )
257
+ integrand_f = let f = integrands_v[i], nout = nout
258
+ IntegralFunction (( x, p) -> f (x, p, nout), zeros (nout) )
259
+ end
260
+ prob = IntegralProblem (integrand_f, (lb, ub) )
261
261
@info " Alg = $(nameof (typeof (alg))) , Integrand = $i , Dimension = $dim , Output Dimension = $nout "
262
262
sol = @inferred solve (prob, alg, reltol = reltol, abstol = abstol)
263
263
@test sol. alg == alg
@@ -278,10 +278,10 @@ end
278
278
for dim in 1 : max_dim_test
279
279
lb, ub = (ones (dim), 3 ones (dim))
280
280
for nout in 1 : max_nout_test
281
- prob = IntegralProblem ( let f = iip_integrands_v[i]
282
- ( dx, x, p) -> f (dx, x, p, nout)
283
- end ,
284
- lb, ub, nout = nout )
281
+ integrand_f = let f = iip_integrands_v[i]
282
+ IntegralFunction (( dx, x, p) -> f (dx, x, p, nout), zeros (nout) )
283
+ end
284
+ prob = IntegralProblem (integrand_f, ( lb, ub) )
285
285
if dim > req. max_dim || dim < req. min_dim || req. nout < nout ||
286
286
! req. allows_iip
287
287
continue
305
305
(dim, nout) = (1 , 2 )
306
306
for (alg, req) in pairs (alg_req)
307
307
for i in 1 : length (integrands_v)
308
- prob = IntegralProblem (batch_f_v (integrands_v[i], nout), lb, ub, batch = 1000 ,
309
- nout = nout)
308
+ prob = IntegralProblem (BatchIntegralFunction (batch_f_v (integrands_v[i], nout)), (lb, ub))
310
309
if req. min_dim > 1 || ! req. allows_batch || req. nout < nout
311
310
continue
312
311
end
324
323
for i in 1 : length (integrands_v)
325
324
for dim in 1 : max_dim_test
326
325
(lb, ub) = (ones (dim), 3 ones (dim))
327
- prob = IntegralProblem (batch_f_v (integrands_v[i], nout), lb, ub,
328
- batch = 1000 ,
329
- nout = nout)
326
+ prob = IntegralProblem (BatchIntegralFunction (batch_f_v (integrands_v[i], nout)), (lb, ub))
330
327
if dim > req. max_dim || dim < req. min_dim || ! req. allows_batch ||
331
328
req. nout < nout
332
329
continue
346
343
for i in 1 : length (iip_integrands_v)
347
344
for dim in 1 : max_dim_test
348
345
(lb, ub) = (ones (dim), 3 ones (dim))
349
- prob = IntegralProblem (batch_iip_f_v (integrands_v[i], nout), lb, ub,
350
- batch = 10 , nout = nout)
346
+ prob = IntegralProblem (BatchIntegralFunction (batch_iip_f_v (integrands_v[i], nout), zeros (nout, 0 )), (lb, ub))
351
347
if dim > req. max_dim || dim < req. min_dim || ! req. allows_batch ||
352
348
! req. allows_iip || req. nout < nout
353
349
continue
381
377
continue
382
378
end
383
379
for i in 1 : length (integrands)
384
- prob = IntegralProblem (integrands[i], lb, ub, p)
380
+ prob = IntegralProblem (integrands[i], ( lb, ub) , p)
385
381
cache = init (prob, alg, reltol = reltol, abstol = abstol)
386
382
@test solve! (cache). u≈ exact_sol[i](dim, nout, lb, ub) rtol= 1e-2
387
383
cache. lb = lb = 0.5
0 commit comments