From 17b4295ce3927a1cda9b1fdb282318c92bc374cd Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Wed, 10 Jun 2009 10:42:49 +0000 Subject: nmsimplex test compat --- lib/Numeric/LinearAlgebra/Tests.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs index 464ed27..d7c3f99 100644 --- a/lib/Numeric/LinearAlgebra/Tests.hs +++ b/lib/Numeric/LinearAlgebra/Tests.hs @@ -109,9 +109,10 @@ expmTest2 = expm nd2 :~15~: (2><2) --------------------------------------------------------------------- -minimizationTest = TestList [ utest "minimization conjugatefr" (minim1 f df [5,7] ~~ [1,2]) - , utest "minimization nmsimplex2" (minim2 f [5,7] == 24) - ] +minimizationTest = TestList + [ utest "minimization conjugatefr" (minim1 f df [5,7] ~~ [1,2]) + , utest "minimization nmsimplex2" (minim2 f [5,7] `elem` [24,25]) + ] where f [x,y] = 10*(x-1)^2 + 20*(y-2)^2 + 30 df [x,y] = [20*(x-1), 40*(y-2)] minim1 g dg ini = fst $ minimizeD ConjugateFR 1E-3 30 1E-2 1E-4 g dg ini -- cgit v1.2.3