Skip to content

Commit 2c31338

Browse files
committed
Chrome; funcall/body; test6
1 parent a44a65f commit 2c31338

7 files changed

Lines changed: 1075 additions & 11 deletions

File tree

editgraph

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
which open
33
if [ $? == 0 ]
44
then
5-
open https://controlcore-project.github.io/concore-editor/
5+
open -a 'Google Chrome' https://controlcore-project.github.io/concore-editor/
66
else
77
which xdg-open
88
if [ $? == 0 ]

editgraph.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
start https://controlcore-project.github.io/concore-editor/
1+
start chrome https://controlcore-project.github.io/concore-editor/
22

testsou/funbody.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
init_simtime_ym = "[0.0, 0.0, 0.0]"
1313

1414
u = concore.initval(init_simtime_u)
15-
ym = concore.initval(init_simtime_ym)
15+
ym = concore2.initval(init_simtime_ym)
1616
while(concore.simtime<concore.maxtime):
1717
while concore.unchanged():
1818
u = concore.read(concore.iport['U1'],"u",init_simtime_u)
19-
concore2.write(concore.oport['U2'],"u",u)
19+
concore.write(concore.oport['U2'],"u",u)
20+
print(u)
2021
old2 = concore2.simtime
21-
while concore2.simtime <= old2:
22+
while concore2.unchanged() or concore2.simtime <= old2:
2223
ym = concore2.read(concore.iport['Y2'],"ym",init_simtime_ym)
23-
concore.write(concore.oport['Y1'],"ym",ym)
24+
concore2.write(concore.oport['Y1'],"ym",ym)
2425
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
2526
print("retry="+str(concore.retrycount))

testsou/funcall.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
init_simtime_u = "[0.0, 0.0, 0.0]"
1212
init_simtime_ym = "[0.0, 0.0, 0.0]"
1313

14-
ym = concore.initval(init_simtime_ym)
14+
u = concore.initval(init_simtime_u)
15+
ym = concore2.initval(init_simtime_ym)
1516
while(concore.simtime<concore.maxtime):
1617
while concore.unchanged():
1718
u = concore.read(concore.iport['U'],"u",init_simtime_u)
18-
concore2.write(concore.oport['U1'],"u",u)
19+
concore.write(concore.oport['U1'],"u",u)
20+
print(u)
1921
old2 = concore2.simtime
20-
while concore2.simtime<=old2:
22+
while concore2.unchanged() or concore2.simtime <= old2:
2123
ym = concore2.read(concore.iport['Y1'],"ym",init_simtime_ym)
22-
concore.write(concore.oport['Y'],"ym",ym)
23-
print("funcall u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
24+
concore2.write(concore.oport['Y'],"ym",ym)
25+
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
2426
print("retry="+str(concore.retrycount))

testsou/passu.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import concore
2+
import numpy as np
3+
print("pass u")
4+
5+
concore.delay = 0.005
6+
concore.default_maxtime(150)
7+
init_simtime_u = "[0.0, 0.0, 0.0]"
8+
init_simtime_ym = "[0.0, 0.0, 0.0]"
9+
u = concore.initval(init_simtime_u)
10+
while(concore.simtime<concore.maxtime):
11+
while concore.unchanged():
12+
u = concore.read(1,"u",init_simtime_u)
13+
concore.write(1,"u",u)
14+
print("u="+str(u))
15+
print("retry="+str(concore.retrycount))
16+

testsou/passym.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import concore
2+
import numpy as np
3+
print("pass ym")
4+
5+
concore.delay = 0.005
6+
concore.default_maxtime(150)
7+
init_simtime_u = "[0.0, 0.0, 0.0]"
8+
init_simtime_ym = "[0.0, 0.0, 0.0]"
9+
ym = concore.initval(init_simtime_ym)
10+
while(concore.simtime<concore.maxtime):
11+
while concore.unchanged():
12+
ym = concore.read(1,"ym",init_simtime_ym)
13+
concore.write(1,"ym",ym)
14+
print(" ym="+str(ym))
15+
print("retry="+str(concore.retrycount))
16+

0 commit comments

Comments
 (0)