Minor improvements and fixes for internal variables

[modules/adao.git] / resources / ADAOSchemaCatalog.xml

diff --git a/resources/ADAOSchemaCatalog.xml b/resources/ADAOSchemaCatalog.xml
index 5d0c3782367e938a8d8f55a48f2cade4127cea34..c01b789c935256277b80f5358886a5e78d960199 100644 (file)
--- a/resources/ADAOSchemaCatalog.xml
+++ b/resources/ADAOSchemaCatalog.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!--
-  Copyright (C) 2008-2019 EDF R&D
+  Copyright (C) 2008-2021 EDF R&D
 
   This file is part of SALOME ADAO module
 
@@ -415,10 +415,14 @@ type = "Vector"
 
 if sys.version_info.major > 2: import adao
 from daCore.Interfaces import ImportFromFile as aif
-vector = numpy.ravel( aif(script).getvalue(columns)[1] )
+if colmajor:
+    vector = numpy.ravel( numpy.transpose( aif(script).getvalue(columns)[1] ) )
+else:
+    vector = numpy.ravel( aif(script).getvalue(columns)[1] )
 ]]></code></script>
     <inport name="script" type="string"/>
     <inport name="columns" type="stringvec"/>
+    <inport name="colmajor" type="bool"/>
     <outport name="vector" type="pyobj"/>
     <outport name="type" type="string"/>
     <outport name="stored" type="bool"/>
@@ -434,10 +438,11 @@ if (vector_in_string.find("array")>-1) or (vector_in_string.find("matrix")>-1):
     vector_in_string=vector_in_string.replace("array","numpy.array")
     vector_in_string=vector_in_string.replace("matrix","numpy.matrix")
     exec("vector="+vector_in_string)
-    vector = numpy.matrix(vector)
+    vector = numpy.array(vector)
 else:
     vector_in_string=vector_in_string.replace("'","").replace('"','')
-    vector = numpy.matrix(vector_in_string)
+    vector_in_list = eval(str(vector_in_string),{},{})
+    vector = numpy.array(vector_in_list)
 type = "VectorSerie"
 logging.debug("VectorSerie is %s"%vector)
 ]]></code></script>
@@ -480,10 +485,14 @@ type = "VectorSerie"
 if sys.version_info.major > 2: import adao
 from daCore.Interfaces import ImportFromFile as aif
 if len(columns) == 0: columns = None
-vector = numpy.transpose( aif(script).getvalue(columns)[1] )
+if colmajor:
+    aif(script).getvalue(columns)[1]
+else:
+    vector = numpy.transpose( aif(script).getvalue(columns)[1] )
 ]]></code></script>
     <inport name="script" type="string"/>
     <inport name="columns" type="stringvec"/>
+    <inport name="colmajor" type="bool"/>
     <outport name="vector" type="pyobj"/>
     <outport name="type" type="string"/>
     <outport name="stored" type="bool"/>