Remove ;s from Python code
They keep getting copied around too...
Change-Id: I6562dc4d377e5e6d85e9b21cdb3d87b432c77d43
diff --git a/bot3/control_loops/python/elevator3.py b/bot3/control_loops/python/elevator3.py
index c9ded12..bb5e924 100755
--- a/bot3/control_loops/python/elevator3.py
+++ b/bot3/control_loops/python/elevator3.py
@@ -62,7 +62,7 @@
self.A, self.B = self.ContinuousToDiscrete(
self.A_continuous, self.B_continuous, self.dt)
- controlability = controls.ctrb(self.A, self.B);
+ controlability = controls.ctrb(self.A, self.B)
q_pos = 0.015
q_vel = 0.5
diff --git a/bot3/control_loops/python/polydrivetrain.py b/bot3/control_loops/python/polydrivetrain.py
index 1090c8f..8742d09 100755
--- a/bot3/control_loops/python/polydrivetrain.py
+++ b/bot3/control_loops/python/polydrivetrain.py
@@ -110,8 +110,8 @@
self.B_continuous = numpy.matrix(
[[self._drivetrain.B_continuous[1, 0], self._drivetrain.B_continuous[1, 1]],
[self._drivetrain.B_continuous[3, 0], self._drivetrain.B_continuous[3, 1]]])
- self.C = numpy.matrix(numpy.eye(2));
- self.D = numpy.matrix(numpy.zeros((2, 2)));
+ self.C = numpy.matrix(numpy.eye(2))
+ self.D = numpy.matrix(numpy.zeros((2, 2)))
self.A, self.B = self.ContinuousToDiscrete(self.A_continuous,
self.B_continuous, self.dt)
diff --git a/frc971/control_loops/python/control_loop.py b/frc971/control_loops/python/control_loop.py
index d3968a6..53e388b 100644
--- a/frc971/control_loops/python/control_loop.py
+++ b/frc971/control_loops/python/control_loop.py
@@ -8,8 +8,8 @@
self.formatt = formatt
self.value = value
self.formatToType = {}
- self.formatToType['%f'] = "double";
- self.formatToType['%d'] = "int";
+ self.formatToType['%f'] = "double"
+ self.formatToType['%d'] = "int"
def __str__ (self):
return str("\nstatic constexpr %s %s = "+ self.formatt +";\n") % \
(self.formatToType[self.formatt], self.name, self.value)
diff --git a/y2014/control_loops/python/claw.py b/y2014/control_loops/python/claw.py
index 91f48de..e6242ec 100755
--- a/y2014/control_loops/python/claw.py
+++ b/y2014/control_loops/python/claw.py
@@ -228,7 +228,7 @@
#self.K = numpy.matrix([[50.0, -100.0, 0, -10, 0],
# [50.0, 100.0, 0, 10, 0]])
- controlability = controls.ctrb(self.A, self.B);
+ controlability = controls.ctrb(self.A, self.B)
print "Rank of augmented controlability matrix.", numpy.linalg.matrix_rank(controlability)
print "K"
diff --git a/y2014/control_loops/python/polydrivetrain.py b/y2014/control_loops/python/polydrivetrain.py
index fcf4b5b..b6fecc6 100755
--- a/y2014/control_loops/python/polydrivetrain.py
+++ b/y2014/control_loops/python/polydrivetrain.py
@@ -110,8 +110,8 @@
self.B_continuous = numpy.matrix(
[[self._drivetrain.B_continuous[1, 0], self._drivetrain.B_continuous[1, 1]],
[self._drivetrain.B_continuous[3, 0], self._drivetrain.B_continuous[3, 1]]])
- self.C = numpy.matrix(numpy.eye(2));
- self.D = numpy.matrix(numpy.zeros((2, 2)));
+ self.C = numpy.matrix(numpy.eye(2))
+ self.D = numpy.matrix(numpy.zeros((2, 2)))
self.A, self.B = self.ContinuousToDiscrete(self.A_continuous,
self.B_continuous, self.dt)
diff --git a/y2014/control_loops/python/shooter.py b/y2014/control_loops/python/shooter.py
index 379bd0a..aab539f 100755
--- a/y2014/control_loops/python/shooter.py
+++ b/y2014/control_loops/python/shooter.py
@@ -208,7 +208,7 @@
U = ClipDeltaU(sprung_shooter, voltage, U)
sprung_shooter.Y = raw_sprung_shooter.Y + 0.01
sprung_shooter.UpdateObserver(U)
- voltage += U;
+ voltage += U
raw_sprung_shooter.Update(voltage)
close_loop_x.append(raw_sprung_shooter.X[0, 0] * 10)
close_loop_u.append(voltage[0, 0])
@@ -230,7 +230,7 @@
U = ClipDeltaU(shooter, voltage, U)
shooter.Y = raw_shooter.Y + 0.01
shooter.UpdateObserver(U)
- voltage += U;
+ voltage += U
raw_shooter.Update(voltage)
close_loop_x.append(raw_shooter.X[0, 0] * 10)
close_loop_u.append(voltage[0, 0])
diff --git a/y2015/control_loops/python/arm.py b/y2015/control_loops/python/arm.py
index e17990a..52c1928 100755
--- a/y2015/control_loops/python/arm.py
+++ b/y2015/control_loops/python/arm.py
@@ -85,7 +85,7 @@
self.A, self.B = self.ContinuousToDiscrete(
self.A_continuous, self.B_continuous, self.dt)
- controlability = controls.ctrb(self.A, self.B);
+ controlability = controls.ctrb(self.A, self.B)
print 'Rank of augmented controlability matrix.', numpy.linalg.matrix_rank(
controlability)
@@ -171,10 +171,10 @@
self.U_min = numpy.matrix([[-12.0], [-12.0]])
self.K_unaugmented = self.K
- self.K = numpy.matrix(numpy.zeros((2, 5)));
+ self.K = numpy.matrix(numpy.zeros((2, 5)))
self.K[0:2, 0:4] = self.K_unaugmented
- self.K[0, 4] = 1;
- self.K[1, 4] = 1;
+ self.K[0, 4] = 1
+ self.K[1, 4] = 1
print 'Kal', self.KalmanGain
self.L = self.A * self.KalmanGain
diff --git a/y2015/control_loops/python/claw.py b/y2015/control_loops/python/claw.py
index 4ca50e9..17ea700 100755
--- a/y2015/control_loops/python/claw.py
+++ b/y2015/control_loops/python/claw.py
@@ -64,7 +64,7 @@
self.A, self.B = self.ContinuousToDiscrete(
self.A_continuous, self.B_continuous, self.dt)
- controlability = controls.ctrb(self.A, self.B);
+ controlability = controls.ctrb(self.A, self.B)
print "Free speed is", self.free_speed * numpy.pi * 2.0 / 60.0 / self.G
diff --git a/y2015/control_loops/python/elevator.py b/y2015/control_loops/python/elevator.py
index fba72c8..89e16cd 100755
--- a/y2015/control_loops/python/elevator.py
+++ b/y2015/control_loops/python/elevator.py
@@ -77,7 +77,7 @@
print self.A
- controlability = controls.ctrb(self.A, self.B);
+ controlability = controls.ctrb(self.A, self.B)
print "Rank of augmented controlability matrix.", numpy.linalg.matrix_rank(
controlability)
diff --git a/y2015/control_loops/python/polydrivetrain.py b/y2015/control_loops/python/polydrivetrain.py
index a62c8c8..62e7154 100755
--- a/y2015/control_loops/python/polydrivetrain.py
+++ b/y2015/control_loops/python/polydrivetrain.py
@@ -110,8 +110,8 @@
self.B_continuous = numpy.matrix(
[[self._drivetrain.B_continuous[1, 0], self._drivetrain.B_continuous[1, 1]],
[self._drivetrain.B_continuous[3, 0], self._drivetrain.B_continuous[3, 1]]])
- self.C = numpy.matrix(numpy.eye(2));
- self.D = numpy.matrix(numpy.zeros((2, 2)));
+ self.C = numpy.matrix(numpy.eye(2))
+ self.D = numpy.matrix(numpy.zeros((2, 2)))
self.A, self.B = self.ContinuousToDiscrete(self.A_continuous,
self.B_continuous, self.dt)