fix: replace deprecated concore2 imports with concore (Issue #287)

Author: GaneshPatil7517

0mq/comm_node.py

@@ -1,25 +1,24 @@
 import concore
-import concore2
 
 concore.delay = 0.07
-concore2.delay = 0.07
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0
+concore.delay = 0.07
+concore.inpath = concore.inpath
+concore.outpath = concore.outpath
+concore.simtime = 0
 concore.default_maxtime(100)
 init_simtime_u = "[0.0, 0.0, 0.0]"
 init_simtime_ym = "[0.0, 0.0, 0.0]"
 
 u = concore.initval(init_simtime_u)
-ym = concore2.initval(init_simtime_ym)
-while(concore2.simtime<concore.maxtime):
+ym = concore.initval(init_simtime_ym)
+while(concore.simtime<concore.maxtime):
     while concore.unchanged():
         u = concore.read(concore.iport['U'],"u",init_simtime_u)
     concore.write(concore.oport['U1'],"u",u)
     print(u)
-    old2 = concore2.simtime
-    while concore2.unchanged() or concore2.simtime <= old2:
-        ym = concore2.read(concore.iport['Y1'],"ym",init_simtime_ym)
-    concore2.write(concore.oport['Y'],"ym",ym)
-    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
+    old2 = concore.simtime
+    while concore.unchanged() or concore.simtime <= old2:
+        ym = concore.read(concore.iport['Y1'],"ym",init_simtime_ym)
+    concore.write(concore.oport['Y'],"ym",ym)
+    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
 print("retry="+str(concore.retrycount))

0mq/funbody.py

@@ -1,5 +1,4 @@
 import concore
-import concore2
 import time
 from osparc_control import CommandManifest
 from osparc_control import CommandParameter
@@ -27,17 +26,17 @@
 paired_transmitter.start_background_sync()
 
 concore.delay = 0.07
-concore2.delay = 0.07
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0
+concore.delay = 0.07
+concore.inpath = concore.inpath
+concore.outpath = concore.outpath
+concore.simtime = 0
 concore.default_maxtime(100)
 init_simtime_u = "[0.0, 0.0, 0.0]"
 init_simtime_ym = "[0.0, 0.0, 0.0]"
 
 u = concore.initval(init_simtime_u)
-ym = concore2.initval(init_simtime_ym)
-while(concore2.simtime<concore.maxtime):
+ym = concore.initval(init_simtime_ym)
+while(concore.simtime<concore.maxtime):
     #while concore.unchanged():
     #    u = concore.read(concore.iport['U1'],"u",init_simtime_u)
     command_list = paired_transmitter.get_incoming_requests()
@@ -53,17 +52,17 @@
         u = u[1:] 
         concore.write(concore.oport['U2'],"u",u)
         print(u)
-        old2 = concore2.simtime
-        while concore2.unchanged() or concore2.simtime <= old2:
-            ym = concore2.read(concore.iport['Y2'],"ym",init_simtime_ym)
-        ym = [concore2.simtime]+ym
+        old2 = concore.simtime
+        while concore.unchanged() or concore.simtime <= old2:
+            ym = concore.read(concore.iport['Y2'],"ym",init_simtime_ym)
+        ym = [concore.simtime]+ym
         print(f"Replying to {command.action} with {ym}")
         paired_transmitter.reply_to_command(
            request_id=command.request_id, payload=ym)
     else:
         print("undefined action"+str(command.action)) 
         quit()
-    #concore2.write(concore.oport['Y1'],"ym",ym)
-    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
+    #concore.write(concore.oport['Y1'],"ym",ym)
+    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
 paired_transmitter.stop_background_sync()
 print("retry="+str(concore.retrycount))

0mq/funbody2.py

@@ -1,5 +1,4 @@
 import concore
-import concore2
 import time
 from osparc_control import CommandManifest
 from osparc_control import CommandParameter
@@ -27,17 +26,17 @@
 paired_transmitter.start_background_sync()
 
 concore.delay = 0.07
-concore2.delay = 0.07
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0
+concore.delay = 0.07
+concore.inpath = concore.inpath
+concore.outpath = concore.outpath
+concore.simtime = 0
 concore.default_maxtime(100)
 init_simtime_u = "[0.0, 0.0, 0.0]"
 init_simtime_ym = "[0.0, 0.0, 0.0]"
 
 u = concore.initval(init_simtime_u)
-ym = concore2.initval(init_simtime_ym)
-while(concore2.simtime<concore.maxtime):
+ym = concore.initval(init_simtime_ym)
+while(concore.simtime<concore.maxtime):
     #while concore.unchanged():
     #    u = concore.read(concore.iport['U1'],"u",init_simtime_u)
     command_list = paired_transmitter.get_incoming_requests()
@@ -53,17 +52,17 @@
         u = u[1:] 
         concore.write(concore.oport['U2'],"u",u)
         print(u)
-        old2 = concore2.simtime
-        while concore2.unchanged() or concore2.simtime <= old2:
-            ym = concore2.read(concore.iport['Y2'],"ym",init_simtime_ym)
-        ym = [concore2.simtime]+ym
+        old2 = concore.simtime
+        while concore.unchanged() or concore.simtime <= old2:
+            ym = concore.read(concore.iport['Y2'],"ym",init_simtime_ym)
+        ym = [concore.simtime]+ym
         print(f"Replying to {command.action} with {ym}")
         paired_transmitter.reply_to_command(
            request_id=command.request_id, payload=ym)
     else:
         print("undefined action"+str(command.action)) 
         quit()
-    #concore2.write(concore.oport['Y1'],"ym",ym)
-    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
+    #concore.write(concore.oport['Y1'],"ym",ym)
+    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
 paired_transmitter.stop_background_sync()
 print("retry="+str(concore.retrycount))

0mq/funbody_distributed.py

@@ -1,7 +1,6 @@
 # funbody2_zmq.py
 import time 
 import concore
-import concore2
 
 print("funbody using ZMQ via concore")
 
@@ -16,21 +15,21 @@
 
 # Standard concore initializations
 concore.delay = 0.07         
-concore2.delay = 0.07        
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0         
+concore.delay = 0.07        
+concore.inpath = concore.inpath
+concore.outpath = concore.outpath
+concore.simtime = 0         
 concore.default_maxtime(100) 
 init_simtime_u_str = "[0.0, 0.0, 0.0]"
 init_simtime_ym_str = "[0.0, 0.0, 0.0]"
 
 u_data_values = concore.initval(init_simtime_u_str) 
-ym_data_values = concore2.initval(init_simtime_ym_str)
+ym_data_values = concore.initval(init_simtime_ym_str)
 
 print(f"Initial u_data_values: {u_data_values}, ym_data_values: {ym_data_values}")
 print(f"Max time: {concore.maxtime}")
 
-while concore2.simtime < concore.maxtime:
+while concore.simtime < concore.maxtime:
     received_u_data = concore.read(PORT_NAME_F2_OUT, "u_signal", init_simtime_u_str)
 
     if not (isinstance(received_u_data, list) and len(received_u_data) > 0):
@@ -50,17 +49,17 @@
     if 'U2' in concore.oport: 
         concore.write(concore.oport['U2'], "u", u_data_values)
 
-    old_concore2_simtime = concore2.simtime
-    while concore2.unchanged() or concore2.simtime <= old_concore2_simtime:
+    old_concore_simtime = concore.simtime
+    while concore.unchanged() or concore.simtime <= old_concore_simtime:
         # Assuming concore.iport['Y2'] is a file port (e.g., from pmpymax.py)
-        ym_data_values = concore2.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
-        # time.sleep(concore2.delay) # Optional delay
+        ym_data_values = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
+        # time.sleep(concore.delay) # Optional delay
 
-    ym_full_to_send = [concore2.simtime] + ym_data_values
+    ym_full_to_send = [concore.simtime] + ym_data_values
 
     concore.write(PORT_NAME_F2_OUT, "ym_signal", ym_full_to_send)
 
-    print(f"funbody u={u_data_values} ym={ym_data_values} time={concore2.simtime}")
+    print(f"funbody u={u_data_values} ym={ym_data_values} time={concore.simtime}")
 
 print("funbody retry=" + str(concore.retrycount))
 

0mq/funbody_zmq.py

@@ -1,7 +1,6 @@
 # funbody2_zmq.py
 import time 
 import concore
-import concore2
 
 print("funbody using ZMQ via concore")
 
@@ -15,21 +14,21 @@
 
 # Standard concore initializations
 concore.delay = 0.07         
-concore2.delay = 0.07        
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0         
+concore.delay = 0.07        
+concore.inpath = concore.inpath
+concore.outpath = concore.outpath
+concore.simtime = 0         
 concore.default_maxtime(100) 
 init_simtime_u_str = "[0.0, 0.0, 0.0]"
 init_simtime_ym_str = "[0.0, 0.0, 0.0]"
 
 u_data_values = concore.initval(init_simtime_u_str) 
-ym_data_values = concore2.initval(init_simtime_ym_str)
+ym_data_values = concore.initval(init_simtime_ym_str)
 
 print(f"Initial u_data_values: {u_data_values}, ym_data_values: {ym_data_values}")
 print(f"Max time: {concore.maxtime}")
 
-while concore2.simtime < concore.maxtime:
+while concore.simtime < concore.maxtime:
     received_u_data = concore.read(PORT_NAME_F2_F1, "u_signal", init_simtime_u_str)
 
     if not (isinstance(received_u_data, list) and len(received_u_data) > 0):
@@ -49,17 +48,17 @@
     if 'U2' in concore.oport: 
         concore.write(concore.oport['U2'], "u", u_data_values)
 
-    old_concore2_simtime = concore2.simtime
-    while concore2.unchanged() or concore2.simtime <= old_concore2_simtime:
+    old_concore_simtime = concore.simtime
+    while concore.unchanged() or concore.simtime <= old_concore_simtime:
         # Assuming concore.iport['Y2'] is a file port (e.g., from pmpymax.py)
-        ym_data_values = concore2.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
-        # time.sleep(concore2.delay) # Optional delay
+        ym_data_values = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
+        # time.sleep(concore.delay) # Optional delay
 
-    ym_full_to_send = [concore2.simtime] + ym_data_values
+    ym_full_to_send = [concore.simtime] + ym_data_values
 
     concore.write(PORT_NAME_F2_F1, "ym_signal", ym_full_to_send)
 
-    print(f"funbody u={u_data_values} ym={ym_data_values} time={concore2.simtime}")
+    print(f"funbody u={u_data_values} ym={ym_data_values} time={concore.simtime}")
 
 print("funbody retry=" + str(concore.retrycount))
 

0mq/funbody_zmq2.py

@@ -1,7 +1,6 @@
 # funbody2_zmq.py
 import time 
 import concore
-import concore2
 
 print("funbody using ZMQ via concore")
 
@@ -15,21 +14,21 @@
 
 # Standard concore initializations
 concore.delay = 0.07         
-concore2.delay = 0.07        
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0         
+concore.delay = 0.07        
+concore.inpath = concore.inpath
+concore.outpath = concore.outpath
+concore.simtime = 0         
 concore.default_maxtime(100) 
 init_simtime_u_str = "[0.0, 0.0, 0.0]"
 init_simtime_ym_str = "[0.0, 0.0, 0.0]"
 
 u_data_values = concore.initval(init_simtime_u_str) 
-ym_data_values = concore2.initval(init_simtime_ym_str)
+ym_data_values = concore.initval(init_simtime_ym_str)
 
 print(f"Initial u_data_values: {u_data_values}, ym_data_values: {ym_data_values}")
 print(f"Max time: {concore.maxtime}")
 
-while concore2.simtime < concore.maxtime:
+while concore.simtime < concore.maxtime:
     received_u_data = concore.read(PORT_NAME_F2_OUT, "u_signal", init_simtime_u_str)
 
     if not (isinstance(received_u_data, list) and len(received_u_data) > 0):
@@ -49,17 +48,17 @@
     if 'U2' in concore.oport: 
         concore.write(concore.oport['U2'], "u", u_data_values)
 
-    old_concore2_simtime = concore2.simtime
-    while concore2.unchanged() or concore2.simtime <= old_concore2_simtime:
+    old_concore_simtime = concore.simtime
+    while concore.unchanged() or concore.simtime <= old_concore_simtime:
         # Assuming concore.iport['Y2'] is a file port (e.g., from pmpymax.py)
-        ym_data_values = concore2.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
-        # time.sleep(concore2.delay) # Optional delay
+        ym_data_values = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str)
+        # time.sleep(concore.delay) # Optional delay
 
-    ym_full_to_send = [concore2.simtime] + ym_data_values
+    ym_full_to_send = [concore.simtime] + ym_data_values
 
     concore.write(PORT_NAME_F2_OUT, "ym_signal", ym_full_to_send)
 
-    print(f"funbody u={u_data_values} ym={ym_data_values} time={concore2.simtime}")
+    print(f"funbody u={u_data_values} ym={ym_data_values} time={concore.simtime}")
 
 print("funbody retry=" + str(concore.retrycount))
 

0mq/funcall.py

@@ -1,39 +1,38 @@
 import concore
-import concore2
 from osparc_control import PairedTransmitter
 print("funcall 0mq")
 
 concore.delay = 0.07
-concore2.delay = 0.07
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0
+concore.delay = 0.07
+concore.inpath = concore.inpath
+concore.outpath = concore.outpath
+concore.simtime = 0
 concore.default_maxtime(100)
 init_simtime_u = "[0.0, 0.0, 0.0]"
 init_simtime_ym = "[0.0, 0.0, 0.0]"
 
 u = concore.initval(init_simtime_u)
-ym = concore2.initval(init_simtime_ym)
+ym = concore.initval(init_simtime_ym)
 paired_transmitter = PairedTransmitter(
     remote_host="localhost", exposed_commands=[],  
     remote_port=2345, listen_port=2346,)
 paired_transmitter.start_background_sync()
 try:
-    while(concore2.simtime<concore.maxtime):
+    while(concore.simtime<concore.maxtime):
         while concore.unchanged():
             u = concore.read(concore.iport['U'],"u",init_simtime_u)
         print(u)
         #concore.write(concore.oport['U1'],"u",u)
-        #old2 = concore2.simtime
-        #while concore2.unchanged() or concore2.simtime <= old2:
-        #    ym = concore2.read(concore.iport['Y1'],"ym",init_simtime_ym)
+        #old2 = concore.simtime
+        #while concore.unchanged() or concore.simtime <= old2:
+        #    ym = concore.read(concore.iport['Y1'],"ym",init_simtime_ym)
         ym = paired_transmitter.request_with_immediate_reply(
             "fun", timeout=10.0, params={"u": [concore.simtime]+u})
-        concore2.simtime = ym[0]
+        concore.simtime = ym[0]
         ym = ym[1:]
         #print(ym)
-        concore2.write(concore.oport['Y'],"ym",ym)
-        print("funcall 0mq u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
+        concore.write(concore.oport['Y'],"ym",ym)
+        print("funcall 0mq u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
 finally:
     paired_transmitter.stop_background_sync()
 print("retry="+str(concore.retrycount))