Fixup for tests details

diff --git a/test/test6701/Doc_TUI_Exemple_01.py b/test/test6701/Doc_TUI_Exemple_01.py
index f2bacb9e34d37d1b39d7811ce26a72b25baa5ac7..4846741818bcc2448fd0a09c667f4b545d90ef48 100644 (file)
--- a/test/test6701/Doc_TUI_Exemple_01.py
+++ b/test/test6701/Doc_TUI_Exemple_01.py
@@ -21,8 +21,6 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 "Verification d'un exemple de la documentation"
 
-from utExtend import assertAlmostEqualArrays
-
 # ==============================================================================
 def test1():
     """Test"""
@@ -40,6 +38,20 @@ def test1():
     #
     return case.get("Analysis")[-1]
 
+# ==============================================================================
+def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
+    "Compare two vectors, like unittest.assertAlmostEqual"
+    import numpy
+    if msg is not None:
+        print(msg)
+    if delta is not None:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > float(delta) ).any():
+            raise AssertionError("%s != %s within %s places"%(first,second,delta))
+    else:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > 10**(-int(places)) ).any():
+            raise AssertionError("%s != %s within %i places"%(first,second,places))
+    return max(abs(numpy.asarray(first) - numpy.asarray(second)))
+
 # ==============================================================================
 if __name__ == "__main__":
     print('\nAUTODIAGNOSTIC\n')

diff --git a/test/test6702/Doc_TUI_Exemple_02.py b/test/test6702/Doc_TUI_Exemple_02.py
index 0877647c3494e44a93647c17604bf11d817017e8..e6af4aca23d1078aebd2f4f6bb146309b97b78af 100644 (file)
--- a/test/test6702/Doc_TUI_Exemple_02.py
+++ b/test/test6702/Doc_TUI_Exemple_02.py
@@ -21,8 +21,6 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 "Verification d'un exemple de la documentation"
 
-from utExtend import assertAlmostEqualArrays
-
 # ==============================================================================
 def test1():
     """Test"""
@@ -65,6 +63,20 @@ def test2():
     #
     return case.get("Analysis")[-1]
 
+# ==============================================================================
+def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
+    "Compare two vectors, like unittest.assertAlmostEqual"
+    import numpy
+    if msg is not None:
+        print(msg)
+    if delta is not None:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > float(delta) ).any():
+            raise AssertionError("%s != %s within %s places"%(first,second,delta))
+    else:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > 10**(-int(places)) ).any():
+            raise AssertionError("%s != %s within %i places"%(first,second,places))
+    return max(abs(numpy.asarray(first) - numpy.asarray(second)))
+
 # ==============================================================================
 if __name__ == "__main__":
     print('\nAUTODIAGNOSTIC\n')

diff --git a/test/test6703/Doc_TUI_Exemple_03.py b/test/test6703/Doc_TUI_Exemple_03.py
index 5e578dad30df436848a9bbf00622175a578f3d14..8db3f8ea31759d8b1d8f360d4c30f7006db550c0 100644 (file)
--- a/test/test6703/Doc_TUI_Exemple_03.py
+++ b/test/test6703/Doc_TUI_Exemple_03.py
@@ -21,8 +21,6 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 "Verification d'un exemple de la documentation"
 
-from utExtend import assertAlmostEqualArrays
-
 # ==============================================================================
 #
 # Construction artificielle d'un exemple de donnees utilisateur
@@ -103,6 +101,20 @@ def test1():
     #
     return case.get("Analysis")[-1]
 
+# ==============================================================================
+def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
+    "Compare two vectors, like unittest.assertAlmostEqual"
+    import numpy
+    if msg is not None:
+        print(msg)
+    if delta is not None:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > float(delta) ).any():
+            raise AssertionError("%s != %s within %s places"%(first,second,delta))
+    else:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > 10**(-int(places)) ).any():
+            raise AssertionError("%s != %s within %i places"%(first,second,places))
+    return max(abs(numpy.asarray(first) - numpy.asarray(second)))
+
 # ==============================================================================
 if __name__ == "__main__":
     print('\nAUTODIAGNOSTIC\n')

diff --git a/test/test6704/Doc_TUI_Exemple_03_en_multifonction.py b/test/test6704/Doc_TUI_Exemple_03_en_multifonction.py
index 18abfd3dc47af0c9c61f9b4379888b6b9ee7bc37..7b9e5f381c63019223aa1e077543bf33c10714db 100644 (file)
--- a/test/test6704/Doc_TUI_Exemple_03_en_multifonction.py
+++ b/test/test6704/Doc_TUI_Exemple_03_en_multifonction.py
@@ -21,8 +21,6 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 "Verification d'un exemple de la documentation"
 
-from utExtend import assertAlmostEqualArrays
-
 # ==============================================================================
 #
 # Construction artificielle d'un exemple de donnees utilisateur
@@ -110,6 +108,20 @@ def test1():
     #
     return case.get("Analysis")[-1]
 
+# ==============================================================================
+def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
+    "Compare two vectors, like unittest.assertAlmostEqual"
+    import numpy
+    if msg is not None:
+        print(msg)
+    if delta is not None:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > float(delta) ).any():
+            raise AssertionError("%s != %s within %s places"%(first,second,delta))
+    else:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > 10**(-int(places)) ).any():
+            raise AssertionError("%s != %s within %i places"%(first,second,places))
+    return max(abs(numpy.asarray(first) - numpy.asarray(second)))
+
 # ==============================================================================
 if __name__ == "__main__":
     print('\nAUTODIAGNOSTIC\n')

diff --git a/test/test6711/Doc_TUI_Exemple_01_Savings.py b/test/test6711/Doc_TUI_Exemple_01_Savings.py
index d5402f93fdfe58c2249f5baf4dff7beb560c3e9b..b5ef7a7378ee5dad69c02e074faaab6284947e37 100644 (file)
--- a/test/test6711/Doc_TUI_Exemple_01_Savings.py
+++ b/test/test6711/Doc_TUI_Exemple_01_Savings.py
@@ -22,7 +22,6 @@
 "Verification d'un exemple de la documentation"
 
 import os, pprint
-from utExtend import assertAlmostEqualArrays
 
 # ==============================================================================
 def test1():
@@ -81,6 +80,20 @@ def test1():
     #
     return case.get("Analysis")[-1]
 
+# ==============================================================================
+def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
+    "Compare two vectors, like unittest.assertAlmostEqual"
+    import numpy
+    if msg is not None:
+        print(msg)
+    if delta is not None:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > float(delta) ).any():
+            raise AssertionError("%s != %s within %s places"%(first,second,delta))
+    else:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > 10**(-int(places)) ).any():
+            raise AssertionError("%s != %s within %i places"%(first,second,places))
+    return max(abs(numpy.asarray(first) - numpy.asarray(second)))
+
 # ==============================================================================
 if __name__ == "__main__":
     print('\n AUTODIAGNOSTIC\n')

diff --git a/test/test6904/Definition_complete_de_cas_3DVAR.py b/test/test6904/Definition_complete_de_cas_3DVAR.py
index 97851278bf76b302971fa21ca95985e70bbddc7b..5b8e0a7731cdfa688f250d09e23ae5e4b3cf959e 100644 (file)
--- a/test/test6904/Definition_complete_de_cas_3DVAR.py
+++ b/test/test6904/Definition_complete_de_cas_3DVAR.py
@@ -24,7 +24,6 @@
 import sys
 import unittest
 import numpy
-from utExtend import assertAlmostEqualArrays
 
 # ==============================================================================
 #
@@ -141,6 +140,8 @@ class InTest(unittest.TestCase):
         print("Simulation at optimal state.....: %s"%(numpy.ravel(FX_at_optimum),))
         print("")
         #
+        # Fin du cas
+        # ----------
         ecart = assertAlmostEqualArrays(Xoptimum, [ 2., 3., 4.])
         #
         print("  L'écart absolu maximal obtenu lors du test est de %.2e."%ecart)
@@ -149,6 +150,20 @@ class InTest(unittest.TestCase):
         #
         return Xoptimum
 
+# ==============================================================================
+def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
+    "Compare two vectors, like unittest.assertAlmostEqual"
+    import numpy
+    if msg is not None:
+        print(msg)
+    if delta is not None:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > float(delta) ).any():
+            raise AssertionError("%s != %s within %s places"%(first,second,delta))
+    else:
+        if ( (numpy.asarray(first) - numpy.asarray(second)) > 10**(-int(places)) ).any():
+            raise AssertionError("%s != %s within %i places"%(first,second,places))
+    return max(abs(numpy.asarray(first) - numpy.asarray(second)))
+
 # ==============================================================================
 if __name__ == '__main__':
     print("\nAUTODIAGNOSTIC\n==============")