From d1c8941a7f0ef8b5406a98adb6cf3dd3a2979074 Mon Sep 17 00:00:00 2001 From: relmo Date: Thu, 18 Jun 2020 22:39:12 +0200 Subject: [PATCH] update runtests.jl --- Manifest.toml | 11 ++++++----- test/runtests.jl | 40 +++++++++++----------------------------- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index e51fc0e..a225cb7 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -188,9 +188,9 @@ version = "1.3.4+0" [[OpenSSL_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "d2a6f25262d568b5a7e454cf7ff5066a79d16c7d" +git-tree-sha1 = "d120f3b7173eba8b55b7008fa576e46dbd5da536" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.1+2" +version = "1.1.1+3" [[Opus_jll]] deps = ["Libdl", "Pkg"] @@ -312,7 +312,8 @@ deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[Test_Optinum]] -git-tree-sha1 = "bd750cc6a66d4b1eb66cd2a5ec58bd786966f63d" +deps = ["Test"] +git-tree-sha1 = "743a5ff116e59fc9d59062a6f173bd09a85bd1b0" repo-rev = "master" repo-url = "https://github.com/mathn7/Test_Optinum.git" uuid = "f01acfed-6be5-49b9-8763-0b41ea537fc3" @@ -327,9 +328,9 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[Zlib_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "a2e0d558f6031002e380a90613b199e37a8565bf" +git-tree-sha1 = "64b39656c75e67f85b4ac2b336c54674a39f599d" uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+10" +version = "1.2.11+11" [[libass_jll]] deps = ["Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "Libdl", "Pkg", "Zlib_jll"] diff --git a/test/runtests.jl b/test/runtests.jl index 6097937..599d95c 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -11,54 +11,36 @@ include("../src/Pas_De_Cauchy.jl") include("../src/Regions_De_Confiance.jl") # Tester l'algorithme de Newton -printstyled("Lancement des tests sur ",bold=true,color=:white) -printstyled("l'algorithme de Newton ",bold=true,color=:blue) -println("") try Test_Optinum.tester_Algo_Newton(false,Algorithme_De_Newton) -catch exception - printstyled("$exception "*"\n"*"\n",bold=true,color=:red) +catch e + printstyled("$e \n",bold=true,color=:red) end - # Tester l'algorithme du pas de Cauchy -printstyled("Lancement des tests sur",bold=true,color=:white) -printstyled(" le pas de cauchy ",bold=true,color=:blue) -println("") try Test_Optinum.tester_pas_de_cauchy(false,Pas_De_Cauchy) -catch exception - printstyled("$exception "*"\n"*"\n",bold=true,color=:red) +catch e + printstyled("$e \n",bold=true,color=:red) end # Tester l'algorithme du gradient conjugué tronqué -printstyled("Lancement des tests sur",bold=true,color=:white) -printstyled(" le gradient conjugué tronqué ",bold=true,color=:blue) -println("") try Test_Optinum.tester_gct(false,Gradient_Conjugue_Tronque) -catch exception - printstyled("$exception "*"\n"*"\n",bold=true,color=:red) +catch e + printstyled("$e \n",bold=true,color=:red) end - # Tester l'algorithme des Régions de confiance avec PasdeCauchy | GCT -printstyled("Lancement des tests sur",bold=true,color=:white) -printstyled(" les régions de confiance ",bold=true,color=:blue) -println("") try Test_Optinum.tester_regions_de_confiance(false,Regions_De_Confiance) -catch exception - printstyled("$exception "*"\n"*"\n",bold=true,color=:red) +catch e + printstyled("$e \n",bold=true,color=:red) end - # Tester l'algorithme du Lagrangien Augmenté -printstyled("Lancement des tests sur ",bold=true,color=:white) -printstyled("le Lagrangien augmenté ",bold=true,color=:blue) -println("") try Test_Optinum.tester_Lagrangien_Augmente(false,Lagrangien_Augmente) -catch exception - printstyled("$exception "*"\n"*"\n",bold=true,color=:red) -end +catch e + printstyled("$e \n",bold=true,color=:red) +end \ No newline at end of file