From 490a619c5478cdcbf76e694d02f2c4f0e7eaf5cb Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:20:31 +0530 Subject: [PATCH 01/26] fix: replace deprecated concore2 imports with concore (Issue #287) --- 0mq/comm_node.py | 23 +++++++++---------- 0mq/funbody.py | 25 ++++++++++----------- 0mq/funbody2.py | 25 ++++++++++----------- 0mq/funbody_distributed.py | 25 ++++++++++----------- 0mq/funbody_zmq.py | 25 ++++++++++----------- 0mq/funbody_zmq2.py | 25 ++++++++++----------- 0mq/funcall.py | 25 ++++++++++----------- 0mq/funcall2.py | 25 ++++++++++----------- 0mq/funcall_distributed.py | 23 +++++++++---------- 0mq/funcall_zmq.py | 23 +++++++++---------- 0mq/funcall_zmq2.py | 23 +++++++++---------- measurements/Latency/funbody_distributed.py | 25 ++++++++++----------- measurements/Latency/funcall_distributed.py | 23 +++++++++---------- measurements/comm_node_test.py | 21 +++++++++-------- nintan/powermetermax.py | 15 ++++++------- ratc/learn3.py | 15 ++++++------- testsou/funbody.py | 23 +++++++++---------- testsou/funcall.py | 23 +++++++++---------- testsou/mix.py | 13 +++++------ testsou/powermetermax.py | 15 ++++++------- 20 files changed, 210 insertions(+), 230 deletions(-) diff --git a/0mq/comm_node.py b/0mq/comm_node.py index edba31db..6a49d9d6 100644 --- a/0mq/comm_node.py +++ b/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 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)) diff --git a/0mq/funbody_zmq.py b/0mq/funbody_zmq.py index 6a6b353f..5d980956 100644 --- a/0mq/funbody_zmq.py +++ b/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)) diff --git a/0mq/funbody_zmq2.py b/0mq/funbody_zmq2.py index 04d94873..76583063 100644 --- a/0mq/funbody_zmq2.py +++ b/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)) diff --git a/0mq/funcall.py b/0mq/funcall.py index a885ed1e..85203ba1 100644 --- a/0mq/funcall.py +++ b/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 0: response_time = received_ym_data[0] if isinstance(response_time, (int, float)): - concore2.simtime = response_time + concore.simtime = response_time ym = received_ym_data[1:] else: print(f"Warning: Received ZMQ data's first element is not time: {received_ym_data}. Using as is.") ym = received_ym_data else: print(f"Warning: Received unexpected ZMQ data format: {received_ym_data}. Using default ym.") - ym = concore2.initval(init_simtime_ym_str) + ym = concore.initval(init_simtime_ym_str) # Assuming concore.oport['Y'] is a file port (e.g., to cpymax.py) - concore2.write(concore.oport['Y'], "ym", ym) + concore.write(concore.oport['Y'], "ym", ym) - print(f"funcall ZMQ u={u} ym={ym} time={concore2.simtime}") + print(f"funcall ZMQ u={u} ym={ym} time={concore.simtime}") print("funcall retry=" + str(concore.retrycount)) diff --git a/0mq/funcall_zmq.py b/0mq/funcall_zmq.py index b2f991d2..5b484b1b 100644 --- a/0mq/funcall_zmq.py +++ b/0mq/funcall_zmq.py @@ -1,7 +1,6 @@ # funcall2_zmq.py import time import concore -import concore2 print("funcall 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 = concore.initval(init_simtime_u_str) -ym = concore2.initval(init_simtime_ym_str) +ym = concore.initval(init_simtime_ym_str) -print(f"Initial u: {u}, ym: {ym}, concore.simtime: {concore.simtime}, concore2.simtime: {concore2.simtime}") +print(f"Initial u: {u}, ym: {ym}, concore.simtime: {concore.simtime}, concore.simtime: {concore.simtime}") print(f"Max time: {concore.maxtime}") -while concore2.simtime < concore.maxtime: +while concore.simtime < concore.maxtime: while concore.unchanged(): # Assuming concore.iport['U'] is a file port (e.g., from cpymax.py) u = concore.read(concore.iport['U'], "u", init_simtime_u_str) @@ -44,19 +43,19 @@ if isinstance(received_ym_data, list) and len(received_ym_data) > 0: response_time = received_ym_data[0] if isinstance(response_time, (int, float)): - concore2.simtime = response_time + concore.simtime = response_time ym = received_ym_data[1:] else: print(f"Warning: Received ZMQ data's first element is not time: {received_ym_data}. Using as is.") ym = received_ym_data else: print(f"Warning: Received unexpected ZMQ data format: {received_ym_data}. Using default ym.") - ym = concore2.initval(init_simtime_ym_str) + ym = concore.initval(init_simtime_ym_str) # Assuming concore.oport['Y'] is a file port (e.g., to cpymax.py) - concore2.write(concore.oport['Y'], "ym", ym) + concore.write(concore.oport['Y'], "ym", ym) - print(f"funcall ZMQ u={u} ym={ym} time={concore2.simtime}") + print(f"funcall ZMQ u={u} ym={ym} time={concore.simtime}") print("funcall retry=" + str(concore.retrycount)) diff --git a/0mq/funcall_zmq2.py b/0mq/funcall_zmq2.py index 13c65842..10736ce2 100644 --- a/0mq/funcall_zmq2.py +++ b/0mq/funcall_zmq2.py @@ -1,7 +1,6 @@ # funcall2_zmq.py import time import concore -import concore2 print("funcall 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 = concore.initval(init_simtime_u_str) -ym = concore2.initval(init_simtime_ym_str) +ym = concore.initval(init_simtime_ym_str) -print(f"Initial u: {u}, ym: {ym}, concore.simtime: {concore.simtime}, concore2.simtime: {concore2.simtime}") +print(f"Initial u: {u}, ym: {ym}, concore.simtime: {concore.simtime}, concore.simtime: {concore.simtime}") print(f"Max time: {concore.maxtime}") -while concore2.simtime < concore.maxtime: +while concore.simtime < concore.maxtime: while concore.unchanged(): # Assuming concore.iport['U'] is a file port (e.g., from cpymax.py) u = concore.read(concore.iport['U'], "u", init_simtime_u_str) @@ -44,19 +43,19 @@ if isinstance(received_ym_data, list) and len(received_ym_data) > 0: response_time = received_ym_data[0] if isinstance(response_time, (int, float)): - concore2.simtime = response_time + concore.simtime = response_time ym = received_ym_data[1:] else: print(f"Warning: Received ZMQ data's first element is not time: {received_ym_data}. Using as is.") ym = received_ym_data else: print(f"Warning: Received unexpected ZMQ data format: {received_ym_data}. Using default ym.") - ym = concore2.initval(init_simtime_ym_str) + ym = concore.initval(init_simtime_ym_str) # Assuming concore.oport['Y'] is a file port (e.g., to cpymax.py) - concore2.write(concore.oport['Y'], "ym", ym) + concore.write(concore.oport['Y'], "ym", ym) - print(f"funcall ZMQ u={u} ym={ym} time={concore2.simtime}") + print(f"funcall ZMQ u={u} ym={ym} time={concore.simtime}") print("funcall retry=" + str(concore.retrycount)) diff --git a/measurements/Latency/funbody_distributed.py b/measurements/Latency/funbody_distributed.py index eaae295c..b7e56849 100644 --- a/measurements/Latency/funbody_distributed.py +++ b/measurements/Latency/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)) diff --git a/measurements/Latency/funcall_distributed.py b/measurements/Latency/funcall_distributed.py index 779324fb..30e8df90 100644 --- a/measurements/Latency/funcall_distributed.py +++ b/measurements/Latency/funcall_distributed.py @@ -1,7 +1,6 @@ # funcall_distributed.py (MODIFIED FOR LATENCY MEASUREMENT) import time import concore -import concore2 import csv # <--- ADDED: Import CSV library print("funcall using ZMQ via concore") @@ -16,24 +15,24 @@ # 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) # Recommend increasing this for more data points, e.g., 1000 init_simtime_u_str = "[0.0, 0.0, 0.0]" init_simtime_ym_str = "[0.0, 0.0, 0.0]" u = concore.initval(init_simtime_u_str) -ym = concore2.initval(init_simtime_ym_str) +ym = concore.initval(init_simtime_ym_str) # --- ADDED: Initialize a list to store latency values --- zeromq_latencies = [] -print(f"Initial u: {u}, ym: {ym}, concore.simtime: {concore.simtime}, concore2.simtime: {concore2.simtime}") +print(f"Initial u: {u}, ym: {ym}, concore.simtime: {concore.simtime}, concore.simtime: {concore.simtime}") print(f"Max time: {concore.maxtime}") -while concore2.simtime < concore.maxtime: +while concore.simtime < concore.maxtime: while concore.unchanged(): u = concore.read(concore.iport['U'], "u", init_simtime_u_str) @@ -53,18 +52,18 @@ if isinstance(received_ym_data, list) and len(received_ym_data) > 0: response_time = received_ym_data[0] if isinstance(response_time, (int, float)): - concore2.simtime = response_time + concore.simtime = response_time ym = received_ym_data[1:] else: print(f"Warning: Received ZMQ data's first element is not time: {received_ym_data}. Using as is.") ym = received_ym_data else: print(f"Warning: Received unexpected ZMQ data format: {received_ym_data}. Using default ym.") - ym = concore2.initval(init_simtime_ym_str) + ym = concore.initval(init_simtime_ym_str) - concore2.write(concore.oport['Y'], "ym", ym) + concore.write(concore.oport['Y'], "ym", ym) - print(f"funcall ZMQ u={u} ym={ym} time={concore2.simtime} | ZMQ Latency: {latency_ms:.4f} ms") + print(f"funcall ZMQ u={u} ym={ym} time={concore.simtime} | ZMQ Latency: {latency_ms:.4f} ms") print("funcall retry=" + str(concore.retrycount)) diff --git a/measurements/comm_node_test.py b/measurements/comm_node_test.py index dac015ed..d0db63e3 100644 --- a/measurements/comm_node_test.py +++ b/measurements/comm_node_test.py @@ -1,14 +1,13 @@ import concore -import concore2 import time import sys # --- Script Configuration --- 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) # This will be ignored by the new logic init_simtime_u = "[0.0, 0.0, 0.0]" init_simtime_ym = "[0.0, 0.0, 0.0]" @@ -19,7 +18,7 @@ # --- Main Script Logic --- u = concore.initval(init_simtime_u) -ym = concore2.initval(init_simtime_ym) +ym = concore.initval(init_simtime_ym) curr = 0 max_value = 100 iteration = 0 @@ -39,16 +38,16 @@ # Break if the loop condition is met after the first read if curr >= max_value: # Forward a final message to ensure the next node also terminates - concore2.write(concore.oport['Y'], "ym", [curr]) + concore.write(concore.oport['Y'], "ym", [curr]) break # 3. Wait for a message from the 'Y1' channel - 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) # 4. Forward it to the 'Y' channel - concore2.write(concore.oport['Y'], "ym", ym) + concore.write(concore.oport['Y'], "ym", ym) curr = ym[0] print(f"comm_node: u={u[0]:.2f} | ym={ym[0]:.2f}") diff --git a/nintan/powermetermax.py b/nintan/powermetermax.py index 5d6828ef..40ae9a83 100644 --- a/nintan/powermetermax.py +++ b/nintan/powermetermax.py @@ -1,14 +1,13 @@ #CW import concore -import concore2 import time print("powermeter") 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 #Nsim = 100 concore.default_maxtime(100) init_simtime_u = "[0.0, 0.0, 0.0]" @@ -19,9 +18,9 @@ while(concore.simtime Date: Sat, 14 Feb 2026 11:31:19 +0530 Subject: [PATCH 05/26] Update testsou/powermetermax.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- testsou/powermetermax.py | 1 - 1 file changed, 1 deletion(-) diff --git a/testsou/powermetermax.py b/testsou/powermetermax.py index 40ae9a83..479d40b3 100644 --- a/testsou/powermetermax.py +++ b/testsou/powermetermax.py @@ -3,7 +3,6 @@ import time print("powermeter") -concore.delay = 0.07 concore.delay = 0.07 concore.inpath = concore.inpath concore.outpath = concore.outpath From 0563c1cc44f428a7f525d82e37f3143f009c76ab Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:31:28 +0530 Subject: [PATCH 06/26] Update testsou/funcall.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- testsou/funcall.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/testsou/funcall.py b/testsou/funcall.py index cb0c16e4..f6cb98bf 100644 --- a/testsou/funcall.py +++ b/testsou/funcall.py @@ -3,8 +3,6 @@ concore.delay = 0.07 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]" From ab214a052a2f571bf07d39f465d3186325e03522 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:31:43 +0530 Subject: [PATCH 07/26] Update ratc/learn3.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- ratc/learn3.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ratc/learn3.py b/ratc/learn3.py index 64336fde..a9625d50 100644 --- a/ratc/learn3.py +++ b/ratc/learn3.py @@ -5,8 +5,6 @@ GENERATE_PLOT = 0 concore.delay = 0.002 concore.delay = 0.002 -concore.inpath = concore.inpath -concore.outpath = concore.outpath concore.simtime = 0 fout=open(concore.outpath+'1/history.txt','w') From d34f485495bc2d36fca75c6d191a04f2c8a5a01b Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:31:53 +0530 Subject: [PATCH 08/26] Update 0mq/funbody.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funbody.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/0mq/funbody.py b/0mq/funbody.py index a3146706..3ad6c051 100644 --- a/0mq/funbody.py +++ b/0mq/funbody.py @@ -26,8 +26,6 @@ paired_transmitter.start_background_sync() 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]" From b1d1d231ad61207d0b153d1e35869ad293077784 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:32:02 +0530 Subject: [PATCH 09/26] Update testsou/powermetermax.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- testsou/powermetermax.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/testsou/powermetermax.py b/testsou/powermetermax.py index 479d40b3..5294ceb8 100644 --- a/testsou/powermetermax.py +++ b/testsou/powermetermax.py @@ -4,8 +4,6 @@ print("powermeter") concore.delay = 0.07 -concore.inpath = concore.inpath -concore.outpath = concore.outpath concore.simtime = 0 #Nsim = 100 concore.default_maxtime(100) From 6c0fce9bbfc60d74caa4d0a93f31610c9a984b5b Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:32:10 +0530 Subject: [PATCH 10/26] Update ratc/learn3.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- ratc/learn3.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ratc/learn3.py b/ratc/learn3.py index a9625d50..bbbc5476 100644 --- a/ratc/learn3.py +++ b/ratc/learn3.py @@ -4,7 +4,6 @@ import time GENERATE_PLOT = 0 concore.delay = 0.002 -concore.delay = 0.002 concore.simtime = 0 fout=open(concore.outpath+'1/history.txt','w') From fa1aa2623b4da83d38e9cda41bc1f59b78575a49 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:32:19 +0530 Subject: [PATCH 11/26] Update 0mq/funcall2.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funcall2.py | 1 - 1 file changed, 1 deletion(-) diff --git a/0mq/funcall2.py b/0mq/funcall2.py index 84dffe6b..ffc72421 100644 --- a/0mq/funcall2.py +++ b/0mq/funcall2.py @@ -2,7 +2,6 @@ from osparc_control import PairedTransmitter print("funcall 0mq") -concore.delay = 0.07 concore.delay = 0.07 concore.inpath = concore.inpath concore.outpath = concore.outpath From 36a0c9e9aa2b298b51c20fa3e358bdd7df8b80ec Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:32:26 +0530 Subject: [PATCH 12/26] Update 0mq/funcall_distributed.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funcall_distributed.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/0mq/funcall_distributed.py b/0mq/funcall_distributed.py index 5aa5c47a..0bf6ce79 100644 --- a/0mq/funcall_distributed.py +++ b/0mq/funcall_distributed.py @@ -15,8 +15,6 @@ # Standard concore initializations concore.delay = 0.07 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]" From efee0e8aa1e289af7cec0bc14fd8805217850e58 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:33:04 +0530 Subject: [PATCH 13/26] Update 0mq/funcall_zmq2.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funcall_zmq2.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/0mq/funcall_zmq2.py b/0mq/funcall_zmq2.py index 4864f57e..168fc929 100644 --- a/0mq/funcall_zmq2.py +++ b/0mq/funcall_zmq2.py @@ -14,8 +14,6 @@ # Standard concore initializations 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]" From 33820fddbf3109f82d971124e2503aacb317a74b Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:33:28 +0530 Subject: [PATCH 14/26] Update measurements/comm_node_test.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- measurements/comm_node_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/measurements/comm_node_test.py b/measurements/comm_node_test.py index d0db63e3..b9cfcde4 100644 --- a/measurements/comm_node_test.py +++ b/measurements/comm_node_test.py @@ -4,7 +4,6 @@ # --- Script Configuration --- concore.delay = 0.07 -concore.delay = 0.07 concore.inpath = concore.inpath concore.outpath = concore.outpath concore.simtime = 0 From 6847bc15c7f53292ce0aabd7a9b3f9f8901dd075 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:33:42 +0530 Subject: [PATCH 15/26] Update 0mq/funbody_zmq.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funbody_zmq.py | 1 - 1 file changed, 1 deletion(-) diff --git a/0mq/funbody_zmq.py b/0mq/funbody_zmq.py index 5d980956..254088f9 100644 --- a/0mq/funbody_zmq.py +++ b/0mq/funbody_zmq.py @@ -16,7 +16,6 @@ concore.delay = 0.07 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]" From d682891232c30806f02d809b639550e2214277d3 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:33:56 +0530 Subject: [PATCH 16/26] Update 0mq/funbody_zmq.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funbody_zmq.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/0mq/funbody_zmq.py b/0mq/funbody_zmq.py index 254088f9..14e5f8ef 100644 --- a/0mq/funbody_zmq.py +++ b/0mq/funbody_zmq.py @@ -47,7 +47,9 @@ if 'U2' in concore.oport: concore.write(concore.oport['U2'], "u", u_data_values) - old_concore_simtime = concore.simtime + # Take a numeric snapshot of the current simulation time to avoid + # inadvertently sharing a reference with concore.simtime. + old_concore_simtime = float(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 = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str) From ab956e04f49f73475bd479efe18101e310335ab1 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:34:12 +0530 Subject: [PATCH 17/26] Update 0mq/funbody_distributed.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funbody_distributed.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/0mq/funbody_distributed.py b/0mq/funbody_distributed.py index b7e56849..e7e95e6d 100644 --- a/0mq/funbody_distributed.py +++ b/0mq/funbody_distributed.py @@ -16,8 +16,6 @@ # Standard concore initializations concore.delay = 0.07 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]" From b6f87cd6809f39dacfae3adf15981d0f9bc7902c Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:34:28 +0530 Subject: [PATCH 18/26] Update 0mq/funbody2.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funbody2.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/0mq/funbody2.py b/0mq/funbody2.py index 71d5f97d..b249428e 100644 --- a/0mq/funbody2.py +++ b/0mq/funbody2.py @@ -27,8 +27,6 @@ concore.delay = 0.07 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]" From 3e6c9585114181306e7ec46879056c6bf14e7620 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:34:44 +0530 Subject: [PATCH 19/26] Update testsou/funcall.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- testsou/funcall.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsou/funcall.py b/testsou/funcall.py index f6cb98bf..d53e7b9c 100644 --- a/testsou/funcall.py +++ b/testsou/funcall.py @@ -16,7 +16,7 @@ concore.write(concore.oport['U1'],"u",u) print(u) old2 = concore.simtime - while concore.unchanged() or concore.simtime <= old2: + while concore.unchanged() and 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)) From aaebd5df1796afc71deddfcfaa1756fc35e05eab Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:35:04 +0530 Subject: [PATCH 20/26] Update 0mq/funcall2.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funcall2.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/0mq/funcall2.py b/0mq/funcall2.py index ffc72421..78ca032e 100644 --- a/0mq/funcall2.py +++ b/0mq/funcall2.py @@ -3,8 +3,6 @@ print("funcall 0mq") 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]" From 9b886d0750b5711ac81088a5f1b957af5075a0a3 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:35:29 +0530 Subject: [PATCH 21/26] Update measurements/Latency/funcall_distributed.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- measurements/Latency/funcall_distributed.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/measurements/Latency/funcall_distributed.py b/measurements/Latency/funcall_distributed.py index 30e8df90..4332c9e3 100644 --- a/measurements/Latency/funcall_distributed.py +++ b/measurements/Latency/funcall_distributed.py @@ -16,8 +16,6 @@ # Standard concore initializations concore.delay = 0.07 concore.delay = 0.07 -concore.inpath = concore.inpath -concore.outpath = concore.outpath concore.simtime = 0 concore.default_maxtime(100) # Recommend increasing this for more data points, e.g., 1000 init_simtime_u_str = "[0.0, 0.0, 0.0]" From bda776f7eef9fe7adf73734249f14c076d54d887 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:36:02 +0530 Subject: [PATCH 22/26] Update 0mq/funbody_zmq2.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funbody_zmq2.py | 1 - 1 file changed, 1 deletion(-) diff --git a/0mq/funbody_zmq2.py b/0mq/funbody_zmq2.py index 76583063..96af0100 100644 --- a/0mq/funbody_zmq2.py +++ b/0mq/funbody_zmq2.py @@ -14,7 +14,6 @@ # Standard concore initializations concore.delay = 0.07 -concore.delay = 0.07 concore.inpath = concore.inpath concore.outpath = concore.outpath concore.simtime = 0 From e980a8165831941ed2587ab70c31f853e17cd472 Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:36:24 +0530 Subject: [PATCH 23/26] Update 0mq/funbody2.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/funbody2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0mq/funbody2.py b/0mq/funbody2.py index b249428e..ca4f3bbd 100644 --- a/0mq/funbody2.py +++ b/0mq/funbody2.py @@ -50,8 +50,8 @@ u = u[1:] concore.write(concore.oport['U2'],"u",u) print(u) - old2 = concore.simtime - while concore.unchanged() or concore.simtime <= old2: + old2 = float(concore.simtime) + while 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}") From 4f1382fb38c1078e3eb12cd9a83b6f895e6e604e Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:36:52 +0530 Subject: [PATCH 24/26] Update 0mq/comm_node.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 0mq/comm_node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0mq/comm_node.py b/0mq/comm_node.py index f78c88cf..13d29748 100644 --- a/0mq/comm_node.py +++ b/0mq/comm_node.py @@ -14,7 +14,7 @@ u = concore.read(concore.iport['U'],"u",init_simtime_u) concore.write(concore.oport['U1'],"u",u) print(u) - old2 = concore.simtime + old2 = float(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) From f8869e9d80493fff84c5664ae57408bf691a2a3c Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 11:37:16 +0530 Subject: [PATCH 25/26] Update testsou/funbody.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- testsou/funbody.py | 1 - 1 file changed, 1 deletion(-) diff --git a/testsou/funbody.py b/testsou/funbody.py index 1032e478..900a064d 100644 --- a/testsou/funbody.py +++ b/testsou/funbody.py @@ -1,7 +1,6 @@ import concore print("funbody") -concore.delay = 0.07 concore.delay = 0.07 concore.inpath = concore.inpath concore.outpath = concore.outpath From 58915e36f0fc17299ba0053d845ed79bcc4b270b Mon Sep 17 00:00:00 2001 From: Ganesh Patil <7030871503ganeshpatil@gmail.com> Date: Sat, 14 Feb 2026 12:03:31 +0530 Subject: [PATCH 26/26] refactor: address remaining Copilot review suggestions - Remove duplicate concore.delay assignments (12 files) - Remove self-assignment no-ops: concore.inpath/outpath = concore.inpath/outpath (9 files) - Use float(concore.simtime) snapshot for old2/old_concore_simtime variables (7 files) --- 0mq/comm_node.py | 1 - 0mq/funbody.py | 2 +- 0mq/funbody2.py | 1 - 0mq/funbody_distributed.py | 3 +-- 0mq/funbody_zmq.py | 2 -- 0mq/funbody_zmq2.py | 4 +--- 0mq/funcall.py | 3 --- 0mq/funcall_distributed.py | 1 - 0mq/funcall_zmq.py | 3 --- measurements/Latency/funbody_distributed.py | 5 +---- measurements/Latency/funcall_distributed.py | 1 - measurements/comm_node_test.py | 4 +--- nintan/powermetermax.py | 3 --- testsou/funbody.py | 4 +--- testsou/funcall.py | 3 +-- testsou/mix.py | 3 --- 16 files changed, 7 insertions(+), 36 deletions(-) diff --git a/0mq/comm_node.py b/0mq/comm_node.py index 13d29748..2602cec7 100644 --- a/0mq/comm_node.py +++ b/0mq/comm_node.py @@ -1,6 +1,5 @@ import concore -concore.delay = 0.07 concore.delay = 0.07 concore.simtime = 0 concore.default_maxtime(100) diff --git a/0mq/funbody.py b/0mq/funbody.py index 3ad6c051..20064592 100644 --- a/0mq/funbody.py +++ b/0mq/funbody.py @@ -49,7 +49,7 @@ u = u[1:] concore.write(concore.oport['U2'],"u",u) print(u) - old2 = concore.simtime + old2 = float(concore.simtime) while concore.unchanged() or concore.simtime <= old2: ym = concore.read(concore.iport['Y2'],"ym",init_simtime_ym) ym = [concore.simtime]+ym diff --git a/0mq/funbody2.py b/0mq/funbody2.py index ca4f3bbd..491b14a1 100644 --- a/0mq/funbody2.py +++ b/0mq/funbody2.py @@ -25,7 +25,6 @@ paired_transmitter.start_background_sync() -concore.delay = 0.07 concore.delay = 0.07 concore.simtime = 0 concore.default_maxtime(100) diff --git a/0mq/funbody_distributed.py b/0mq/funbody_distributed.py index e7e95e6d..33da80b2 100644 --- a/0mq/funbody_distributed.py +++ b/0mq/funbody_distributed.py @@ -15,7 +15,6 @@ # Standard concore initializations concore.delay = 0.07 -concore.delay = 0.07 concore.simtime = 0 concore.default_maxtime(100) init_simtime_u_str = "[0.0, 0.0, 0.0]" @@ -47,7 +46,7 @@ if 'U2' in concore.oport: concore.write(concore.oport['U2'], "u", u_data_values) - old_concore_simtime = concore.simtime + old_concore_simtime = float(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 = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str) diff --git a/0mq/funbody_zmq.py b/0mq/funbody_zmq.py index 14e5f8ef..103e4e66 100644 --- a/0mq/funbody_zmq.py +++ b/0mq/funbody_zmq.py @@ -14,8 +14,6 @@ # Standard concore initializations concore.delay = 0.07 -concore.delay = 0.07 -concore.inpath = concore.inpath concore.simtime = 0 concore.default_maxtime(100) init_simtime_u_str = "[0.0, 0.0, 0.0]" diff --git a/0mq/funbody_zmq2.py b/0mq/funbody_zmq2.py index 96af0100..956af549 100644 --- a/0mq/funbody_zmq2.py +++ b/0mq/funbody_zmq2.py @@ -14,8 +14,6 @@ # Standard concore initializations 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]" @@ -47,7 +45,7 @@ if 'U2' in concore.oport: concore.write(concore.oport['U2'], "u", u_data_values) - old_concore_simtime = concore.simtime + old_concore_simtime = float(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 = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str) diff --git a/0mq/funcall.py b/0mq/funcall.py index 85203ba1..c5c63093 100644 --- a/0mq/funcall.py +++ b/0mq/funcall.py @@ -3,9 +3,6 @@ print("funcall 0mq") concore.delay = 0.07 -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]" diff --git a/0mq/funcall_distributed.py b/0mq/funcall_distributed.py index 0bf6ce79..1092e263 100644 --- a/0mq/funcall_distributed.py +++ b/0mq/funcall_distributed.py @@ -14,7 +14,6 @@ # Standard concore initializations concore.delay = 0.07 -concore.delay = 0.07 concore.simtime = 0 concore.default_maxtime(100) init_simtime_u_str = "[0.0, 0.0, 0.0]" diff --git a/0mq/funcall_zmq.py b/0mq/funcall_zmq.py index 5b484b1b..ca12a784 100644 --- a/0mq/funcall_zmq.py +++ b/0mq/funcall_zmq.py @@ -14,9 +14,6 @@ # Standard concore initializations concore.delay = 0.07 -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]" diff --git a/measurements/Latency/funbody_distributed.py b/measurements/Latency/funbody_distributed.py index b7e56849..33da80b2 100644 --- a/measurements/Latency/funbody_distributed.py +++ b/measurements/Latency/funbody_distributed.py @@ -15,9 +15,6 @@ # Standard concore initializations concore.delay = 0.07 -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]" @@ -49,7 +46,7 @@ if 'U2' in concore.oport: concore.write(concore.oport['U2'], "u", u_data_values) - old_concore_simtime = concore.simtime + old_concore_simtime = float(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 = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str) diff --git a/measurements/Latency/funcall_distributed.py b/measurements/Latency/funcall_distributed.py index 4332c9e3..8e8e7590 100644 --- a/measurements/Latency/funcall_distributed.py +++ b/measurements/Latency/funcall_distributed.py @@ -15,7 +15,6 @@ # Standard concore initializations concore.delay = 0.07 -concore.delay = 0.07 concore.simtime = 0 concore.default_maxtime(100) # Recommend increasing this for more data points, e.g., 1000 init_simtime_u_str = "[0.0, 0.0, 0.0]" diff --git a/measurements/comm_node_test.py b/measurements/comm_node_test.py index b9cfcde4..465344d0 100644 --- a/measurements/comm_node_test.py +++ b/measurements/comm_node_test.py @@ -4,8 +4,6 @@ # --- Script Configuration --- concore.delay = 0.07 -concore.inpath = concore.inpath -concore.outpath = concore.outpath concore.simtime = 0 concore.default_maxtime(100) # This will be ignored by the new logic init_simtime_u = "[0.0, 0.0, 0.0]" @@ -41,7 +39,7 @@ break # 3. Wait for a message from the 'Y1' channel - old2 = concore.simtime + old2 = float(concore.simtime) while concore.unchanged() or concore.simtime <= old2: ym = concore.read(concore.iport['Y1'], "ym", init_simtime_ym) diff --git a/nintan/powermetermax.py b/nintan/powermetermax.py index 40ae9a83..5294ceb8 100644 --- a/nintan/powermetermax.py +++ b/nintan/powermetermax.py @@ -4,9 +4,6 @@ print("powermeter") concore.delay = 0.07 -concore.delay = 0.07 -concore.inpath = concore.inpath -concore.outpath = concore.outpath concore.simtime = 0 #Nsim = 100 concore.default_maxtime(100) diff --git a/testsou/funbody.py b/testsou/funbody.py index 900a064d..214604dc 100644 --- a/testsou/funbody.py +++ b/testsou/funbody.py @@ -2,8 +2,6 @@ print("funbody") 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]" @@ -16,7 +14,7 @@ u = concore.read(concore.iport['U1'],"u",init_simtime_u) concore.write(concore.oport['U2'],"u",u) print(u) - old2 = concore.simtime + old2 = float(concore.simtime) while concore.unchanged() or concore.simtime <= old2: ym = concore.read(concore.iport['Y2'],"ym",init_simtime_ym) concore.write(concore.oport['Y1'],"ym",ym) diff --git a/testsou/funcall.py b/testsou/funcall.py index d53e7b9c..d97619e9 100644 --- a/testsou/funcall.py +++ b/testsou/funcall.py @@ -1,7 +1,6 @@ import concore print("funcall") -concore.delay = 0.07 concore.delay = 0.07 concore.simtime = 0 concore.default_maxtime(100) @@ -15,7 +14,7 @@ u = concore.read(concore.iport['U'],"u",init_simtime_u) concore.write(concore.oport['U1'],"u",u) print(u) - old2 = concore.simtime + old2 = float(concore.simtime) while concore.unchanged() and concore.simtime <= old2: ym = concore.read(concore.iport['Y1'],"ym",init_simtime_ym) concore.write(concore.oport['Y'],"ym",ym) diff --git a/testsou/mix.py b/testsou/mix.py index bbbb4385..eb248eec 100644 --- a/testsou/mix.py +++ b/testsou/mix.py @@ -3,9 +3,6 @@ import time concore.delay = 0.005 -concore.delay = 0.005 -concore.inpath = concore.inpath -concore.outpath = concore.outpath concore.simtime = 0 concore.default_maxtime(150) init_simtime_u = "[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]"