Skip to content
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.

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

Added basic PEP 8 to .travis.yml and fixed currently reported issues. Fixes #147. #148

Merged
merged 9 commits into from Apr 15, 2015
7 changes: 7 additions & 0 deletions .travis.yml
Expand Up @@ -35,6 +35,8 @@ install:
# numpydoc extension if it is. It must be bypassing virtualenv to the system
# Python.
- pip install sphinx numpydoc
# Install PEP 8 linters (flake8 is like pep8 but also reports unused imports)
- pip install flake8
before_script:
- python -c "import setuptools; print(setuptools.__version__)"
- pip --version
Expand All @@ -43,6 +45,11 @@ script:
# Run Python and Javascript tests.
- nosetests -v --with-coverage --cover-package=pydy
- cd pydy/viz/static/js/tests && phantomjs run-jasmine.js SpecRunner.html && cd ../../../../../
# Check Python and Javascript syntax (trailing whitespaces/newlines, unused imports).
- (flake8 --select W1,W2,W3 --exclude booger . &&
flake8 --select F401 --exclude booger,__init__.py,conf.py . &&
flake8 --select W2,W3 --filename='*.js' examples/ pydy/viz/static/js/dyviz/) ||
(echo "Please run a linter and fix errors, e.g. pylint, flake8, pep8, etc."; false)
# Make sure the docs build.
- cd docs && make html && cd ..
# Make sure the library installs.
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Expand Up @@ -35,7 +35,7 @@ class Mock(MagicMock):
def __getattr__(cls, name):
return Mock()

MOCK_MODULES = ['numpy', 'numpy.linalg', 'numpy.testing',
MOCK_MODULES = ['numpy', 'numpy.linalg', 'numpy.testing',
'scipy.linalg',
'matplotlib',
'sympy', 'sympy.physics.mechanics',
Expand Down
1 change: 0 additions & 1 deletion examples/Kane1985/Chapter2/Ex2.7.py
Expand Up @@ -42,4 +42,3 @@
mprint(qd)
print("=")
mprint(soln[qd])

2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter2/Ex3.15.py
Expand Up @@ -24,7 +24,7 @@

from sympy.physics.mechanics import dynamicsymbols, MechanicsStrPrinter
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy import solve, symbols, pi
from sympy import solve, symbols


def msprint(expr):
Expand Down
5 changes: 2 additions & 3 deletions examples/Kane1985/Chapter2/Ex4.1.py
Expand Up @@ -2,9 +2,9 @@
# -*- coding: utf-8 -*-
"""Exercise 4.1 from Kane 1985"""

from sympy.physics.mechanics import dot, dynamicsymbols, MechanicsStrPrinter
from sympy.physics.mechanics import dot, MechanicsStrPrinter
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy import solve, symbols, pi, sin, cos
from sympy import symbols, sin, cos
from sympy.simplify.simplify import trigsimp


Expand Down Expand Up @@ -33,4 +33,3 @@ def msprint(expr):
# B.z directions since point O is also on line L and B.x is parallel to L.
assert(trigsimp(dot(P.pos_from(O), B.y).subs(constraint_eqs)) == 0)
assert(trigsimp(dot(P.pos_from(O), B.z).subs(constraint_eqs)) == 0)

6 changes: 3 additions & 3 deletions examples/Kane1985/Chapter3/Ex5.1.py
Expand Up @@ -3,10 +3,10 @@
"""Exercise 5.1 from Kane 1985."""

from __future__ import division
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import ReferenceFrame
from sympy.physics.mechanics import dot
from sympy import solve, sqrt, symbols, integrate
from sympy import sin, cos, tan, pi, acos
from sympy import symbols, integrate
from sympy import pi, acos
from sympy import Matrix, S, simplify
import scipy.integrate

Expand Down
3 changes: 0 additions & 3 deletions examples/Kane1985/Chapter3/Ex5.12.py
Expand Up @@ -15,6 +15,3 @@
print("Moment of inertia of B with respect to a line that is parallel to")
print("line PQ and passes through point O.")
print("{0} kg m**2".format((a * Iij * a.T).item(0)))



4 changes: 2 additions & 2 deletions examples/Kane1985/Chapter3/Ex5.4.py
Expand Up @@ -5,8 +5,8 @@
from __future__ import division
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dot
from sympy import solve, sqrt, symbols, integrate
from sympy import sin, cos, tan, pi
from sympy import symbols, integrate
from sympy import sin, cos, pi


a, b, R = symbols('a b R', real=True, nonnegative=True)
Expand Down
6 changes: 1 addition & 5 deletions examples/Kane1985/Chapter3/Ex5.8.py
Expand Up @@ -6,7 +6,7 @@
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import cross, dot
from sympy import integrate, simplify, symbols, integrate
from sympy import sin, cos, tan, pi
from sympy import sin, cos, pi


def calc_inertia_vec(rho, p, n_a, N, iv):
Expand All @@ -30,7 +30,3 @@ def calc_inertia_vec(rho, p, n_a, N, iv):
N.y, N, (l, 0, L))
print('I_1 = {0}'.format(I_1))
print('I_2 = {0}'.format(I_2))




2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter3/Ex6.10.py
Expand Up @@ -8,7 +8,7 @@
from sympy import simplify, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import inertia, inertia_of_point_mass
from sympy.physics.mechanics import cross, dot
from sympy.physics.mechanics import dot


def inertia_matrix(dyadic, rf):
Expand Down
4 changes: 2 additions & 2 deletions examples/Kane1985/Chapter3/Ex6.13.py
Expand Up @@ -7,8 +7,8 @@
from sympy import pi, acos
from sympy import simplify, sqrt, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import inertia, inertia_of_point_mass
from sympy.physics.mechanics import cross, dot
from sympy.physics.mechanics import inertia_of_point_mass
from sympy.physics.mechanics import dot
import numpy as np


Expand Down
6 changes: 3 additions & 3 deletions examples/Kane1985/Chapter3/Ex6.6.py
Expand Up @@ -5,9 +5,9 @@
from __future__ import division
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import inertia, inertia_of_point_mass
from sympy.physics.mechanics import cross, dot
from sympy import solve, sqrt, symbols, integrate
from sympy import sin, cos, tan, pi, S
from sympy.physics.mechanics import dot
from sympy import symbols
from sympy import S

m = symbols('m')
m_val = 12
Expand Down
8 changes: 4 additions & 4 deletions examples/Kane1985/Chapter3/Ex6.7.py
Expand Up @@ -5,10 +5,10 @@
from __future__ import division
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import inertia, inertia_of_point_mass
from sympy.physics.mechanics import cross, dot
from sympy import solve, sqrt, symbols, integrate, diff
from sympy import sin, cos, tan, pi, S, Matrix
from sympy import simplify, Abs
from sympy.physics.mechanics import dot
from sympy import solve, sqrt, symbols, diff
from sympy import sin, cos, pi, Matrix
from sympy import simplify

b, m, k_a = symbols('b m k_a', real=True, nonnegative=True)
theta = symbols('theta', real=True)
Expand Down
1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/Ex7.12.py
Expand Up @@ -57,4 +57,3 @@ def subdict(d, keylist):
[p1, p2, p3]))))
print("|pB'| = {0} m".format(pB_prime.pos_from(pO).subs(
subdict(soln, [p1, p2, p3])).magnitude().n()))

2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter4/Ex7.2.py
Expand Up @@ -3,7 +3,7 @@
"""Exercise 7.2 from Kane 1985."""

from __future__ import division
from sympy import acos, pi, solve, symbols
from sympy import solve, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import cross, dot

Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter4/Ex7.7.py
Expand Up @@ -3,7 +3,7 @@
"""Exercise 7.7 from Kane 1985."""

from __future__ import division
from sympy import acos, pi, symbols
from sympy import symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import cross, dot

Expand Down
1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/Ex7.8.py
Expand Up @@ -3,7 +3,6 @@
"""Exercise 7.8 from Kane 1985."""

from __future__ import division
from sympy import acos, pi, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import cross, dot

Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter4/Ex8.10.py
Expand Up @@ -46,4 +46,4 @@
Fr, _ = generalized_active_forces(partials, forces + torques)
print("Generalized active forces:")
for i, f in enumerate(Fr, 1):
print("F{0} = {1}".format(i, msprint(trigsimp(f))))
print("F{0} = {1}".format(i, msprint(trigsimp(f))))
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter4/Ex8.11.py
Expand Up @@ -57,4 +57,4 @@

print("Generalized active forces:")
for f, i in zip(Flist, [2, 4]):
print("F{0} = {1}".format(i, msprint(simplify(f))))
print("F{0} = {1}".format(i, msprint(simplify(f))))
4 changes: 2 additions & 2 deletions examples/Kane1985/Chapter4/Ex8.12_8.17.py
Expand Up @@ -6,8 +6,8 @@
from sympy import expand, solve, symbols, trigsimp
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import inertia, RigidBody
from sympy.physics.mechanics import cross, dot, dynamicsymbols
from util import msprint, subs, partial_velocities
from sympy.physics.mechanics import dot, dynamicsymbols
from util import msprint, partial_velocities
from util import generalized_active_forces, generalized_inertia_forces

print("\nEx8.12")
Expand Down
1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/Ex8.13.py
Expand Up @@ -67,4 +67,3 @@
print("Generalized active forces:")
for i, f in enumerate(Fr, 1):
print("F{0} = {1}".format(i, msprint(simplify(f))))

1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/Ex8.14.py
Expand Up @@ -82,4 +82,3 @@ def define_forces(c, exert_by, exert_on, express):
print("Generalized active forces:")
for i, f in enumerate(Fr, 1):
print("F{0} = {1}".format(i, msprint(simplify(f))))

5 changes: 2 additions & 3 deletions examples/Kane1985/Chapter4/Ex8.18.py
Expand Up @@ -13,8 +13,8 @@
omega = dynamicsymbols('omega')
N = ReferenceFrame('N')

# I = (I11 * N.x + I12 * N.y + I13 * N.z) N.x +
# (I21 * N.x + I22 * N.y + I23 * N.z) N.y +
# I = (I11 * N.x + I12 * N.y + I13 * N.z) N.x +
# (I21 * N.x + I22 * N.y + I23 * N.z) N.y +
# (I31 * N.x + I32 * N.y + I33 * N.z) N.z

# definition of T* is:
Expand All @@ -33,4 +33,3 @@
I = inertia(B, I11, I22, I33, I12, I23, I31)
T_star = -dot(ang_vel.diff(t, B), I) - dot(cross(ang_vel, I), ang_vel)
print(msprint(T_star))

1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/Ex8.1_8.15.py
Expand Up @@ -71,4 +71,3 @@
if i == 1 or i == 3:
sub_map = solve([u1 - u_s1[0]], [omega*q1*sin(omega*t)])
print("F{0}* = {1}".format(i, msprint(simplify(f.subs(sub_map)))))

5 changes: 2 additions & 3 deletions examples/Kane1985/Chapter4/Ex8.2.py
Expand Up @@ -3,12 +3,11 @@
"""Exercise 8.2 from Kane 1985."""

from __future__ import division
from sympy import diff, factor, solve, simplify, symbols
from sympy import diff, solve, simplify, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dot
from sympy.physics.mechanics import dynamicsymbols
from sympy.physics.mechanics import partial_velocity
from util import msprint, subs, partial_velocities, generalized_active_forces
from util import msprint, partial_velocities, generalized_active_forces


g, L, m1, m2, omega, t = symbols('g L m1 m2 omega t')
Expand Down
1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/Ex8.6.py
Expand Up @@ -48,4 +48,3 @@
print("Generalized active forces:")
for i, f in enumerate(Fr, 1):
print("F{0}_tilde = {1}".format(i, msprint(simplify(f))))

1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/Ex8.7.py
Expand Up @@ -54,4 +54,3 @@
print("Generalized active forces:")
for i, f in enumerate(Fr, 1):
print("F{0} = {1}".format(i, msprint(simplify(f))))

3 changes: 0 additions & 3 deletions examples/Kane1985/Chapter4/Ex8.8.py
Expand Up @@ -55,6 +55,3 @@
k_f = simplify(f - alpha * (k_q1*q1 + k_q2*q2))
print("F{0} = {1} * (({2})*q1 + ({3})*q2) + {4}".format(
i, alpha, k_q1, k_q2, k_f))



1 change: 0 additions & 1 deletion examples/Kane1985/Chapter4/util.py
Expand Up @@ -3,7 +3,6 @@
"""Convenient utility functions for exercises in Chapter 4 of Kane 1985."""

from __future__ import division
from sympy import diff
from sympy.physics.mechanics import ReferenceFrame, Point, Particle, RigidBody
from sympy.physics.mechanics import cross, dot, Vector
from sympy.physics.mechanics import MechanicsStrPrinter
Expand Down
1 change: 0 additions & 1 deletion examples/Kane1985/Chapter5/Ex10.3.py
Expand Up @@ -6,7 +6,6 @@
from sympy import collect, expand, sin, cos, pi, radsimp, solve, sqrt, symbols
from sympy.physics.mechanics import ReferenceFrame, RigidBody, Point
from sympy.physics.mechanics import dot, dynamicsymbols, inertia, msprint
from util import subs


q1, q2, q3, q4, q5, q6, q7 = q = dynamicsymbols('q1:8')
Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex10.5.py
Expand Up @@ -7,7 +7,7 @@
from __future__ import division
from sympy import expand, symbols, trigsimp, sin, cos, S
from sympy.physics.mechanics import ReferenceFrame, RigidBody, Point
from sympy.physics.mechanics import dot, dynamicsymbols, inertia, msprint
from sympy.physics.mechanics import dynamicsymbols, inertia, msprint


m, a, b = symbols('m a b')
Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex10.6.py
Expand Up @@ -3,7 +3,7 @@
"""Exercise 10.6 from Kane 1985."""

from __future__ import division
from sympy import collect, expand, expand_trig, symbols, trigsimp, sin, cos, S
from sympy import symbols
from sympy.physics.mechanics import ReferenceFrame, RigidBody, Point
from sympy.physics.mechanics import dot, dynamicsymbols, inertia, msprint

Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex9.10.py
Expand Up @@ -9,7 +9,7 @@
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import inertia
from sympy.physics.mechanics import cross, dot, dynamicsymbols
from util import msprint, subs, partial_velocities
from util import msprint, partial_velocities
from util import generalized_active_forces, potential_energy


Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex9.11.py
Expand Up @@ -7,7 +7,7 @@
from sympy import collect, expand, sin, cos, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dynamicsymbols
from util import msprint, subs, partial_velocities
from util import msprint, partial_velocities
from util import generalized_active_forces, potential_energy
from util import generalized_active_forces_V

Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex9.12.py
Expand Up @@ -9,7 +9,7 @@
from sympy import expand, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dynamicsymbols
from util import msprint, subs, partial_velocities
from util import msprint, partial_velocities
from util import generalized_active_forces, potential_energy


Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex9.14.py
Expand Up @@ -37,7 +37,7 @@
map(lambda x: 0 if x == 0 else -x.subs(kde_map), Fr_c),
u,
zero_constants=True)
from sympy import simplify, trigsimp
from sympy import trigsimp
dissipation_function = trigsimp(dissipation_function)
#print('ℱ = {0}'.format(msprint(dissipation_function)))

Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex9.3.py
Expand Up @@ -3,7 +3,7 @@
"""Exercise 9.3 from Kane 1985."""

from __future__ import division
from sympy import cos, diff, expand, pi, solve, symbols
from sympy import cos, expand, pi, solve, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dot, dynamicsymbols
from util import msprint, subs, partial_velocities
Expand Down
3 changes: 1 addition & 2 deletions examples/Kane1985/Chapter5/Ex9.5.py
Expand Up @@ -6,7 +6,7 @@
from sympy import sin, cos, pi, solve, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dynamicsymbols
from util import msprint, subs, partial_velocities, potential_energy
from util import msprint, partial_velocities, potential_energy
from util import generalized_active_forces, generalized_active_forces_V


Expand Down Expand Up @@ -58,4 +58,3 @@
Fr_V = generalized_active_forces_V(V, [q1, q2, q3], [u1, u2, u3], kde_map)
print('Frγ = {0}'.format(msprint(Fr_V)))
print('Fr = {0}'.format(msprint(Fr)))

6 changes: 3 additions & 3 deletions examples/Kane1985/Chapter5/Ex9.6.py
Expand Up @@ -3,11 +3,11 @@
"""Exercise 8.8 from Kane 1985."""

from __future__ import division
from sympy import sin, cos, pi, expand, simplify, solve, symbols
from sympy import expand, simplify, solve, symbols
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dynamicsymbols
from util import msprint, subs, partial_velocities, potential_energy
from util import generalized_active_forces, generalized_active_forces_V
from util import msprint, partial_velocities, potential_energy
from util import generalized_active_forces


q1, q2 = dynamicsymbols('q1 q2')
Expand Down
2 changes: 1 addition & 1 deletion examples/Kane1985/Chapter5/Ex9.7.py
Expand Up @@ -3,7 +3,7 @@
"""Exercise 9.7 from Kane 1985."""

from __future__ import division
from sympy import cos, pi, solve, trigsimp, symbols, S
from sympy import cos, pi, solve, symbols, S
from sympy.physics.mechanics import ReferenceFrame, Point
from sympy.physics.mechanics import dynamicsymbols
from util import msprint, partial_velocities, generalized_active_forces
Expand Down