Skip to content

fix np.float #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jdanz-psfc wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix np.float #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions GAMs/PyGAM/pid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

#Past history required for pid
global y_1, x_1, x_2, x_fact, x_1_fact, x_2_fact
y_1 = np.float(0.)
x_1 = np.float(0.)
x_2 = np.float(0.)
y_1 = float(0.)
x_1 = float(0.)
x_2 = float(0.)
#PID factors in Z, computed once for all
x_fact = 0
x_1_fact = 0
Expand All @@ -48,9 +48,9 @@ def setup():
print('Kd: '+str(Kd))
print('T: '+str(T))

x_fact = np.float(Kp + T*Ki + Kd/T)
x_1_fact = np.float(-(Kp+2.*Kd/T))
x_2_fact = np.float(Kd/T)
x_fact = float(Kp + T*Ki + Kd/T)
x_1_fact = float(-(Kp+2.*Kd/T))
x_2_fact = float(Kd/T)

def execute(x):
global y_1
Expand Down