fix: replace concore2 imports with concore (resolves #287) #306
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,24 @@ | ||
| import concore | ||
|
|
||
| concore.delay = 0.07 | ||
| concore.delay = 0.07 | ||
| concore.inpath = concore.inpath | ||
| concore.outpath = concore.outpath | ||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||
| 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 = 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 = concore.simtime | ||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||
| 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)) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| import concore | ||
| 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 | ||
| concore.delay = 0.07 | ||
|
GaneshPatil7517 marked this conversation as resolved.
|
||
| concore.inpath = concore.inpath | ||
| concore.outpath = concore.outpath | ||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||
| 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 = 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 = concore.simtime | ||
| while concore.unchanged() or concore.simtime <= old2: | ||
| ym = concore.read(concore.iport['Y2'],"ym",init_simtime_ym) | ||
|
There was a problem hiding this comment. Potential logic issue: This code pattern may create an infinite loop. The variable old2 now references the same concore.simtime that is checked in the loop condition, whereas the original code tracked two separate simulation times.
Contributor
Author
There was a problem hiding this comment. @copilot open a new pull request to apply changes based on this feedback |
||
| 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() | ||
| #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)) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -1,5 +1,4 @@ | ||||
| import concore | ||||
| 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 | ||||
| concore.delay = 0.07 | ||||
|
There was a problem hiding this comment. Duplicate assignment of concore.delay. Line 29 is redundant and should be removed.
Suggested change
|
||||
| concore.inpath = concore.inpath | ||||
| concore.outpath = concore.outpath | ||||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||||
| 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 = 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 = concore.simtime | ||||
| while concore.unchanged() or concore.simtime <= old2: | ||||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||||
| 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() | ||||
| #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)) | ||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,7 +1,6 @@ | ||||||
| # funbody2_zmq.py | ||||||
| import time | ||||||
| import concore | ||||||
|
|
||||||
| print("funbody using ZMQ via concore") | ||||||
|
|
||||||
|
|
@@ -16,21 +15,21 @@ | |||||
|
|
||||||
| # Standard concore initializations | ||||||
| concore.delay = 0.07 | ||||||
| concore.delay = 0.07 | ||||||
|
There was a problem hiding this comment. Duplicate assignment of concore.delay. Line 18 is redundant and should be removed.
Suggested change
|
||||||
| concore.inpath = concore.inpath | ||||||
| concore.outpath = concore.outpath | ||||||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||||||
| 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 = 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 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_concore_simtime = concore.simtime | ||||||
| while concore.unchanged() or concore.simtime <= old_concore_simtime: | ||||||
|
There was a problem hiding this comment. Potential logic issue: This code pattern may create an infinite loop. The variable old_concore_simtime now references the same concore.simtime that is checked in the loop condition, whereas the original code tracked two separate simulation times.
Suggested change
|
||||||
| # 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) | ||||||
| # time.sleep(concore.delay) # Optional delay | ||||||
|
|
||||||
| 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={concore.simtime}") | ||||||
|
|
||||||
| print("funbody retry=" + str(concore.retrycount)) | ||||||
|
|
||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -1,7 +1,6 @@ | ||||
| # funbody2_zmq.py | ||||
| import time | ||||
| import concore | ||||
|
|
||||
| print("funbody using ZMQ via concore") | ||||
|
|
||||
|
|
@@ -15,21 +14,21 @@ | |||
|
|
||||
| # Standard concore initializations | ||||
| concore.delay = 0.07 | ||||
| concore.delay = 0.07 | ||||
|
There was a problem hiding this comment. Duplicate assignment of concore.delay. Line 17 is redundant and should be removed.
Suggested change
|
||||
| concore.inpath = concore.inpath | ||||
| concore.outpath = concore.outpath | ||||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||||
| 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 = 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 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_concore_simtime = concore.simtime | ||||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||||
| 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) | ||||
| # time.sleep(concore.delay) # Optional delay | ||||
|
|
||||
| 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={concore.simtime}") | ||||
|
|
||||
| print("funbody retry=" + str(concore.retrycount)) | ||||
|
|
||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| # funbody2_zmq.py | ||
| import time | ||
| import concore | ||
|
|
||
| print("funbody using ZMQ via concore") | ||
|
|
||
|
|
@@ -15,21 +14,21 @@ | |
|
|
||
| # Standard concore initializations | ||
| concore.delay = 0.07 | ||
| concore.delay = 0.07 | ||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||
| concore.inpath = concore.inpath | ||
| concore.outpath = concore.outpath | ||
|
There was a problem hiding this comment. Self-assignment statements (lines 18-19) are redundant no-ops that should be removed. |
||
| 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 = 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 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_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 = concore.read(concore.iport['Y2'], "ym", init_simtime_ym_str) | ||
|
GaneshPatil7517 marked this conversation as resolved.
Outdated
|
||
| # time.sleep(concore.delay) # Optional delay | ||
|
|
||
| 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={concore.simtime}") | ||
|
|
||
| print("funbody retry=" + str(concore.retrycount)) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,39 +1,38 @@ | ||||||
| import concore | ||||||
| from osparc_control import PairedTransmitter | ||||||
| print("funcall 0mq") | ||||||
|
|
||||||
| concore.delay = 0.07 | ||||||
| concore.delay = 0.07 | ||||||
|
There was a problem hiding this comment. Duplicate assignment of concore.delay. Line 6 is redundant and should be removed.
Suggested change
|
||||||
| concore.inpath = concore.inpath | ||||||
| concore.outpath = concore.outpath | ||||||
|
There was a problem hiding this comment. Self-assignment statements (lines 7-8) are redundant no-ops that should be removed.
Suggested change
|
||||||
| 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 = 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(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 = 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}) | ||||||
| concore.simtime = ym[0] | ||||||
| ym = ym[1:] | ||||||
| #print(ym) | ||||||
| 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)) | ||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Duplicate assignment of concore.delay. Line 4 is redundant and should be removed.