Skip to content

Commit 098f4a5

Browse files
pradeebanpradeeban
authored
Merge pull request #306 from GaneshPatil7517/fix/replace-concore2-imports
2 parents 54ba773 + 58915e3 commit 098f4a5

20 files changed

Lines changed: 152 additions & 230 deletions

‎0mq/comm_node.py‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
import concore
2-
import concore2
32

43
concore.delay = 0.07
5-
concore2.delay = 0.07
6-
concore2.inpath = concore.inpath
7-
concore2.outpath = concore.outpath
8-
concore2.simtime = 0
4+
concore.simtime = 0
95
concore.default_maxtime(100)
106
init_simtime_u = "[0.0, 0.0, 0.0]"
117
init_simtime_ym = "[0.0, 0.0, 0.0]"
128

139
u = concore.initval(init_simtime_u)
14-
ym = concore2.initval(init_simtime_ym)
15-
while(concore2.simtime<concore.maxtime):
10+
ym = concore.initval(init_simtime_ym)
11+
while(concore.simtime<concore.maxtime):
1612
while concore.unchanged():
1713
u = concore.read(concore.iport['U'],"u",init_simtime_u)
1814
concore.write(concore.oport['U1'],"u",u)
1915
print(u)
20-
old2 = concore2.simtime
21-
while concore2.unchanged() or concore2.simtime <= old2:
22-
ym = concore2.read(concore.iport['Y1'],"ym",init_simtime_ym)
23-
concore2.write(concore.oport['Y'],"ym",ym)
24-
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
16+
old2 = float(concore.simtime)
17+
while concore.unchanged() or concore.simtime <= old2:
18+
ym = concore.read(concore.iport['Y1'],"ym",init_simtime_ym)
19+
concore.write(concore.oport['Y'],"ym",ym)
20+
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
2521
print("retry="+str(concore.retrycount))

‎0mq/funbody.py‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import concore
2-
import concore2
32
import time
43
from osparc_control import CommandManifest
54
from osparc_control import CommandParameter
@@ -27,17 +26,14 @@
2726
paired_transmitter.start_background_sync()
2827

2928
concore.delay = 0.07
30-
concore2.delay = 0.07
31-
concore2.inpath = concore.inpath
32-
concore2.outpath = concore.outpath
33-
concore2.simtime = 0
29+
concore.simtime = 0
3430
concore.default_maxtime(100)
3531
init_simtime_u = "[0.0, 0.0, 0.0]"
3632
init_simtime_ym = "[0.0, 0.0, 0.0]"
3733

3834
u = concore.initval(init_simtime_u)
39-
ym = concore2.initval(init_simtime_ym)
40-
while(concore2.simtime<concore.maxtime):
35+
ym = concore.initval(init_simtime_ym)
36+
while(concore.simtime<concore.maxtime):
4137
#while concore.unchanged():
4238
# u = concore.read(concore.iport['U1'],"u",init_simtime_u)
4339
command_list = paired_transmitter.get_incoming_requests()
@@ -53,17 +49,17 @@
5349
u = u[1:]
5450
concore.write(concore.oport['U2'],"u",u)
5551
print(u)
56-
old2 = concore2.simtime
57-
while concore2.unchanged() or concore2.simtime <= old2:
58-
ym = concore2.read(concore.iport['Y2'],"ym",init_simtime_ym)
59-
ym = [concore2.simtime]+ym
52+
old2 = float(concore.simtime)
53+
while concore.unchanged() or concore.simtime <= old2:
54+
ym = concore.read(concore.iport['Y2'],"ym",init_simtime_ym)
55+
ym = [concore.simtime]+ym
6056
print(f"Replying to {command.action} with {ym}")
6157
paired_transmitter.reply_to_command(
6258
request_id=command.request_id, payload=ym)
6359
else:
6460
print("undefined action"+str(command.action))
6561
quit()
66-
#concore2.write(concore.oport['Y1'],"ym",ym)
67-
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
62+
#concore.write(concore.oport['Y1'],"ym",ym)
63+
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
6864
paired_transmitter.stop_background_sync()
6965
print("retry="+str(concore.retrycount))

‎0mq/funbody2.py‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import concore
2-
import concore2
32
import time
43
from osparc_control import CommandManifest
54
from osparc_control import CommandParameter
@@ -27,17 +26,14 @@
2726
paired_transmitter.start_background_sync()
2827

2928
concore.delay = 0.07
30-
concore2.delay = 0.07
31-
concore2.inpath = concore.inpath
32-
concore2.outpath = concore.outpath
33-
concore2.simtime = 0
29+
concore.simtime = 0
3430
concore.default_maxtime(100)
3531
init_simtime_u = "[0.0, 0.0, 0.0]"
3632
init_simtime_ym = "[0.0, 0.0, 0.0]"
3733

3834
u = concore.initval(init_simtime_u)
39-
ym = concore2.initval(init_simtime_ym)
40-
while(concore2.simtime<concore.maxtime):
35+
ym = concore.initval(init_simtime_ym)
36+
while(concore.simtime<concore.maxtime):
4137
#while concore.unchanged():
4238
# u = concore.read(concore.iport['U1'],"u",init_simtime_u)
4339
command_list = paired_transmitter.get_incoming_requests()
@@ -53,17 +49,17 @@
5349
u = u[1:]
5450
concore.write(concore.oport['U2'],"u",u)
5551
print(u)
56-
old2 = concore2.simtime
57-
while concore2.unchanged() or concore2.simtime <= old2:
58-
ym = concore2.read(concore.iport['Y2'],"ym",init_simtime_ym)
59-
ym = [concore2.simtime]+ym
52+
old2 = float(concore.simtime)
53+
while concore.simtime <= old2:
54+
ym = concore.read(concore.iport['Y2'],"ym",init_simtime_ym)
55+
ym = [concore.simtime]+ym
6056
print(f"Replying to {command.action} with {ym}")
6157
paired_transmitter.reply_to_command(
6258
request_id=command.request_id, payload=ym)
6359
else:
6460
print("undefined action"+str(command.action))
6561
quit()
66-
#concore2.write(concore.oport['Y1'],"ym",ym)
67-
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
62+
#concore.write(concore.oport['Y1'],"ym",ym)
63+
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
6864
paired_transmitter.stop_background_sync()
6965
print("retry="+str(concore.retrycount))

‎0mq/funbody_distributed.py‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# funbody2_zmq.py
22
import time
33
import concore
4-
import concore2
54

65
print("funbody using ZMQ via concore")
76

@@ -16,21 +15,18 @@
1615

1716
# Standard concore initializations
1817
concore.delay = 0.07
19-
concore2.delay = 0.07
20-
concore2.inpath = concore.inpath
21-
concore2.outpath = concore.outpath
22-
concore2.simtime = 0
18+
concore.simtime = 0
2319
concore.default_maxtime(100)
2420
init_simtime_u_str = "[0.0, 0.0, 0.0]"
2521
init_simtime_ym_str = "[0.0, 0.0, 0.0]"
2622

2723
u_data_values = concore.initval(init_simtime_u_str)
28-
ym_data_values = concore2.initval(init_simtime_ym_str)
24+
ym_data_values = concore.initval(init_simtime_ym_str)
2925

3026
print(f"Initial u_data_values: {u_data_values}, ym_data_values: {ym_data_values}")
3127
print(f"Max time: {concore.maxtime}")
3228

33-
while concore2.simtime < concore.maxtime:
29+
while concore.simtime < concore.maxtime:
3430
received_u_data = concore.read(PORT_NAME_F2_OUT, "u_signal", init_simtime_u_str)
3531

3632
if not (isinstance(received_u_data, list) and len(received_u_data) > 0):
@@ -50,17 +46,17 @@
5046
if 'U2' in concore.oport:
5147
concore.write(concore.oport['U2'], "u", u_data_values)
5248

53-
old_concore2_simtime = concore2.simtime
54-
while concore2.unchanged() or concore2.simtime <= old_concore2_simtime:
49+
old_concore_simtime = float(concore.simtime)
50+
while concore.unchanged() or concore.simtime <= old_concore_simtime:
5551
# Assuming concore.iport['Y2'] is a file port (e.g., from pmpymax.py)
56-
ym_data_values = concore2.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
57-
# time.sleep(concore2.delay) # Optional delay
52+
ym_data_values = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
53+
# time.sleep(concore.delay) # Optional delay
5854

59-
ym_full_to_send = [concore2.simtime] + ym_data_values
55+
ym_full_to_send = [concore.simtime] + ym_data_values
6056

6157
concore.write(PORT_NAME_F2_OUT, "ym_signal", ym_full_to_send)
6258

63-
print(f"funbody u={u_data_values} ym={ym_data_values} time={concore2.simtime}")
59+
print(f"funbody u={u_data_values} ym={ym_data_values} time={concore.simtime}")
6460

6561
print("funbody retry=" + str(concore.retrycount))
6662

‎0mq/funbody_zmq.py‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# funbody2_zmq.py
22
import time
33
import concore
4-
import concore2
54

65
print("funbody using ZMQ via concore")
76

@@ -15,21 +14,18 @@
1514

1615
# Standard concore initializations
1716
concore.delay = 0.07
18-
concore2.delay = 0.07
19-
concore2.inpath = concore.inpath
20-
concore2.outpath = concore.outpath
21-
concore2.simtime = 0
17+
concore.simtime = 0
2218
concore.default_maxtime(100)
2319
init_simtime_u_str = "[0.0, 0.0, 0.0]"
2420
init_simtime_ym_str = "[0.0, 0.0, 0.0]"
2521

2622
u_data_values = concore.initval(init_simtime_u_str)
27-
ym_data_values = concore2.initval(init_simtime_ym_str)
23+
ym_data_values = concore.initval(init_simtime_ym_str)
2824

2925
print(f"Initial u_data_values: {u_data_values}, ym_data_values: {ym_data_values}")
3026
print(f"Max time: {concore.maxtime}")
3127

32-
while concore2.simtime < concore.maxtime:
28+
while concore.simtime < concore.maxtime:
3329
received_u_data = concore.read(PORT_NAME_F2_F1, "u_signal", init_simtime_u_str)
3430

3531
if not (isinstance(received_u_data, list) and len(received_u_data) > 0):
@@ -49,17 +45,19 @@
4945
if 'U2' in concore.oport:
5046
concore.write(concore.oport['U2'], "u", u_data_values)
5147

52-
old_concore2_simtime = concore2.simtime
53-
while concore2.unchanged() or concore2.simtime <= old_concore2_simtime:
48+
# Take a numeric snapshot of the current simulation time to avoid
49+
# inadvertently sharing a reference with concore.simtime.
50+
old_concore_simtime = float(concore.simtime)
51+
while concore.unchanged() or concore.simtime <= old_concore_simtime:
5452
# Assuming concore.iport['Y2'] is a file port (e.g., from pmpymax.py)
55-
ym_data_values = concore2.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
56-
# time.sleep(concore2.delay) # Optional delay
53+
ym_data_values = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
54+
# time.sleep(concore.delay) # Optional delay
5755

58-
ym_full_to_send = [concore2.simtime] + ym_data_values
56+
ym_full_to_send = [concore.simtime] + ym_data_values
5957

6058
concore.write(PORT_NAME_F2_F1, "ym_signal", ym_full_to_send)
6159

62-
print(f"funbody u={u_data_values} ym={ym_data_values} time={concore2.simtime}")
60+
print(f"funbody u={u_data_values} ym={ym_data_values} time={concore.simtime}")
6361

6462
print("funbody retry=" + str(concore.retrycount))
6563

‎0mq/funbody_zmq2.py‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# funbody2_zmq.py
22
import time
33
import concore
4-
import concore2
54

65
print("funbody using ZMQ via concore")
76

@@ -15,21 +14,18 @@
1514

1615
# Standard concore initializations
1716
concore.delay = 0.07
18-
concore2.delay = 0.07
19-
concore2.inpath = concore.inpath
20-
concore2.outpath = concore.outpath
21-
concore2.simtime = 0
17+
concore.simtime = 0
2218
concore.default_maxtime(100)
2319
init_simtime_u_str = "[0.0, 0.0, 0.0]"
2420
init_simtime_ym_str = "[0.0, 0.0, 0.0]"
2521

2622
u_data_values = concore.initval(init_simtime_u_str)
27-
ym_data_values = concore2.initval(init_simtime_ym_str)
23+
ym_data_values = concore.initval(init_simtime_ym_str)
2824

2925
print(f"Initial u_data_values: {u_data_values}, ym_data_values: {ym_data_values}")
3026
print(f"Max time: {concore.maxtime}")
3127

32-
while concore2.simtime < concore.maxtime:
28+
while concore.simtime < concore.maxtime:
3329
received_u_data = concore.read(PORT_NAME_F2_OUT, "u_signal", init_simtime_u_str)
3430

3531
if not (isinstance(received_u_data, list) and len(received_u_data) > 0):
@@ -49,17 +45,17 @@
4945
if 'U2' in concore.oport:
5046
concore.write(concore.oport['U2'], "u", u_data_values)
5147

52-
old_concore2_simtime = concore2.simtime
53-
while concore2.unchanged() or concore2.simtime <= old_concore2_simtime:
48+
old_concore_simtime = float(concore.simtime)
49+
while concore.unchanged() or concore.simtime <= old_concore_simtime:
5450
# Assuming concore.iport['Y2'] is a file port (e.g., from pmpymax.py)
55-
ym_data_values = concore2.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
56-
# time.sleep(concore2.delay) # Optional delay
51+
ym_data_values = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
52+
# time.sleep(concore.delay) # Optional delay
5753

58-
ym_full_to_send = [concore2.simtime] + ym_data_values
54+
ym_full_to_send = [concore.simtime] + ym_data_values
5955

6056
concore.write(PORT_NAME_F2_OUT, "ym_signal", ym_full_to_send)
6157

62-
print(f"funbody u={u_data_values} ym={ym_data_values} time={concore2.simtime}")
58+
print(f"funbody u={u_data_values} ym={ym_data_values} time={concore.simtime}")
6359

6460
print("funbody retry=" + str(concore.retrycount))
6561

‎0mq/funcall.py‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
11
import concore
2-
import concore2
32
from osparc_control import PairedTransmitter
43
print("funcall 0mq")
54

65
concore.delay = 0.07
7-
concore2.delay = 0.07
8-
concore2.inpath = concore.inpath
9-
concore2.outpath = concore.outpath
10-
concore2.simtime = 0
6+
concore.simtime = 0
117
concore.default_maxtime(100)
128
init_simtime_u = "[0.0, 0.0, 0.0]"
139
init_simtime_ym = "[0.0, 0.0, 0.0]"
1410

1511
u = concore.initval(init_simtime_u)
16-
ym = concore2.initval(init_simtime_ym)
12+
ym = concore.initval(init_simtime_ym)
1713
paired_transmitter = PairedTransmitter(
1814
remote_host="localhost", exposed_commands=[],
1915
remote_port=2345, listen_port=2346,)
2016
paired_transmitter.start_background_sync()
2117
try:
22-
while(concore2.simtime<concore.maxtime):
18+
while(concore.simtime<concore.maxtime):
2319
while concore.unchanged():
2420
u = concore.read(concore.iport['U'],"u",init_simtime_u)
2521
print(u)
2622
#concore.write(concore.oport['U1'],"u",u)
27-
#old2 = concore2.simtime
28-
#while concore2.unchanged() or concore2.simtime <= old2:
29-
# ym = concore2.read(concore.iport['Y1'],"ym",init_simtime_ym)
23+
#old2 = concore.simtime
24+
#while concore.unchanged() or concore.simtime <= old2:
25+
# ym = concore.read(concore.iport['Y1'],"ym",init_simtime_ym)
3026
ym = paired_transmitter.request_with_immediate_reply(
3127
"fun", timeout=10.0, params={"u": [concore.simtime]+u})
32-
concore2.simtime = ym[0]
28+
concore.simtime = ym[0]
3329
ym = ym[1:]
3430
#print(ym)
35-
concore2.write(concore.oport['Y'],"ym",ym)
36-
print("funcall 0mq u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
31+
concore.write(concore.oport['Y'],"ym",ym)
32+
print("funcall 0mq u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
3733
finally:
3834
paired_transmitter.stop_background_sync()
3935
print("retry="+str(concore.retrycount))

0 commit comments

Comments
 (0)