From: Richard M. <mu...@cd...> - 2015-03-29 19:36:36
|
Branch: refs/heads/master Home: https://github.com/python-control/python-control Commit: 1a470fa687bbc4240e675d1292644ac81e11fc79 https://github.com/python-control/python-control/commit/1a470fa687bbc4240e675d1292644ac81e11fc79 Author: Clancy Rowley <cwr...@pr...> Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: A doc-requirements.txt Log Message: ----------- Add requirements file for readthedocs.org Commit: d563d98638d548399e75044d4d6b52519d7c6007 https://github.com/python-control/python-control/commit/d563d98638d548399e75044d4d6b52519d7c6007 Author: Clancy Rowley <cwr...@pr...> Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: M doc/class_strings.rst M doc/conf.py M doc/creation.rst M doc/freqplot.rst M doc/matlab_strings.rst M doc/timeresp.rst Log Message: ----------- Fix dependencies and mocks in sphinx documentation There was an error in the way the sphinx documentation was configured that prevented it from building correctly, now that absolute imports (e.g., "from control import lti") have been changed to relative imports (e.g., "from . import lti"). In particular, the directory "root/control" should not be added to sys.path. Because this directory contains an __init__.py file, it is a Python package, and packages should never be added to the path, or lots of strange things happen, particularly with relative imports. Instead, the directory "root" should be added to the path. This change was made in the conf.py file. Also, the mocks for modules were fixed so that the documentation builds even if numpy, scipy, etc are not installed. Conflicts: doc/conf.py Commit: fa2fd078af4d06ee32c5d24a98f945de8cd954aa https://github.com/python-control/python-control/commit/fa2fd078af4d06ee32c5d24a98f945de8cd954aa Author: Clancy Rowley <cwr...@pr...> Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: M src/ctrlutil.py Log Message: ----------- Simplify dependencies in ctrlutil Commit: fb5ebf6296079229705792cc508ad23d45e326aa https://github.com/python-control/python-control/commit/fb5ebf6296079229705792cc508ad23d45e326aa Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: A .gitignore A .travis.yml M ChangeLog M MANIFEST.in R README A README.rst A control/__init__.py A control/bdalg.py A control/bench/time_freqresp.py A control/canonical.py A control/config.py A control/ctrlutil.py A control/delay.py A control/dtime.py A control/exception.py A control/frdata.py A control/freqplot.py A control/lti.py A control/margins.py A control/mateqn.py A control/matlab.py A control/modelsimp.py A control/nichols.py A control/phaseplot.py A control/pzmap.py A control/rlocus.py A control/robust.py A control/setup.py A control/statefbk.py A control/statesp.py A control/tests/__init__.py A control/tests/bdalg_test.py A control/tests/convert_test.py A control/tests/discrete_test.py A control/tests/frd_test.py A control/tests/freqresp.py A control/tests/margin_test.py A control/tests/mateqn_test.py A control/tests/matlab_test.py A control/tests/minreal_test.py A control/tests/modelsimp_test.py A control/tests/nichols_test.py A control/tests/phaseplot_test.py A control/tests/rlocus_test.py A control/tests/run_all.py A control/tests/slycot_convert_test.py A control/tests/statefbk_test.py A control/tests/statesp_test.py A control/tests/test_control_matlab.py A control/tests/timeresp_test.py A control/tests/xferfcn_test.py A control/timeresp.py A control/xferfcn.py M doc/conf.py M external/yottalab.py A runtests.py M setup.py R src/__init__.py R src/bdalg.py R src/canonical.py R src/config.py R src/ctrlutil.py R src/delay.py R src/dtime.py R src/exception.py R src/frdata.py R src/freqplot.py R src/lti.py R src/margins.py R src/mateqn.py R src/matlab.py R src/modelsimp.py R src/nichols.py R src/phaseplot.py R src/pzmap.py R src/rlocus.py R src/robust.py R src/statefbk.py R src/statesp.py R src/timeresp.py R src/xferfcn.py R tests/bdalg_test.py R tests/convert_test.py R tests/discrete_test.py R tests/frd_test.py R tests/freqresp.py R tests/margin_test.py R tests/mateqn_test.py R tests/matlab_test.py R tests/minreal_test.py R tests/modelsimp_test.py R tests/nichols_test.py R tests/phaseplot_test.py R tests/rlocus_test.py R tests/slycot_convert_test.py R tests/statefbk_test.py R tests/statesp_test.py R tests/test_all.py R tests/test_control_matlab.py R tests/timeresp_test.py R tests/xferfcn_test.py Log Message: ----------- Merge branch 'master' into improve-docs Conflicts: control/ctrlutil.py Commit: 60aba3ab39cef2ac11c4bc08c2b08a9abd084205 https://github.com/python-control/python-control/commit/60aba3ab39cef2ac11c4bc08c2b08a9abd084205 Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M control/freqplot.py M control/mateqn.py M control/phaseplot.py Log Message: ----------- Change comparisons to None Comparisons like if A == None: give a FutureWarning: comparison to `None` will result in an elementwise object comparison in the future. This resuits in a bunch of warnings when running nosetests, so this commit changes these to if A is None: Commit: f39dffb0257e614efbd7f962ea9f44f6f0f15fe2 https://github.com/python-control/python-control/commit/f39dffb0257e614efbd7f962ea9f44f6f0f15fe2 Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M control/__init__.py Log Message: ----------- Include version information in package Commit: 8fcb3af1ece45c0266914a27cfb4d030d22cee02 https://github.com/python-control/python-control/commit/8fcb3af1ece45c0266914a27cfb4d030d22cee02 Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M doc/conf.py Log Message: ----------- Automatically update version number in documentation Commit: 3b2e61485bae3421851527093c967594982b98f9 https://github.com/python-control/python-control/commit/3b2e61485bae3421851527093c967594982b98f9 Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M control/phaseplot.py Log Message: ----------- Fix typo in phaseplot docs Note that if you don't escape func(x, t, *parms) as `func(x, t, *parms)`, then Sphinx interprets the * as *emphasis*. Commit: 080420346962dd6fd2dfe5b870b35b16fcbfc57d https://github.com/python-control/python-control/commit/080420346962dd6fd2dfe5b870b35b16fcbfc57d Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M control/mateqn.py Log Message: ----------- Sphinxify equations in mateqn docstrings Commit: 6fcae2dde6311a41dafdc647ba4fddbf3e9675dc https://github.com/python-control/python-control/commit/6fcae2dde6311a41dafdc647ba4fddbf3e9675dc Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M setup.py Log Message: ----------- Add numpy as a requirement Commit: de69313a7341e585e990169fb79637511d7364cd https://github.com/python-control/python-control/commit/de69313a7341e585e990169fb79637511d7364cd Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M setup.py Log Message: ----------- Fix setup.py to work with runtests.py Previously, at least on my machine (Mac with Anaconda), running runtests.py gave a build error when setup.py tried to build a local copy of the package. It turns out this was because we were importing setuptools, which caused problems, because the rest of the setup.py script (which was taken from numpy) assumes we are using the numpy version of setup(), in numpy.distutils.core This commit removes the import of setuptools and makes setup.py almost identical to that used in numpy. Commit: 23e9f737b462f167f4103b1a9cc99e6818452a0f https://github.com/python-control/python-control/commit/23e9f737b462f167f4103b1a9cc99e6818452a0f Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-02 (Tue, 02 Dec 2014) Changed paths: M setup.py Log Message: ----------- Fix setup.py test Use setuptools instead of numpy.distutils for "setup.py test" Note: this is apparently a bug in the version of setup.py included with numpy ("setup.py test" doesn't work for numpy). Commit: 731f9bbeab71d35e81c33ca8ff1a323f6ef6c98c https://github.com/python-control/python-control/commit/731f9bbeab71d35e81c33ca8ff1a323f6ef6c98c Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-02 (Tue, 02 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Change matplotlib version in travis build to address 3.2 build issue The travis build hangs when installing matplotlib for python 3.2 (but not 2.7 and 3.3). This is apparently a documented issue with matplotlib: see https://github.com/matplotlib/matplotlib/issues/3443 https://github.com/matplotlib/matplotlib/pull/3741 Commit: d091aa579ae63552bbc0b1f16c3fd37727c69c52 https://github.com/python-control/python-control/commit/d091aa579ae63552bbc0b1f16c3fd37727c69c52 Author: Clancy Rowley <cwr...@pr...> Date: 2014-12-02 (Tue, 02 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Include system site-packages in travis build for py2.7 Commit: e2b37ad29c45694e9e9efb39888d56e2f2d10db0 https://github.com/python-control/python-control/commit/e2b37ad29c45694e9e9efb39888d56e2f2d10db0 Author: Clancy Rowley <cwr...@pr...> Date: 2015-03-19 (Thu, 19 Mar 2015) Changed paths: M .travis.yml Log Message: ----------- Use miniconda for Travis build This dramatically speeds up the installation of numpy, scipy, and matplotlib in the Travis build. Note that python 3.2 is not available in Anaconda, however. Commit: add59c3946b3b6a67cbcf9ab68a052bd168a9cb6 https://github.com/python-control/python-control/commit/add59c3946b3b6a67cbcf9ab68a052bd168a9cb6 Author: Clancy Rowley <cwr...@pr...> Date: 2015-03-19 (Thu, 19 Mar 2015) Changed paths: A .coveragerc M .travis.yml Log Message: ----------- Add .coveragerc file to fine tune coverage results Commit: 32668d3bfad9990ba638dcd6d22ad9b4a86abbc3 https://github.com/python-control/python-control/commit/32668d3bfad9990ba638dcd6d22ad9b4a86abbc3 Author: Clancy Rowley <cwr...@pr...> Date: 2015-03-19 (Thu, 19 Mar 2015) Changed paths: M control/freqplot.py M control/mateqn.py Log Message: ----------- Merge branch 'master' into improve-docs Conflicts: control/mateqn.py Commit: 5ac5100c8ba8e0b2b58ac54e3ad158b5e11bb7b6 https://github.com/python-control/python-control/commit/5ac5100c8ba8e0b2b58ac54e3ad158b5e11bb7b6 Author: Clancy Rowley <cwr...@pr...> Date: 2015-03-19 (Thu, 19 Mar 2015) Changed paths: M .travis.yml Log Message: ----------- Make Travis build consistent with anaconda docs http://conda.pydata.org/docs/travis.html Commit: f90798eaf2c57f307e99dd706398d6e396506959 https://github.com/python-control/python-control/commit/f90798eaf2c57f307e99dd706398d6e396506959 Author: Clancy Rowley <cwr...@pr...> Date: 2015-03-22 (Sun, 22 Mar 2015) Changed paths: M .gitignore Log Message: ----------- Ignore generated documentation Commit: d7d278ba6072fce1ef28402b7580ffa698424f76 https://github.com/python-control/python-control/commit/d7d278ba6072fce1ef28402b7580ffa698424f76 Author: Clancy Rowley <cwr...@pr...> Date: 2015-03-22 (Sun, 22 Mar 2015) Changed paths: M control/tests/timeresp_test.py M control/timeresp.py Log Message: ----------- Speed up forced_response (lsim) Fixes #48 The old algorithm called a general-purpose ODE integrator at each timestep, and this could be extremely slow (hundreds of times slower than scipy.signal.lsim). This new algorithm evaluates the matrix exponential once, and uses it to advance the simulation at each step. Importantly, the old algorithm would work for variable timesteps, but the new version assumes a fixed timestep (as does Matlab's lsim). This is the usual case, and it is the price one pays for increased speed. Note that this algorithm is the same idea as the algorithm used in scipy.signal.lsim, but the scipy version requires inverting the `A` matrix, and thus does not work if the system has a pole at the origin. The algorithm used here works even if there is a pole at the origin. This commit also adds a test for this case (the double integrator). Commit: 4f6165a0c8412d92a5f23931a6fb322fb6ff8a4f https://github.com/python-control/python-control/commit/4f6165a0c8412d92a5f23931a6fb322fb6ff8a4f Author: Richard Murray <mu...@cd...> Date: 2015-03-29 (Sun, 29 Mar 2015) Changed paths: M .gitignore M control/tests/timeresp_test.py M control/timeresp.py Log Message: ----------- Merge pull request #51 from cwrowley/lsim Speed up forced_response/lsim Commit: 86ebb1cdd3c3c1546356deea1f1e137ec6f1f728 https://github.com/python-control/python-control/commit/86ebb1cdd3c3c1546356deea1f1e137ec6f1f728 Author: Richard Murray <mu...@cd...> Date: 2015-03-29 (Sun, 29 Mar 2015) Changed paths: A .coveragerc M .gitignore M .travis.yml M control/__init__.py M control/ctrlutil.py M control/freqplot.py M control/mateqn.py M control/phaseplot.py M control/tests/timeresp_test.py M control/timeresp.py A doc-requirements.txt M doc/class_strings.rst M doc/conf.py M doc/creation.rst M doc/freqplot.rst M doc/matlab_strings.rst M doc/timeresp.rst M setup.py Log Message: ----------- Merge pull request #41 from python-control/improve-docs Improve docs Compare: https://github.com/python-control/python-control/compare/770c4d740b27...86ebb1cdd3c3 |