diff --git a/concore.py b/concore.py index 2da1250..7a99b8f 100644 --- a/concore.py +++ b/concore.py @@ -7,9 +7,17 @@ import zmq import numpy as np logging.basicConfig( - level=logging.INFO, - format='%(levelname)s - %(message)s' -) # Added for ZeroMQ + level=logging.DEBUG, + format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', + force=True +) + +#these lines mute the noisy library +logging.getLogger('matplotlib').setLevel(logging.WARNING) +logging.getLogger('PIL').setLevel(logging.WARNING) +logging.getLogger('urllib3').setLevel(logging.WARNING) +logging.getLogger('requests').setLevel(logging.WARNING) + # if windows, create script to kill this process # because batch files don't provide easy way to know pid of last command diff --git a/tools/bangbang.py b/tools/bangbang.py index eed72b8..3bf9e5a 100644 --- a/tools/bangbang.py +++ b/tools/bangbang.py @@ -1,5 +1,6 @@ import numpy as np import concore +import logging def bangbang_controller(ym): @@ -19,6 +20,9 @@ def bangbang_controller(ym): init_simtime_u = "[0.0, 0.0,0.0]" init_simtime_ym = "[0.0, 70.0,91]" u = np.array([concore.initval(init_simtime_u)]).T + +logging.info("Starting Bang-Bang Controller") + while(concore.simtime 1.1*timeout_max: #timeout_count>100: - print("timeout or bad POST request "+str(r.status_code)) + logging.error(f"timeout or bad POST request {r.status_code}") quit() if len(r.text)!=0: try: t=literal_eval(r.text)[0] except: - print("bad eval "+r.text) + logging.error(f"bad eval {r.text}") oldt = t oldym = r.text - print("CW: oldym="+oldym+" t="+str(concore.simtime)) + logging.debug(f"CW: oldym={oldym} t={concore.simtime}") concore.write(1,name2,oldym) #concore.write(1,"ym",init_simtime_ym) -print("retry="+str(concore.retrycount)) - - +logging.info(f"retry={concore.retrycount}") \ No newline at end of file diff --git a/tools/learn.py b/tools/learn.py index a29e1e6..53bb50e 100644 --- a/tools/learn.py +++ b/tools/learn.py @@ -2,6 +2,7 @@ import numpy as np import matplotlib.pyplot as plt import time +import logging GENERATE_PLOT = 1 concore.delay = 0.002 @@ -21,7 +22,7 @@ ut[int(concore.simtime)] = np.array(u).T ymt[int(concore.simtime)] = np.array(ym).T oldsimtime = concore.simtime -print("retry="+str(concore.retrycount)) +logging.info(f"retry={concore.retrycount}") ################# # plot inputs and outputs diff --git a/tools/pid2.py b/tools/pid2.py index 6f88285..1c720f8 100644 --- a/tools/pid2.py +++ b/tools/pid2.py @@ -1,5 +1,7 @@ import numpy as np import concore +import logging + setpoint = 67.5 setpointF = 75.0 KpF = 0.1 @@ -51,7 +53,9 @@ def pid_controller(ym): init_simtime_u = "[0.0, 0.0,0.0]" init_simtime_ym = "[0.0, 70.0,91]" u = np.array([concore.initval(init_simtime_u)]).T -print("Shannon's PID controller: setpoint is "+str(setpoint)) + +logging.info(f"Shannon's PID controller: setpoint is {setpoint}") + while(concore.simtime 1.1*timeout_max: #timeout_count>200: - print("timeout or bad POST request "+str(r.status_code)) + logging.error(f"timeout or bad POST request {r.status_code}") quit() if len(r.text)!=0: try: t=literal_eval(r.text)[0] except: - print("bad eval "+r.text) + logging.error(f"bad eval {r.text}") oldt = t oldu = r.text - print("PW: oldu="+oldu+" t="+str(concore.simtime)) + logging.debug(f"PW: oldu={oldu} t={concore.simtime}") concore.write(1,name1,oldu) #concore.write(1,"u",init_simtime_u) -print("retry="+str(concore.retrycount)) +logging.info(f"retry={concore.retrycount}") \ No newline at end of file diff --git a/tools/shannon.py b/tools/shannon.py index ba371af..9da6f51 100644 --- a/tools/shannon.py +++ b/tools/shannon.py @@ -1,5 +1,6 @@ import numpy as np import concore +import logging setpoint = 67.5 Kp = 0.1 Ki = 0.01 @@ -27,7 +28,7 @@ def pid_controller(ym): init_simtime_u = "[0.0, 0.0,0.0]" init_simtime_ym = "[0.0, 70.0,91]" u = np.array([concore.initval(init_simtime_u)]).T -print("Shannon's PID controller: setpoint is "+str(setpoint)) +logging.info(f"Shannon's PID controller: setpoint is {setpoint}") while(concore.simtime