Python 3 compatibility improvement (examples and tests)

diff --git a/examples/daSalome/test001_ADAO_JDC_using_strings.py b/examples/daSalome/test001_ADAO_JDC_using_strings.py
index b5d405548175dd3ff38f66640d3fb22efd40a784..1d5955a409beacb557a0a843626c92c019df96cf 100644 (file)
--- a/examples/daSalome/test001_ADAO_JDC_using_strings.py
+++ b/examples/daSalome/test001_ADAO_JDC_using_strings.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'ASSIMILATION_STUDY'
 study_config['Name'] = 'Test'

diff --git a/examples/daSalome/test002_ADAO_JDC_using_strings.py b/examples/daSalome/test002_ADAO_JDC_using_strings.py
index aaf0dd228bf7d235384c966ec9e53d64f5c61caf..83b3e1260eb43290d1a092e0d99c73e54aae9e6e 100644 (file)
--- a/examples/daSalome/test002_ADAO_JDC_using_strings.py
+++ b/examples/daSalome/test002_ADAO_JDC_using_strings.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'ASSIMILATION_STUDY'
 study_config['Name'] = 'Test'

diff --git a/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in b/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
index 161056fed43650567e4afdced77810398414ad59..56dfe2bd0b85a8c6181dee79d50e45034d08cbde 100644 (file)
--- a/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
+++ b/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'ASSIMILATION_STUDY'
 study_config['Name'] = 'Test'

diff --git a/examples/daSalome/test003_ADAO_scripts_for_JDC.py b/examples/daSalome/test003_ADAO_scripts_for_JDC.py
index be2e49682f807a4e2bf7e4d46902b7aa510e0b70..27a56b3de4b7c136704ae83f62774ceac6118ea0 100644 (file)
--- a/examples/daSalome/test003_ADAO_scripts_for_JDC.py
+++ b/examples/daSalome/test003_ADAO_scripts_for_JDC.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
index 39baa1f8c4758ede6e4d5df775813a8d50a8a34f..f44ed367090672d56890b330641b5f6b54d17d70 100644 (file)
--- a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
+++ b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'ASSIMILATION_STUDY'
 study_config['Name'] = 'Test'

diff --git a/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py b/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py
index 9294180d3b9157a4ff869e667e7860e3bbd5f031..905f250067ca306ccc4659b93e211796662f70b4 100644 (file)
--- a/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py
+++ b/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSalome/test003_bis_ADAO_user_data_init.py b/examples/daSalome/test003_bis_ADAO_user_data_init.py
index 46f7902c21723a7e187cf53a9cd758b365885510..8b666b4a3c67ac3c690784c915aa31f5598474a5 100644 (file)
--- a/examples/daSalome/test003_bis_ADAO_user_data_init.py
+++ b/examples/daSalome/test003_bis_ADAO_user_data_init.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in b/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
index 49ad855ccb4283f1cbeb7237d233670736c2c7f5..a2a7f3c5f86604912c37305c23b89e6dcc7e3f58 100644 (file)
--- a/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
+++ b/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'ASSIMILATION_STUDY'
 study_config['Name'] = 'Test'

diff --git a/examples/daSalome/test004_ADAO_scripts_for_JDC.py b/examples/daSalome/test004_ADAO_scripts_for_JDC.py
index 6a9521e285a111aa3690aa2ea77a094cbb558728..2f13dcbb465d675e951a597319ff26e22f9fe53e 100644 (file)
--- a/examples/daSalome/test004_ADAO_scripts_for_JDC.py
+++ b/examples/daSalome/test004_ADAO_scripts_for_JDC.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSalome/test005_ADAO_Operators.comm.in b/examples/daSalome/test005_ADAO_Operators.comm.in
index fc3dda6e62897ec4e5e98a522e29cb03812ae832..8e8117a84d13852cc27eda7564599f49f71e29df 100644 (file)
--- a/examples/daSalome/test005_ADAO_Operators.comm.in
+++ b/examples/daSalome/test005_ADAO_Operators.comm.in
@@ -2,7 +2,7 @@
 ASSIMILATION_STUDY(StudyName='Test',
                    StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='3DVAR',),
-                   Background=_F(Stored=0,
+                   Background=_F(Stored=1,
                                  INPUT_TYPE='Vector',
                                  data=_F(FROM='String',
                                          STRING='0 0 0',),),
@@ -25,7 +25,7 @@ ASSIMILATION_STUDY(StudyName='Test',
                    UserPostAnalysis=_F(FROM='String',
                                        STRING=
 """import numpy
-Xb = Study.getBackground()
+Xb = ADD.get("Background")
 Xa = ADD.get("Analysis")[-1]
 print
 print "Size of Background...........= %i"%len(Xb.A1)

diff --git a/examples/daSalome/test005_ADAO_Operators.py.in b/examples/daSalome/test005_ADAO_Operators.py.in
index f32d18a19f039eab6e22373c382519fd9a7771f6..e1d69dd5247c7d3f2cadc65d0ce676b43dbd7e0f 100644 (file)
--- a/examples/daSalome/test005_ADAO_Operators.py.in
+++ b/examples/daSalome/test005_ADAO_Operators.py.in
@@ -1,5 +1,5 @@
-#-*-coding:iso-8859-1-*- 
-study_config = {} 
+# -*- coding: utf-8 -*-
+study_config = {}
 study_config['StudyType'] = 'ASSIMILATION_STUDY'
 study_config['Name'] = 'Test'
 study_config['Debug'] = '0'
@@ -8,7 +8,7 @@ Background_config = {}
 Background_config['Type'] = 'Vector'
 Background_config['From'] = 'String'
 Background_config['Data'] = '0 0 0'
-Background_config['Stored'] = '0'
+Background_config['Stored'] = '1'
 study_config['Background'] = Background_config
 BackgroundError_config = {}
 BackgroundError_config['Type'] = 'Matrix'
@@ -51,7 +51,7 @@ study_config['Repertory'] = '@prefix@/share/salome/adao_examples/daSalome'
 Analysis_config = {}
 Analysis_config['From'] = 'String'
 Analysis_config['Data'] = """import numpy
-Xb = Study.getBackground()
+Xb = ADD.get("Background")
 Xa = ADD.get("Analysis")[-1]
 print
 print "Size of Background...........= %i"%len(Xb.A1)

diff --git a/examples/daSalome/test005_ADAO_scripts_for_JDC.py b/examples/daSalome/test005_ADAO_scripts_for_JDC.py
index 2e1152e45a6d33f026088bef4891d35412a7f9fb..20f5c37135ec838250eebbbe2ab12bdab6e90650 100644 (file)
--- a/examples/daSalome/test005_ADAO_scripts_for_JDC.py
+++ b/examples/daSalome/test005_ADAO_scripts_for_JDC.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -52,7 +52,8 @@ H  = numpy.matrix(numpy.core.identity(dimension))
 def FunctionH( X ):
     return H * X
 #
-def AdjointH( (X, Y) ):
+def AdjointH( paire ):
+    X, Y = paire
     return H.T * Y
 #
 # The possible computations

diff --git a/examples/daSalome/test006_Observers.py.in b/examples/daSalome/test006_Observers.py.in
index 056b712b092cc27afc42df27a7cb5827d9beba6d..4d2364f91c55c3ce7401e8e00e6ca87d4f9f7b89 100644 (file)
--- a/examples/daSalome/test006_Observers.py.in
+++ b/examples/daSalome/test006_Observers.py.in
@@ -1,10 +1,10 @@
-#-*-coding:iso-8859-1-*- 
-study_config = {} 
+# -*- coding: utf-8 -*-
+study_config = {}
 study_config['StudyType'] = 'ASSIMILATION_STUDY'
 study_config['Name'] = 'test_observers'
 study_config['Debug'] = '0'
 study_config['Algorithm'] = '3DVAR'
-AlgorithmParameters_config = {} 
+AlgorithmParameters_config = {}
 AlgorithmParameters_config['Type'] = 'Dict'
 AlgorithmParameters_config['From'] = 'Script'
 AlgorithmParameters_config['Data'] = 'test006_Observers_var.py'

diff --git a/examples/daSalome/test006_Observers_Observation_Operator.py b/examples/daSalome/test006_Observers_Observation_Operator.py
index 5768de42efffa509414bff752b5215f9a5625264..d64337c5339f2ca6f8f728552043c40398ed0724 100644 (file)
--- a/examples/daSalome/test006_Observers_Observation_Operator.py
+++ b/examples/daSalome/test006_Observers_Observation_Operator.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -54,7 +54,8 @@ def FunctionH( X ):
     time.sleep(1)
     return H * X
 #
-def AdjointH( (X, Y) ):
+def AdjointH( paire ):
+    X, Y = paire
     return H.T * Y
 #
 # The possible computations

diff --git a/examples/daSalome/test006_Observers_init.py b/examples/daSalome/test006_Observers_init.py
index f9645f5f25e545342e2cf59a0dba3685577c252f..f6463de16bfd61902bed1be5820af46a3309c447 100644 (file)
--- a/examples/daSalome/test006_Observers_init.py
+++ b/examples/daSalome/test006_Observers_init.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -55,10 +55,10 @@ BackgroundError = B
 # ----------------------------------------------------------
 ObservationError = R
 
-print xb
-print B
-print yo
-print R
+print(xb)
+print(B)
+print(yo)
+print(R)
 
 #
 # Definition of the init_data dictionnary

diff --git a/examples/daSalome/test006_Observers_observer_with_file.py b/examples/daSalome/test006_Observers_observer_with_file.py
index 1ca883d14f8a29efca6ff56427e331a930826287..26fe0f825c4ef4c9b464c86466561153b9c6dc91 100644 (file)
--- a/examples/daSalome/test006_Observers_observer_with_file.py
+++ b/examples/daSalome/test006_Observers_observer_with_file.py
@@ -1,6 +1,7 @@
-print "  ---> observerState"
-print "       var  =",var[-1]
-print "       info =",info
+# -*- coding: utf-8 -*-
+print("  ---> observerState")
+print("       var  =",var[-1])
+print("       info =",info)
 #
 import Gnuplot
 import os
@@ -16,7 +17,7 @@ gp('set title  "'+str(info)+'"')
 gp.plot( Gnuplot.Data( var[-1] ) )
 
 filename = os.path.join("/tmp", "imageState_%02i.ps"%numero)
-print "       imageState \"%s\""%filename
+print("       imageState \"%s\""%filename)
 
 gp.hardcopy(filename=filename, color=1)
 numero += 1

diff --git a/examples/daSalome/test006_Observers_var.py b/examples/daSalome/test006_Observers_var.py
index 448847abc21de5cd6da3b55f3eaa639c299a5bdc..dba6172fd0a3385ce02d762c7259dc72ca5c3179 100644 (file)
--- a/examples/daSalome/test006_Observers_var.py
+++ b/examples/daSalome/test006_Observers_var.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSalome/test008_ADAO_Elementary_GradientTest.py b/examples/daSalome/test008_ADAO_Elementary_GradientTest.py
index 578408c321bbd73541ee9eb88357459c9aa5a357..d4347ab7bbfd2741f0da925723d1261d9656221e 100644 (file)
--- a/examples/daSalome/test008_ADAO_Elementary_GradientTest.py
+++ b/examples/daSalome/test008_ADAO_Elementary_GradientTest.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'CHECKING_STUDY'
 study_config['Name'] = 'Elementary gradient test'

diff --git a/examples/daSalome/test009_ADAO_Simple_GradientTest.py b/examples/daSalome/test009_ADAO_Simple_GradientTest.py
index efaf389de6bf3432d2592010101683cd6c541854..77b21bd8f4af479d59a4520bbb8a5fe2f00ad3cc 100644 (file)
--- a/examples/daSalome/test009_ADAO_Simple_GradientTest.py
+++ b/examples/daSalome/test009_ADAO_Simple_GradientTest.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'CHECKING_STUDY'
 study_config['Name'] = 'Test'

diff --git a/examples/daSalome/test010_ADAO_Simple_AdjointTest.py b/examples/daSalome/test010_ADAO_Simple_AdjointTest.py
index d8adb65b56a64228e5ab35828a35eddec42ccaa5..98a8df11b4e4a63bb088ffb7e9a89262962c8afe 100644 (file)
--- a/examples/daSalome/test010_ADAO_Simple_AdjointTest.py
+++ b/examples/daSalome/test010_ADAO_Simple_AdjointTest.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*- 
+# -*- coding: utf-8 -*-
 study_config = {} 
 study_config['StudyType'] = 'CHECKING_STUDY'
 study_config['Name'] = 'Test'

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py b/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py
index baea4c8f564f5015f71fb61768521a58579f97ea..c321dc50e6f0f475abbc36d228fb5f47574e018c 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -51,14 +51,14 @@ def Simple_Matrix( size, diagonal=None ):
 # ==============================================================================
 if __name__ == "__main__":
 
-    print
-    print "AUTODIAGNOSTIC"
-    print "=============="
+    print("")
+    print("AUTODIAGNOSTIC")
+    print("==============")
     
-    print
-    print "True_state = ", True_state()
-    print
-    print "B or R =\n",Simple_Matrix(3)
-    print
-    print "B or R =\n",Simple_Matrix(4, diagonal=numpy.arange(4,dtype=float))
-    print
+    print("")
+    print("True_state = ", True_state())
+    print("")
+    print("B or R =\n",Simple_Matrix(3))
+    print("")
+    print("B or R =\n",Simple_Matrix(4, diagonal=numpy.arange(4,dtype=float)))
+    print("")

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py b/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py
index c92e03a5efbe1a63b03960ca025c137359985a1a..e1e7408571b1a90a30e85ae94d78892ac26ea443 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -38,9 +38,9 @@ def DirectOperator( XX ):
     """ Direct non-linear simulation operator """
     #
     # --------------------------------------> EXAMPLE TO BE REMOVED
-    if type(XX) is type(numpy.matrix([])):  # EXAMPLE TO BE REMOVED
+    if isinstance(XX, type(numpy.matrix([]))):  # EXAMPLE TO BE REMOVED
         HX = XX.A1.tolist()                 # EXAMPLE TO BE REMOVED
-    elif type(XX) is type(numpy.array([])): # EXAMPLE TO BE REMOVED
+    elif isinstance(XX, type(numpy.array([]))): # EXAMPLE TO BE REMOVED
         HX = numpy.matrix(XX).A1.tolist()   # EXAMPLE TO BE REMOVED
     else:                                   # EXAMPLE TO BE REMOVED
         HX = XX                             # EXAMPLE TO BE REMOVED
@@ -57,13 +57,13 @@ AdjointOperator = FDA.AdjointOperator
 # ==============================================================================
 if __name__ == "__main__":
 
-    print
-    print "AUTODIAGNOSTIC"
-    print "=============="
+    print("")
+    print("AUTODIAGNOSTIC")
+    print("==============")
     
     from Physical_data_and_covariance_matrices import True_state
     X0, noms = True_state()
  
     FX = DirectOperator( X0 )
-    print "FX =", FX
-    print
+    print("FX =", FX)
+    print("")

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py
index 2c6abfa079d320523bb6fa109d9a1be3c11df686..a66d710afd366347a2358b429a2c839e36636538 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py
index a72bcba47cd29daba5d1a94415ec3af2adfd31b1..6799b9de8a443bab127b8b7248a89a4dacf24896 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py
index 12c56fb4aa252f7edc15a6713d26b41e725df9fd..85fbe31d8dc5846d87da541da7e145cc165b6f17 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py
index d8631210724386118b5f8bae069698da8a8fa083..411a3d5418648c364eaad6ace126759031cd3020 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py
index 8af5820dcf7a320ca9395d282fa848d9949c42dc..e7204391ebc12a248221afaa732f98de62c69020 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py
index 948a3618858bc463ac9fbf5b623fa28d2db7583d..fe3c9eddf0d7e672fffa79a94765687d1b4f660c 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #

diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py
index 9a9f4fe701e8054ec9c9fa00fe066fb1b8a849ee..09ba05be13d4c364b2c7bb06d1a19f7134290f3f 100644 (file)
--- a/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py
+++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -41,15 +41,15 @@ J           = ADD.get("CostFunctionJ")[:]
 #
 # Verifying the results by printing
 # ---------------------------------
-print
-print "obs = [%s]"%(", ".join(["%.4f"%v for v in ADD.get("Observation").A1]))
-print
-print "xb  = [%s]"%(", ".join(["%.4f"%v for v in ADD.get("Background").A1]))
-print "xt  = [%s]"%(", ".join(["%.4f"%v for v in numpy.array(xt)]))
-print "xa  = [%s]"%(", ".join(["%.4f"%v for v in numpy.array(xa)]))
-print
+print("")
+print("obs = [%s]"%(", ".join(["%.4f"%v for v in ADD.get("Observation").A1])))
+print("")
+print("xb  = [%s]"%(", ".join(["%.4f"%v for v in ADD.get("Background").A1])))
+print("xt  = [%s]"%(", ".join(["%.4f"%v for v in numpy.array(xt)])))
+print("xa  = [%s]"%(", ".join(["%.4f"%v for v in numpy.array(xa)])))
+print("")
 for i in range( len(x_series) ):
-    print "Step %2i : J = %.4e     X = [%s]"%(i, J[i], ", ".join(["%.4f"%v for v in x_series[i]]))
-print
+    print("Step %2i : J = %.4e     X = [%s]"%(i, J[i], ", ".join(["%.4f"%v for v in x_series[i]])))
+print("")
 #
 # ==============================================================================

diff --git a/test/test1001/Versions.py b/test/test1001/Versions.py
index f09f0107bdc3946e27fc0b0380c605b94476968c..31890028cd86fc883a91dfe945341efa5228e940 100644 (file)
--- a/test/test1001/Versions.py
+++ b/test/test1001/Versions.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -35,39 +35,39 @@ def compare_versions(v1,v2):
     for s in ['+', 'rc1', 'rc2', 'rc3']:
         v1 = v1.replace(s,'',1)
         v2 = v2.replace(s,'',1)
-    v11,v12,v13 = map(float,v1.split('.'))
-    v21,v22,v23 = map(float,v2.split('.'))
+    v11,v12,v13 = list(map(float,v1.split('.')))
+    v21,v22,v23 = list(map(float,v2.split('.')))
     lv1 = 1e6*v11 + 1e3*v12 + v13
     lv2 = 1e6*v21 + 1e3*v22 + v23
     return lv1 >= lv2
 
 def minimalVersion():
     "Description"
-    print "  Les versions minimales attendues sont :"
-    print "    - Python systeme....: %s"%minimal_python_version
-    print "    - Numpy.............: %s"%minimal_numpy_version
-    print "    - Scipy.............: %s"%minimal_scipy_version
-    print "    - Matplotlib........: %s"%minimal_matplotlib_version
-    print
+    print("  Les versions minimales attendues sont :")
+    print("    - Python systeme....: %s"%minimal_python_version)
+    print("    - Numpy.............: %s"%minimal_numpy_version)
+    print("    - Scipy.............: %s"%minimal_scipy_version)
+    print("    - Matplotlib........: %s"%minimal_matplotlib_version)
+    print("")
 
 import sys
 def testSysteme():
     "Test des versions de modules"
-    print "  Les versions disponibles sont :"
+    print("  Les versions disponibles sont :")
     v=sys.version.split()
-    print "    - Python systeme....: %s"%v[0]
+    print("    - Python systeme....: %s"%v[0])
     assert compare_versions(sys.version.split()[0], minimal_python_version)
     #
     try:
         import numpy
-        print "    - Numpy.............: %s"%numpy.version.version
+        print("    - Numpy.............: %s"%numpy.version.version)
         assert compare_versions(numpy.version.version, minimal_numpy_version)
     except ImportError:
         return 1
     #
     try:
         import scipy
-        print "    - Scipy.............: %s"%scipy.version.version
+        print("    - Scipy.............: %s"%scipy.version.version)
         assert compare_versions(scipy.version.version, minimal_scipy_version)
     except ImportError:
         return 1
@@ -75,10 +75,10 @@ def testSysteme():
     try:
         import matplotlib
         mplversion = matplotlib.__version__
-        print "    - Matplotlib........: %s"%mplversion
+        print("    - Matplotlib........: %s"%mplversion)
         assert compare_versions(mplversion, minimal_matplotlib_version)
         #
-        print
+        print("")
         backends_OK = []
         backends_KO = []
         backend_now = matplotlib.get_backend()
@@ -93,24 +93,24 @@ def testSysteme():
             except ValueError:
                 backends_KO.append(backend)
         #
-        print "  Backends disponibles pour Matplotlib %s :"%mplversion
-        print "    Defaut initial......: '%s'"%backend_now
-        print "    Fonctionnant........:"
+        print("  Backends disponibles pour Matplotlib %s :"%mplversion)
+        print("    Defaut initial......: '%s'"%backend_now)
+        print("    Fonctionnant........:")
         for b in backends_OK:
-            print "                          '%s'"%b
-        print "    Non fonctionnant....:"
+            print("                          '%s'"%b)
+        print("    Non fonctionnant....:")
         for b in backends_KO:
-            print "                          '%s'"%b
-        print "    (Le backend 'bidon' n'est ici que pour verifier le test, il n'existe pas)"
+            print("                          '%s'"%b)
+        print("    (Le backend 'bidon' n'est ici que pour verifier le test, il n'existe pas)")
     except ImportError:
         pass
-    print
+    print("")
     #
     return 0
 
 # ==============================================================================
 if __name__ == "__main__":
-    print '\n AUTODIAGNOSTIC \n'
+    print('\nAUTODIAGNOSTIC\n')
     minimalVersion()
     sys.exit(testSysteme())
 

diff --git a/test/test1002/Performances.py b/test/test1002/Performances.py
index 948cc07e5eb2c029d5c2eca162d3e4d0c49ad6e4..fdf9deb10aad49c7ca4a4a40b5c09e9e23150659 100644 (file)
--- a/test/test1002/Performances.py
+++ b/test/test1002/Performances.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -26,62 +26,62 @@ import numpy, time
 numpy.set_printoptions(precision=5)
 
 def testSysteme():
-    print "  Les caracteristiques des applications et outils systeme :"
-    import sys ; v=sys.version.split() ; print "    - Python systeme....: %s"%v[0]
-    import numpy ; print "    - Numpy.............: %s"%numpy.version.version
+    print("  Les caracteristiques des applications et outils systeme :")
+    import sys ; v=sys.version.split() ; print("    - Python systeme....: %s"%v[0])
+    import numpy ; print("    - Numpy.............: %s"%numpy.version.version)
     try:
-        import scipy ; print "    - Scipy.............: %s"%scipy.version.version
+        import scipy ; print("    - Scipy.............: %s"%scipy.version.version)
     except:
-        print "    - Scipy.............: %s"%("absent",)
+        print("    - Scipy.............: %s"%("absent",))
     try:
-        import numpy.distutils.system_info as sysinfo ; la = sysinfo.get_info('lapack') ; print "    - Lapack............: %s/lib%s.so"%(la['library_dirs'][0],la['libraries'][0])
+        import numpy.distutils.system_info as sysinfo ; la = sysinfo.get_info('lapack') ; print("    - Lapack............: %s/lib%s.so"%(la['library_dirs'][0],la['libraries'][0]))
     except:
-        print "    - Lapack............: %s"%("absent",)
-    print
+        print("    - Lapack............: %s"%("absent",))
+    print("")
     return True
 
 def testNumpy01(dimension = 3, precision = 1.e-17, repetitions = 10):
     "Test Numpy"
     __d = int(dimension)
-    print "    Taille du test..................................: %.0e"%__d
+    print("    Taille du test..................................: %.0e"%__d)
     t_init = time.time()
     A = numpy.array([numpy.arange(dimension)+1.,]*__d)
     x = numpy.arange(__d)+1.
-    print "    La duree elapsed moyenne de l'initialisation est: %4.1f s"%(time.time()-t_init)
+    print("    La duree elapsed moyenne de l'initialisation est: %4.1f s"%(time.time()-t_init))
     #
     t_init = time.time()
     for i in range(repetitions):
         b = numpy.dot(A,x)
-    print "    La duree elapsed pour %3i produits est de.......: %4.1f s"%(repetitions, time.time()-t_init)
+    print("    La duree elapsed pour %3i produits est de.......: %4.1f s"%(repetitions, time.time()-t_init))
     r = [__d*(__d+1.)*(2.*__d+1.)/6.,]*__d
     if max(abs(b-r)) > precision:
         raise ValueError("Resultat du test errone (1)")
     else:
-        print "    Test correct, erreur maximale inferieure a %s"%precision
-    print
+        print("    Test correct, erreur maximale inferieure a %s"%precision)
+    print("")
     del A, x, b
 
 def testNumpy02(dimension = 3, precision = 1.e-17, repetitions = 100):
     "Test Numpy"
     __d = int(dimension)
-    print "    Taille du test..................................: %.0e"%__d
+    print("    Taille du test..................................: %.0e"%__d)
     t_init = time.time()
     A = numpy.random.normal(0.,1.,size=(__d,__d))
     x = numpy.random.normal(0.,1.,size=(__d,))
-    print "    La duree elapsed moyenne de l'initialisation est: %4.1f s"%(time.time()-t_init)
+    print("    La duree elapsed moyenne de l'initialisation est: %4.1f s"%(time.time()-t_init))
     #
     t_init = time.time()
     for i in range(repetitions):
         b = numpy.dot(A,x)
-    print "    La duree elapsed pour %3i produits est de.......: %4.1f s"%(repetitions, time.time()-t_init)
-    print
+    print("    La duree elapsed pour %3i produits est de.......: %4.1f s"%(repetitions, time.time()-t_init))
+    print("")
     del A, x, b
 
 # ==============================================================================
 if __name__ == "__main__":
-    print '\n AUTODIAGNOSTIC \n'
+    print('\nAUTODIAGNOSTIC\n')
     testSysteme()
     numpy.random.seed(1000)
     testNumpy01(dimension = 1.e4)
     testNumpy02(dimension = 3.e3)
-    print
+    print("")

diff --git a/test/test6701/Doc_TUI_Exemple_01.py b/test/test6701/Doc_TUI_Exemple_01.py
index f2a7f91cd24a70149de8a9f7c4308508d8a7edd2..2739eaca7e8b400f17b8b1750ec5786a2f83ab2b 100644 (file)
--- a/test/test6701/Doc_TUI_Exemple_01.py
+++ b/test/test6701/Doc_TUI_Exemple_01.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -42,11 +42,11 @@ def test1():
 
 # ==============================================================================
 if __name__ == "__main__":
-    print '\n AUTODIAGNOSTIC \n'
-    print """Exemple de la doc :
+    print('\nAUTODIAGNOSTIC\n')
+    print("""Exemple de la doc :
 
     Un exemple simple de creation d'un cas de calcul TUI ADAO
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    """
+    """)
     xa = test1()
     assertAlmostEqualArrays(xa, [0.25, 0.80, 0.95], places = 5)

diff --git a/test/test6701/utExtend.py b/test/test6701/utExtend.py
index ec9aba53c6b99b3e8b119cc6d6d3c19a916f8443..cb7b8e87e8a2ebd3dd3d1d32f1c0cb97dc83b2f3 100644 (file)
--- a/test/test6701/utExtend.py
+++ b/test/test6701/utExtend.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -32,7 +32,7 @@ import numpy
 def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
     "Compare two vectors, like unittest.assertAlmostEqual"
     if msg is not None:
-        print msg
+        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))

diff --git a/test/test6702/Doc_TUI_Exemple_02.py b/test/test6702/Doc_TUI_Exemple_02.py
index 19c2a2a562dc0c615b701d9d0b98f381b2436a8b..9f857df5e658938a7a5d6c2236f5341a1ecb53f2 100644 (file)
--- a/test/test6702/Doc_TUI_Exemple_02.py
+++ b/test/test6702/Doc_TUI_Exemple_02.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -67,14 +67,14 @@ def test2():
 
 # ==============================================================================
 if __name__ == "__main__":
-    print '\n AUTODIAGNOSTIC \n'
-    print """Exemple de la doc :
+    print('\nAUTODIAGNOSTIC\n')
+    print("""Exemple de la doc :
 
     Creation detaillee d'un cas de calcul TUI ADAO
     ++++++++++++++++++++++++++++++++++++++++++++++
     Les deux resultats sont testes pour etre identiques.
-    """
+    """)
     xa1 = test1()
     xa2 = test2()
     ecart = assertAlmostEqualArrays(xa1, xa2, places = 15)
-    print "  Difference maximale entre les deux : %.2e"%ecart
+    print("  Difference maximale entre les deux : %.2e"%ecart)

diff --git a/test/test6702/utExtend.py b/test/test6702/utExtend.py
index ec9aba53c6b99b3e8b119cc6d6d3c19a916f8443..cb7b8e87e8a2ebd3dd3d1d32f1c0cb97dc83b2f3 100644 (file)
--- a/test/test6702/utExtend.py
+++ b/test/test6702/utExtend.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -32,7 +32,7 @@ import numpy
 def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
     "Compare two vectors, like unittest.assertAlmostEqual"
     if msg is not None:
-        print msg
+        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))

diff --git a/test/test6703/Doc_TUI_Exemple_03.py b/test/test6703/Doc_TUI_Exemple_03.py
index 44d4af6bfbd4df3cc03c56ab0031b8fe1424826a..5100c06c96541501b3b23852b8fc949479beb87e 100644 (file)
--- a/test/test6703/Doc_TUI_Exemple_03.py
+++ b/test/test6703/Doc_TUI_Exemple_03.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -94,22 +94,22 @@ def test1():
     Xoptimum      = case.get("Analysis")[-1]
     FX_at_optimum = case.get("SimulatedObservationAtOptimum")[-1]
     J_values      = case.get("CostFunctionJ")[:]
-    print
-    print "Number of internal iterations...: %i"%len(J_values)
-    print "Initial state...................:",numpy.ravel(Xbackground)
-    print "Optimal state...................:",numpy.ravel(Xoptimum)
-    print "Simulation at optimal state.....:",numpy.ravel(FX_at_optimum)
-    print
+    print("")
+    print("Number of internal iterations...: %i"%len(J_values))
+    print("Initial state...................: %s"%(numpy.ravel(Xbackground),))
+    print("Optimal state...................: %s"%(numpy.ravel(Xoptimum),))
+    print("Simulation at optimal state.....: %s"%(numpy.ravel(FX_at_optimum),))
+    print("")
     #
     return case.get("Analysis")[-1]
 
 # ==============================================================================
 if __name__ == "__main__":
-    print '\n AUTODIAGNOSTIC \n'
-    print """Exemple de la doc :
+    print('\nAUTODIAGNOSTIC\n')
+    print("""Exemple de la doc :
 
     Exploitation independante des resultats d'un cas de calcul
     ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    """
+    """)
     xa = test1()
     assertAlmostEqualArrays(xa, [ 2., 3., 4.])

diff --git a/test/test6703/utExtend.py b/test/test6703/utExtend.py
index ec9aba53c6b99b3e8b119cc6d6d3c19a916f8443..cb7b8e87e8a2ebd3dd3d1d32f1c0cb97dc83b2f3 100644 (file)
--- a/test/test6703/utExtend.py
+++ b/test/test6703/utExtend.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -32,7 +32,7 @@ import numpy
 def assertAlmostEqualArrays(first, second, places=7, msg=None, delta=None):
     "Compare two vectors, like unittest.assertAlmostEqual"
     if msg is not None:
-        print msg
+        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))

diff --git a/test/test6901/Verification_des_Assimilation_Algorithms.py b/test/test6901/Verification_des_Assimilation_Algorithms.py
index e933b9513c76c85313fd96ad3448ec5ca27a3874..47b0b0709a816cb74106ee50e6d7befda7265b45 100644 (file)
--- a/test/test6901/Verification_des_Assimilation_Algorithms.py
+++ b/test/test6901/Verification_des_Assimilation_Algorithms.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -27,9 +27,9 @@ def test1():
     """Verification de la disponibilite de l'ensemble des algorithmes\n(Utilisation d'un operateur matriciel)"""
     Xa = {}
     for algo in ("3DVAR", "Blue", "ExtendedBlue", "LinearLeastSquares", "NonLinearLeastSquares", "DerivativeFreeOptimization"):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"EpsilonMinimumExponent":-10, "Bounds":[[-1,10.],[-1,10.],[-1,10.]]})
@@ -44,9 +44,9 @@ def test1():
         del adaopy
     #
     for algo in ("ExtendedKalmanFilter", "KalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"EpsilonMinimumExponent":-10, })
@@ -63,9 +63,9 @@ def test1():
         del adaopy
     #
     for algo in ("ParticleSwarmOptimization", "QuantileRegression", ):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"BoxBounds":3*[[-1,3]], "SetSeed":1000, })
@@ -80,9 +80,9 @@ def test1():
         del adaopy
     #
     for algo in ("EnsembleBlue", ):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"SetSeed":1000, })
@@ -96,14 +96,14 @@ def test1():
         Xa[algo] = adaopy.get("Analysis")[-1]
         del adaopy
     #
-    print
+    print("")
     msg = "Tests des ecarts attendus :"
-    print msg+"\n"+"="*len(msg)
+    print(msg+"\n"+"="*len(msg))
     verify_similarity_of_algo_results(("3DVAR", "Blue", "ExtendedBlue", "4DVAR", "DerivativeFreeOptimization"), Xa)
     verify_similarity_of_algo_results(("LinearLeastSquares", "NonLinearLeastSquares"), Xa)
     verify_similarity_of_algo_results(("ExtendedKalmanFilter", "KalmanFilter", "UnscentedKalmanFilter"), Xa)
-    print "  Les resultats obtenus sont corrects."
-    print
+    print("  Les resultats obtenus sont corrects.")
+    print("")
     #
     return 0
 
@@ -113,9 +113,9 @@ def test2():
     M = numpy.matrix("1 0 0;0 2 0;0 0 3")
     def H(x): return M * numpy.asmatrix(numpy.ravel( x )).T
     for algo in ("3DVAR", "Blue", "ExtendedBlue", "NonLinearLeastSquares", "DerivativeFreeOptimization"):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"EpsilonMinimumExponent":-10, "Bounds":[[-1,10.],[-1,10.],[-1,10.]]})
@@ -132,9 +132,9 @@ def test2():
     M = numpy.matrix("1 0 0;0 2 0;0 0 3")
     def H(x): return M * numpy.asmatrix(numpy.ravel( x )).T
     for algo in ("ExtendedKalmanFilter", "KalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"EpsilonMinimumExponent":-10, })
@@ -153,9 +153,9 @@ def test2():
     M = numpy.matrix("1 0 0;0 1 0;0 0 1")
     def H(x): return M * numpy.asmatrix(numpy.ravel( x )).T
     for algo in ("ParticleSwarmOptimization", "QuantileRegression", ):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"BoxBounds":3*[[-1,3]], "SetSeed":1000, })
@@ -169,31 +169,31 @@ def test2():
         Xa[algo] = adaopy.get("Analysis")[-1]
         del adaopy
     #
-    print
+    print("")
     msg = "Tests des ecarts attendus :"
-    print msg+"\n"+"="*len(msg)
+    print(msg+"\n"+"="*len(msg))
     verify_similarity_of_algo_results(("3DVAR", "Blue", "ExtendedBlue", "4DVAR", "DerivativeFreeOptimization"), Xa)
     verify_similarity_of_algo_results(("ExtendedKalmanFilter", "KalmanFilter", "UnscentedKalmanFilter"), Xa)
-    print "  Les resultats obtenus sont corrects."
-    print
+    print("  Les resultats obtenus sont corrects.")
+    print("")
     #
     return 0
 
 def almost_equal_vectors(v1, v2, precision = 1.e-15, msg = ""):
     """Comparaison de deux vecteurs"""
-    print "    Difference maximale %s: %.2e"%(msg, max(abs(v2 - v1)))
+    print("    Difference maximale %s: %.2e"%(msg, max(abs(v2 - v1))))
     return max(abs(v2 - v1)) < precision
 
 def verify_similarity_of_algo_results(serie = [], Xa = {}):
-    print "  Comparaisons :"
+    print("  Comparaisons :")
     for algo1 in serie:
         for algo2 in serie:
             if algo1 is algo2: break
             assert almost_equal_vectors( Xa[algo1], Xa[algo2], 5.e-5, "entre %s et %s "%(algo1, algo2) )
-    print "  Algorithmes dont les resultats sont similaires : %s\n"%(serie,)
+    print("  Algorithmes dont les resultats sont similaires : %s\n"%(serie,))
 
 #===============================================================================
 if __name__ == "__main__":
-    print '\n AUTODIAGNOSTIC \n'
+    print('\nAUTODIAGNOSTIC\n')
     test1()
     test2()

diff --git a/test/test6902/Verification_des_Checking_Algorithms.py b/test/test6902/Verification_des_Checking_Algorithms.py
index 63a331a4b016ad22cc83d522c8f28c2a96600599..936a72401d43cb519d8154cd7ca7773ccb4f855b 100644 (file)
--- a/test/test6902/Verification_des_Checking_Algorithms.py
+++ b/test/test6902/Verification_des_Checking_Algorithms.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008-2017 EDF R&D
 #
@@ -25,9 +25,9 @@ import adaoBuilder
 # ==============================================================================
 def test1():
     for algo in ("AdjointTest", "FunctionTest", "GradientTest", "LinearityTest", "TangentTest"):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={"EpsilonMinimumExponent":-10,"NumberOfRepetition":2, "SetSeed":1000})
@@ -40,9 +40,9 @@ def test1():
         del adaopy
     #
     for algo in ("ObserverTest", ):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo)
@@ -56,9 +56,9 @@ def test1():
         del adaopy
     #
     for algo in ("SamplingTest", ):
-        print
+        print("")
         msg = "Algorithme en test : %s"%algo
-        print msg+"\n"+"-"*len(msg)
+        print(msg+"\n"+"-"*len(msg))
         #
         adaopy = adaoBuilder.New()
         adaopy.setAlgorithmParameters(Algorithm=algo, Parameters={
@@ -76,5 +76,5 @@ def test1():
 
 # ==============================================================================
 if __name__ == "__main__":
-    print '\n AUTODIAGNOSTIC \n'
+    print('\nAUTODIAGNOSTIC\n')
     test1()