|
5 | 5 |
|
6 | 6 | import numpy as np |
7 | 7 | from numba import njit |
8 | | -from numpy.testing import assert_allclose |
9 | | -from nose.tools import raises |
| 8 | +from numpy.testing import assert_allclose, assert_raises |
10 | 9 |
|
11 | 10 | from quantecon.optimize import nelder_mead |
12 | 11 | from ..nelder_mead import _nelder_mead_algorithm |
@@ -330,71 +329,59 @@ def test_discontinuous(self): |
330 | 329 | assert_allclose(results.fun, fun) |
331 | 330 |
|
332 | 331 |
|
333 | | -@raises(ValueError) |
334 | 332 | def test_invalid_bounds_1(): |
335 | 333 | x0 = np.array([-2., 1.]) |
336 | 334 | bounds = np.array([[10., -10.], [10., -10.]]) |
337 | | - nelder_mead(rosenbrock, x0, bounds=bounds) |
| 335 | + assert_raises(ValueError, nelder_mead, rosenbrock, x0, bounds=bounds) |
338 | 336 |
|
339 | 337 |
|
340 | | -@raises(ValueError) |
341 | 338 | def test_invalid_bounds_2(): |
342 | 339 | x0 = np.array([-2., 1.]) |
343 | 340 | bounds = np.array([[10., -10., 10., -10.]]) |
344 | | - nelder_mead(rosenbrock, x0, bounds=bounds) |
| 341 | + assert_raises(ValueError, nelder_mead, rosenbrock, x0, bounds=bounds) |
345 | 342 |
|
346 | 343 |
|
347 | | -@raises(ValueError) |
348 | 344 | def test_invalid_ρ(): |
349 | 345 | vertices = np.array([[-2., 1.], |
350 | 346 | [1.05 * -2., 1.], |
351 | 347 | [-2., 1.05 * 1.]]) |
352 | 348 | invalid_ρ = -1. |
353 | | - _nelder_mead_algorithm(rosenbrock, vertices, ρ=invalid_ρ) |
| 349 | + assert_raises(ValueError, _nelder_mead_algorithm, rosenbrock, |
| 350 | + vertices, ρ=invalid_ρ) |
354 | 351 |
|
355 | 352 |
|
356 | | -@raises(ValueError) |
357 | 353 | def test_invalid_χ(): |
358 | 354 | vertices = np.array([[-2., 1.], |
359 | 355 | [1.05 * -2., 1.], |
360 | 356 | [-2., 1.05 * 1.]]) |
361 | 357 | invalid_χ = 0.5 |
362 | | - _nelder_mead_algorithm(rosenbrock, vertices, χ=invalid_χ) |
| 358 | + assert_raises(ValueError, _nelder_mead_algorithm, rosenbrock, |
| 359 | + vertices, χ=invalid_χ) |
363 | 360 |
|
364 | 361 |
|
365 | | -@raises(ValueError) |
366 | 362 | def test_invalid_ρχ(): |
367 | 363 | vertices = np.array([[-2., 1.], |
368 | 364 | [1.05 * -2., 1.], |
369 | 365 | [-2., 1.05 * 1.]]) |
370 | 366 | ρ = 2 |
371 | 367 | χ = 1.5 |
372 | | - _nelder_mead_algorithm(rosenbrock, vertices, ρ=ρ, χ=χ) |
| 368 | + assert_raises(ValueError, _nelder_mead_algorithm, rosenbrock, |
| 369 | + vertices, ρ=ρ, χ=χ) |
373 | 370 |
|
374 | 371 |
|
375 | | -@raises(ValueError) |
376 | 372 | def test_invalid_γ(): |
377 | 373 | vertices = np.array([[-2., 1.], |
378 | 374 | [1.05 * -2., 1.], |
379 | 375 | [-2., 1.05 * 1.]]) |
380 | 376 | invalid_γ = -1e-7 |
381 | | - _nelder_mead_algorithm(rosenbrock, vertices, γ=invalid_γ) |
| 377 | + assert_raises(ValueError, _nelder_mead_algorithm, rosenbrock, |
| 378 | + vertices, γ=invalid_γ) |
382 | 379 |
|
383 | 380 |
|
384 | | -@raises(ValueError) |
385 | 381 | def test_invalid_σ(): |
386 | 382 | vertices = np.array([[-2., 1.], |
387 | 383 | [1.05 * -2., 1.], |
388 | 384 | [-2., 1.05 * 1.]]) |
389 | 385 | invalid_σ = 1. + 1e-7 |
390 | | - _nelder_mead_algorithm(rosenbrock, vertices, σ=invalid_σ) |
391 | | - |
392 | | - |
393 | | -if __name__ == '__main__': |
394 | | - import sys |
395 | | - import nose |
396 | | - |
397 | | - argv = sys.argv[:] |
398 | | - argv.append('--verbose') |
399 | | - argv.append('--nocapture') |
400 | | - nose.main(argv=argv, defaultTest=__file__) |
| 386 | + assert_raises(ValueError, _nelder_mead_algorithm, rosenbrock, |
| 387 | + vertices, σ=invalid_σ) |
0 commit comments