Skip to content

Commit 6c8fb8b

Browse files
authored
Merge pull request #191 from suchitalad/xcosblocks
Updated CMAT3D INTEGRAL_m INVBLK LOOKUP_f MATBKSL MATCATH MATCATV MAT…
2 parents 6993899 + b4c2b67 commit 6c8fb8b

25 files changed

+501
-8
lines changed

blocks/Xcos/blocks/CMAT3D.py

+26
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,32 @@ def CMAT3D(outroot, attribid, ordering, geometry, parameters):
1010
dependsOnU='1')
1111

1212
addExprsNode(outnode, TYPE_STRING, 5, parameters)
13+
addScilabDNode(outnode, AS_REAL_PARAM, width=77, realParts=[0.0, 0.0, 0.0, 0.0,
14+
0.0, 0.0, 0.0, 0.0, 0.0, 0.02000000000000024, 0.17999999999999994,
15+
0.33999999999999986, 0.5, 0.6600000000000001, 0.8199999999999998,
16+
0.98, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.9000000000000004,
17+
0.7400000000000002, 0.5800000000000001, 0.0, 0.0, 0.0,
18+
0.05999999999999994, 0.21999999999999997, 0.3799999999999999,
19+
0.54, 0.7, 0.8600000000000001, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
20+
0.8599999999999999, 0.6999999999999997, 0.5399999999999996,
21+
0.38000000000000034, 0.2200000000000002, 0.06000000000000005,
22+
0.0, 0.0, 0.0, 0.58, 0.74, 0.9, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
23+
0.9799999999999998, 0.8200000000000001, 0.6600000000000001,
24+
0.5, 0.33999999999999986, 0.18000000000000016, 0.020000000000000018,
25+
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0, -1.0])
26+
param = [parameters[3], parameters[4], parameters[0], parameters[1]]
27+
addPrecNode(outnode, TYPE_INTEGER, AS_INT_PARAM, 4, param)
28+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
29+
array = ['0']
30+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
31+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
32+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
33+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
34+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
35+
addObjNode(outnode, TYPE_ARRAY,
36+
CLASS_LIST, AS_EQUATIONS, parameters)
37+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
38+
geometry['width'], geometry['x'], geometry['y'])
1339

1440
return outnode
1541

blocks/Xcos/blocks/EDGETRIGGER.py

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
from common.AAAAAA import *
2+
3+
def EDGETRIGGER(outroot, attribid, ordering, geometry, parameters):
4+
func_name = 'EDGETRIGGER'
5+
6+
outnode = addOutNode(outroot, BLOCK_BASIC,
7+
attribid, ordering, 1,
8+
func_name, 'edgetrig', 'C_OR_FORTRAN',
9+
func_name, BLOCKTYPE_C)
10+
11+
addExprsNode(outnode, TYPE_STRING, 1, parameters)
12+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
13+
array = ['-1']
14+
addPrecisionNode(outnode, TYPE_INTEGER, AS_INT_PARAM, 1, array)
15+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
16+
array = ['0']
17+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
19+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
20+
addSciDBNode(outnode, TYPE_DOUBLE, AS_DSTATE,
21+
1, realParts=[0.0])
22+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
23+
addArrayNode(outnode, scilabClass="ScilabList",
24+
**{'as': 'equations'})
25+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
26+
geometry['width'], geometry['x'], geometry['y'])
27+
28+
return outnode
29+
30+
31+
def get_from_EDGETRIGGER(cell):
32+
parameters = getParametersFromExprsNode(cell, TYPE_DOUBLE)
33+
34+
display_parameter = ''
35+
36+
eiv = ''
37+
iiv = ''
38+
con = ''
39+
eov = ''
40+
iov = ''
41+
com = ''
42+
43+
ports = [eiv, iiv, con, eov, iov, com]
44+
45+
return (parameters, display_parameter, ports)

blocks/Xcos/blocks/INTEGRAL_m.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def INTEGRAL_m(outroot, attribid, ordering, geometry, parameters):
1717
array = ['0']
1818
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
1919
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
20-
addSciDBNode(outnode, TYPE_DOUBLE, AS_STATE,
21-
1, realParts=[3.0])
20+
addScilabDNode(outnode, AS_STATE, width=1, realParts=[
21+
format_real_number(parameters[0])])
2222
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
2323
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
2424
# Create the outer Array node for equations

blocks/Xcos/blocks/INVBLK.py

+13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ def INVBLK(outroot, attribid, ordering, geometry, parameters):
1010
dependsOnU='1')
1111

1212
addExprsNode(outnode, TYPE_STRING, 1, parameters)
13+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
15+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
16+
array = ['0']
17+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
19+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
21+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
22+
addObjNode(outnode, TYPE_ARRAY,
23+
CLASS_LIST, AS_EQUATIONS, parameters)
24+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
25+
geometry['width'], geometry['x'], geometry['y'])
1326

1427
return outnode
1528

blocks/Xcos/blocks/LOOKUP_f.py

+16-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
def LOOKUP_f(outroot, attribid, ordering, geometry, parameters):
44
func_name = 'LOOKUP_f'
5-
para = parameters[0].split(' ')
65

76
outnode = addOutNode(outroot, BLOCK_BASIC,
87
attribid, ordering, 1,
@@ -11,11 +10,22 @@ def LOOKUP_f(outroot, attribid, ordering, geometry, parameters):
1110
dependsOnU='1')
1211

1312
addExprsNode(outnode, TYPE_DOUBLE, 0, parameters)
14-
15-
node = addNode(outnode, TYPE_STRING, height=1, width=len(para))
16-
17-
for i in range(len(para)):
18-
addData(node, i, 0, para[i])
13+
addScilabDNode(outnode, AS_REAL_PARAM, width=8, realParts=[-1.9999999999999998,
14+
-1.0163934426229506, 0.9945355191256833,
15+
2.0, 5.008695652173915, 1.003188405797102,
16+
5.113043478260871, 1.003188405797102])
17+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
18+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
19+
array = ['0']
20+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
21+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
22+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
23+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
24+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
25+
addObjNode(outnode, TYPE_ARRAY,
26+
CLASS_LIST, AS_EQUATIONS, parameters)
27+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
28+
geometry['width'], geometry['x'], geometry['y'])
1929

2030
return outnode
2131

blocks/Xcos/blocks/MATBKSL.py

+13
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@ def MATBKSL(outroot, attribid, ordering, geometry, parameters):
1414
dependsOnU='1')
1515

1616
addExprsNode(outnode, TYPE_STRING, 1, parameters)
17+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
18+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
19+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
20+
array = ['0']
21+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
22+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
23+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
24+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
25+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
26+
addObjNode(outnode, TYPE_ARRAY,
27+
CLASS_LIST, AS_EQUATIONS, parameters)
28+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
29+
geometry['width'], geometry['x'], geometry['y'])
1730

1831
return outnode
1932

blocks/Xcos/blocks/MATCATH.py

+13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ def MATCATH(outroot, attribid, ordering, geometry, parameters):
1010
dependsOnU='1')
1111

1212
addExprsNode(outnode, TYPE_STRING, 1, parameters)
13+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
15+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
16+
array = ['0']
17+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
19+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
21+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
22+
addObjNode(outnode, TYPE_ARRAY,
23+
CLASS_LIST, AS_EQUATIONS, parameters)
24+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
25+
geometry['width'], geometry['x'], geometry['y'])
1326

1427
return outnode
1528

blocks/Xcos/blocks/MATCATV.py

+13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ def MATCATV(outroot, attribid, ordering, geometry, parameters):
1010
dependsOnU='1')
1111

1212
addExprsNode(outnode, TYPE_STRING, 1, parameters)
13+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
15+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
16+
array = ['0']
17+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
19+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
21+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
22+
addObjNode(outnode, TYPE_ARRAY,
23+
CLASS_LIST, AS_EQUATIONS, parameters)
24+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
25+
geometry['width'], geometry['x'], geometry['y'])
1326

1427
return outnode
1528

blocks/Xcos/blocks/MATINV.py

+13
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@ def MATINV(outroot, attribid, ordering, geometry, parameters):
1414
dependsOnU='1')
1515

1616
addExprsNode(outnode, TYPE_STRING, 1, parameters)
17+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
18+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
19+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
20+
array = ['0']
21+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
22+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
23+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
24+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
25+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
26+
addObjNode(outnode, TYPE_ARRAY,
27+
CLASS_LIST, AS_EQUATIONS, parameters)
28+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
29+
geometry['width'], geometry['x'], geometry['y'])
1730

1831
return outnode
1932

blocks/Xcos/blocks/MAX_f.py

+14
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,20 @@ def MAX_f(outroot, attribid, ordering, geometry, parameters):
1111
dependsOnU='1')
1212

1313
addExprsNode(outnode, TYPE_STRING, 1, parameters)
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
15+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
16+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
17+
array = ['0']
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
19+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
21+
addScilabDNode(outnode, AS_DSTATE, width=2, realParts=[
22+
0.0, 0.0])
23+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
24+
addObjNode(outnode, TYPE_ARRAY,
25+
CLASS_LIST, AS_EQUATIONS, parameters)
26+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
27+
geometry['width'], geometry['x'], geometry['y'])
1428

1529
return outnode
1630

blocks/Xcos/blocks/MIN_f.py

+14
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,20 @@ def MIN_f(outroot, attribid, ordering, geometry, parameters):
1111
dependsOnU='1')
1212

1313
addExprsNode(outnode, TYPE_STRING, 1, parameters)
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
15+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
16+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
17+
array = ['0']
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
19+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
21+
addScilabDNode(outnode, AS_DSTATE, width=2, realParts=[
22+
0.0, 0.0])
23+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
24+
addObjNode(outnode, TYPE_ARRAY,
25+
CLASS_LIST, AS_EQUATIONS, parameters)
26+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
27+
geometry['width'], geometry['x'], geometry['y'])
1428

1529
return outnode
1630

blocks/Xcos/blocks/NEGTOPOS_f.py

+13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ def NEGTOPOS_f(outroot, attribid, ordering, geometry, parameters):
1010
dependsOnU='1')
1111

1212
addExprsNode(outnode, TYPE_DOUBLE, 0, parameters)
13+
addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[-1.0, -1.0, 0.0, -1.0])
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
15+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
16+
array = ['1', '0']
17+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array[0])
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array[1])
19+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
21+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
22+
addObjNode(outnode, TYPE_ARRAY,
23+
CLASS_LIST, AS_EQUATIONS, parameters)
24+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
25+
geometry['width'], geometry['x'], geometry['y'])
1326

1427
return outnode
1528

blocks/Xcos/blocks/NMOS.py

+57
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,63 @@ def NMOS(outroot, attribid, ordering, geometry, parameters):
1010
dependsOnU='1')
1111

1212
addExprsNode(outnode, TYPE_STRING, 9, parameters)
13+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
15+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
16+
array = ['0']
17+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
19+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
21+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
22+
equationsArrayNode = addArrayNode(outnode, scilabClass="ScilabTList",
23+
**{'as': 'equations'})
24+
25+
# Add ScilabString nodes to equationsArrayNode
26+
scilabStringParameters = ["modelica", "model",
27+
"inputs", "outputs",
28+
"parameters"]
29+
addScilabStringNode(equationsArrayNode, width=5,
30+
parameters=scilabStringParameters)
31+
32+
additionalStringNode = addDataNode(equationsArrayNode,
33+
'ScilabString',
34+
height=1, width=1)
35+
addDataData(additionalStringNode, "NMOS")
36+
37+
additionalStringNode = addDataNode(equationsArrayNode,
38+
'ScilabString',
39+
height=1, width=1)
40+
addDataData(additionalStringNode, "G")
41+
42+
additionalScilabStrings = ["D", "B", "S"]
43+
44+
additionalStringNode = addDataNode(equationsArrayNode,
45+
'ScilabString',
46+
height=3, width=1)
47+
for param in additionalScilabStrings:
48+
addDataData(additionalStringNode, param)
49+
50+
innerArrayNode = addArrayNode(equationsArrayNode,
51+
scilabClass="ScilabList")
52+
53+
scilabStringParameters = ["W", "L", "Beta", "Vt", "K2", "K5", "dW", "dL", "RDS"]
54+
addSciStringNode(innerArrayNode, height=9,
55+
parameters=scilabStringParameters)
56+
57+
addNodeScilabDouble(innerArrayNode, height=9, realParts=[format_real_number(parameters[0]),
58+
format_real_number(parameters[1]),
59+
format_real_number(parameters[2]),
60+
format_real_number(parameters[3]),
61+
format_real_number(parameters[4]),
62+
format_real_number(parameters[5]),
63+
format_real_number(parameters[6]),
64+
format_real_number(parameters[7]),
65+
format_real_number(parameters[8])
66+
])
67+
68+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
69+
geometry['width'], geometry['x'], geometry['y'])
1370

1471
return outnode
1572

blocks/Xcos/blocks/NPN.py

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ def NPN(outroot, attribid, ordering, geometry, parameters):
2525

2626
addNodeScilabDB(outnode, AS_NBZERO, height=1, realParts=[0.0])
2727
addNodeScilabDB(outnode, AS_NMODE, height=1, realParts=[0.0])
28+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
29+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
2830
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
2931
equationsArrayNode = addArrayNode(outnode, scilabClass="ScilabTList",
3032
**{'as': 'equations'})

blocks/Xcos/blocks/NRMSOM_f.py

+13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ def NRMSOM_f(outroot, attribid, ordering, geometry, parameters):
1010
dependsOnU='1')
1111

1212
addExprsNode(outnode, TYPE_STRING, 1, parameters)
13+
addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, [])
14+
addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
15+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
16+
array = ['0']
17+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
18+
addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
19+
addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
20+
addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
21+
addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
22+
addObjNode(outnode, TYPE_ARRAY,
23+
CLASS_LIST, AS_EQUATIONS, parameters)
24+
addgeometryNode(outnode, GEOMETRY, geometry['height'],
25+
geometry['width'], geometry['x'], geometry['y'])
1326

1427
return outnode
1528

0 commit comments

Comments
 (0)