Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into V9_dev
[modules/yacs.git]
/
src
/
yacsloader
/
samples
/
schemaANN2.xml
diff --git
a/src/yacsloader/samples/schemaANN2.xml
b/src/yacsloader/samples/schemaANN2.xml
index 27551ccf9ba1a98d8e4fd8913571b0013c00b48e..6d607816fe1512d6e94b48e0fcd3f7a63f50360d 100644
(file)
--- a/
src/yacsloader/samples/schemaANN2.xml
+++ b/
src/yacsloader/samples/schemaANN2.xml
@@
-1,6
+1,5
@@
<?xml version='1.0' encoding='iso-8859-1' ?>
<proc name="newSchema_1">
<?xml version='1.0' encoding='iso-8859-1' ?>
<proc name="newSchema_1">
- <property name="DefaultStudyID" value="1"/>
<type name="string" kind="string"/>
<struct name="Engines/dataref">
<member name="ref" type="string"/>
<type name="string" kind="string"/>
<struct name="Engines/dataref">
<member name="ref" type="string"/>
@@
-60,10
+59,10
@@
if err > epsilon :
msg += "refOutput - output : %f - %f \n"%(refOutput, output);
msg += "Got abs relative diff %f .\n"%err
ret = False;
msg += "refOutput - output : %f - %f \n"%(refOutput, output);
msg += "Got abs relative diff %f .\n"%err
ret = False;
- print
msg;
+ print
(msg)
pass
pass
-#print
"+++ OK " , i , " +++", ret
+#print
("+++ OK " , i , " +++", ret)
]]></code></script>
<inport name="i" type="int"/>
<inport name="refOutputs" type="pyobj"/>
]]></code></script>
<inport name="i" type="int"/>
<inport name="refOutputs" type="pyobj"/>
@@
-262,7
+261,7
@@
refOutputs = [
<inline name="PyBuildLoopIndex">
<function name="make_indexes">
<code><![CDATA[def make_indexes(inVal, outVal) :
<inline name="PyBuildLoopIndex">
<function name="make_indexes">
<code><![CDATA[def make_indexes(inVal, outVal) :
- print
"In make_indexes" ;
+ print
("In make_indexes")
if ( len(inVal) != len(outVal) ) :
msg = "len(inVal) (%i) != len(outVal) (%i). "%( len(inVal), len(outVal) ) ;
raise ValueError(msg)
if ( len(inVal) != len(outVal) ) :
msg = "len(inVal) (%i) != len(outVal) (%i). "%( len(inVal), len(outVal) ) ;
raise ValueError(msg)
@@
-290,7
+289,7
@@
pmmlObj.SetCurrentModel( modelname , eval(pmmltype) );
myFunc = "pyFunc";
myHeader = "Function processed in YACCS";
myCode = pmmlObj.ExportPyStr(myFunc, myHeader);
myFunc = "pyFunc";
myHeader = "Function processed in YACCS";
myCode = pmmlObj.ExportPyStr(myFunc, myHeader);
-exec
myCode
;
+exec
(myCode)
;
]]></code></script>
<inport name="filename" type="string"/>
<inport name="modelname" type="string"/>
]]></code></script>
<inport name="filename" type="string"/>
<inport name="modelname" type="string"/>
@@
-311,8
+310,8
@@
filepath = resourcesDir + filename;
<outport name="filepath" type="string"/>
</inline>
<inline name="PyGetRes">
<outport name="filepath" type="string"/>
</inline>
<inline name="PyGetRes">
- <script><code><![CDATA[print
"retVec "
;
-print
retVec
;
+ <script><code><![CDATA[print
("retVec ")
;
+print
(retVec)
;
res = "True";
for ret in retVec:
if not ret:
res = "True";
for ret in retVec:
if not ret: