Branch: refs/heads/master
Home: https://github.com/python-control/python-control
Commit: 6d9da6eacd81887589fdfae25f3076353a013690
https://github.com/python-control/python-control/commit/6d9da6eacd81887589fdfae25f3076353a013690
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M .gitignore
M MANIFEST.in
M README.rst
M control/__init__.py
M control/bdalg.py
M control/canonical.py
M control/ctrlutil.py
M control/dtime.py
M control/frdata.py
M control/freqplot.py
M control/margins.py
M control/mateqn.py
M control/matlab.py
M control/modelsimp.py
M control/nichols.py
M control/phaseplot.py
M control/pzmap.py
M control/rlocus.py
M control/robust.py
M control/statefbk.py
M control/statesp.py
M control/tests/convert_test.py
M control/tests/discrete_test.py
M control/tests/frd_test.py
M control/tests/mateqn_test.py
M control/tests/matlab_test.py
M control/tests/minreal_test.py
M control/tests/slycot_convert_test.py
M control/tests/statefbk_test.py
M control/tests/statesp_test.py
M control/tests/test_control_matlab.py
M control/tests/timeresp_test.py
M control/tests/xferfcn_test.py
M control/timeresp.py
M control/xferfcn.py
Log Message:
-----------
White space fixes/ relative imports/ fix tests.
These are all the changes necessary to bring the jgoppert github and
python-control github branch in sync. The changes have all been
hand merged. The changes are primarily pep8 white space and other
formatting fixes. There were also some tests fixed.
Commit: 1f1aad4a16f7a9e4fdd59c7f89c44ace81e0f06c
https://github.com/python-control/python-control/commit/1f1aad4a16f7a9e4fdd59c7f89c44ace81e0f06c
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M setup.py
Log Message:
-----------
Modify setup.py to match numpy.
Commit: 6d51696fb01b36ff1aada4c11de59ce0a1527e69
https://github.com/python-control/python-control/commit/6d51696fb01b36ff1aada4c11de59ce0a1527e69
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M runtests.py
Log Message:
-----------
Modify runtests.py to match numpy.
Commit: 71cfb32ae7cdba1775aee6f7db3b36c255cbc618
https://github.com/python-control/python-control/commit/71cfb32ae7cdba1775aee6f7db3b36c255cbc618
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M control/statesp.py
M control/xferfcn.py
Log Message:
-----------
Define __repr__ as __str__ for statesp/ xferfcn.
Commit: fd19250b6bc7bc98ae922d26c5a72ab2bad94dfd
https://github.com/python-control/python-control/commit/fd19250b6bc7bc98ae922d26c5a72ab2bad94dfd
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M control/freqplot.py
M control/tests/matlab_test.py
M control/tests/test_control_matlab.py
M control/tests/xferfcn_test.py
Log Message:
-----------
Merge branch 'master' of github.com:jgoppert/python-control into dev
Conflicts:
control/freqplot.py
control/tests/test_control_matlab.py
control/tests/xferfcn_test.py
Commit: c2f36f442f06a834309411d2cfc83c393e6fe086
https://github.com/python-control/python-control/commit/c2f36f442f06a834309411d2cfc83c393e6fe086
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M control/tests/matlab_test.py
Log Message:
-----------
Fix testing typo.
Commit: f2b640acfc80990c78c92852764bb5b91a914441
https://github.com/python-control/python-control/commit/f2b640acfc80990c78c92852764bb5b91a914441
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M control/rlocus.py
Log Message:
-----------
Revert unneeded initialization.
Commit: 7d4e11fef69a2d29fec1ff9897067631f7d507c2
https://github.com/python-control/python-control/commit/7d4e11fef69a2d29fec1ff9897067631f7d507c2
Author: James Goppert <jam...@gm...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M setup.py
Log Message:
-----------
Update version number to 0.6.5
The old version number was 0.6e but we will now
be changing to all digits to be more pythonic.
Commit: 18fd52e41093296d71782c40c1f218eae21be61e
https://github.com/python-control/python-control/commit/18fd52e41093296d71782c40c1f218eae21be61e
Author: Clancy Rowley <cwr...@pr...>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M .gitignore
M MANIFEST.in
M README.rst
M control/__init__.py
M control/bdalg.py
M control/canonical.py
M control/ctrlutil.py
M control/dtime.py
M control/frdata.py
M control/freqplot.py
M control/margins.py
M control/mateqn.py
M control/matlab.py
M control/modelsimp.py
M control/nichols.py
M control/phaseplot.py
M control/pzmap.py
M control/rlocus.py
M control/robust.py
M control/statefbk.py
M control/statesp.py
M control/tests/convert_test.py
M control/tests/discrete_test.py
M control/tests/frd_test.py
M control/tests/mateqn_test.py
M control/tests/matlab_test.py
M control/tests/minreal_test.py
M control/tests/slycot_convert_test.py
M control/tests/statefbk_test.py
M control/tests/statesp_test.py
M control/tests/test_control_matlab.py
M control/tests/timeresp_test.py
M control/tests/xferfcn_test.py
M control/timeresp.py
M control/xferfcn.py
M runtests.py
M setup.py
Log Message:
-----------
Merge branch 'jgoppert-dev'
Compare: https://github.com/python-control/python-control/compare/eb6f8c4c3ddc...18fd52e41093 |
