Menu
▾
▴
[python-control-developers] [python-control/python-control] f167b2: Update bdalg.py
|
From: Richard M. <mu...@cd...> - 2018-01-13 06:21:52
|
Branch: refs/heads/master Home: https://github.com/python-control/python-control Commit: f167b2e0819c3f24d9d22cc36956df67dd8ac3cc https://github.com/python-control/python-control/commit/f167b2e0819c3f24d9d22cc36956df67dd8ac3cc Author: LP <li...@fo...> Date: 2017-03-07 (Tue, 07 Mar 2017) Changed paths: M control/bdalg.py Log Message: ----------- Update bdalg.py Extend the series and parallel to support more parameters Commit: 558c1b9f1a4af44cbd5745106716ff75931e6353 https://github.com/python-control/python-control/commit/558c1b9f1a4af44cbd5745106716ff75931e6353 Author: Richard Murray <mu...@cd...> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M .travis.yml M conda-recipe/meta.yaml M make_version.py Log Message: ----------- Merge branch 'master' of https://github.com/python-control/python-control Commit: 54d41aa5e9855f720eeb899537456da9695ffa04 https://github.com/python-control/python-control/commit/54d41aa5e9855f720eeb899537456da9695ffa04 Author: Richard Murray <mu...@cd...> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M .gitignore M control/bdalg.py M control/ctrlutil.py M control/frdata.py M control/freqplot.py M control/lti.py M control/margins.py M control/matlab/wrappers.py M control/robust.py M control/statefbk.py M control/statesp.py A control/statesp.py+ A control/tests/input_element_int_test.py A control/tests/xferfcn_input_test.py M control/tests/xferfcn_test.py M control/xferfcn.py M doc/control.rst M doc/conventions.rst Log Message: ----------- Merge branch 'master' of https://github.com/python-control/python-control Commit: 94058864892b345aae304db6bba2658a9e1c00da https://github.com/python-control/python-control/commit/94058864892b345aae304db6bba2658a9e1c00da Author: Richard Murray <mu...@cd...> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M control/lti.py M control/tests/lti_test.py Log Message: ----------- Merge branch 'master' of https://github.com/python-control/python-control Commit: 2bb70cf9b3f80743a91c3ea04f57a89da2b292e5 https://github.com/python-control/python-control/commit/2bb70cf9b3f80743a91c3ea04f57a89da2b292e5 Author: Richard Murray <mu...@cd...> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M control/bdalg.py Log Message: ----------- Merge branch 'patch-1' of https://github.com/Marxlp/python-control into Marxlp-patch-1 Commit: 6bb6d5c2e072b272966f4b9d5c9b4b48e5b4b282 https://github.com/python-control/python-control/commit/6bb6d5c2e072b272966f4b9d5c9b4b48e5b4b282 Author: Richard Murray <mu...@cd...> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M control/bdalg.py Log Message: ----------- DOC: slight tweaks to documentation, for consistency Commit: 3c0fa80f3c21e239922fa0b721ed7ae53f2d2feb https://github.com/python-control/python-control/commit/3c0fa80f3c21e239922fa0b721ed7ae53f2d2feb Author: Richard Murray <mu...@cd...> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M control/bdalg.py Log Message: ----------- TRV: updated to 4-space indentation units Commit: 44dd3e634cb85876c96a9a89ab9f6905dd48a9b0 https://github.com/python-control/python-control/commit/44dd3e634cb85876c96a9a89ab9f6905dd48a9b0 Author: Richard Murray <mu...@cd...> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M control/tests/bdalg_test.py Log Message: ----------- TST: added simple unit tests for series, parallel Commit: ee30983b83b1f0aba01c4ad247d959e78ea2f3a1 https://github.com/python-control/python-control/commit/ee30983b83b1f0aba01c4ad247d959e78ea2f3a1 Author: Richard Murray <mu...@cd...> Date: 2018-01-04 (Thu, 04 Jan 2018) Changed paths: M control/rlocus.py M control/statefbk.py M control/tests/matlab_test.py M control/tests/statefbk_test.py Log Message: ----------- Merge branch 'master' of https://github.com/python-control/python-control Commit: 0eb5f1f2dd2a1cbf60d9d9cc2fd4c2b7323600bf https://github.com/python-control/python-control/commit/0eb5f1f2dd2a1cbf60d9d9cc2fd4c2b7323600bf Author: Marxlp <li...@fo...> Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M control/bdalg.py Log Message: ----------- more parameters for series and parallel Commit: 2a6143f38c4e975f91d012503c67a4faef01d20e https://github.com/python-control/python-control/commit/2a6143f38c4e975f91d012503c67a4faef01d20e Author: Richard Murray <mu...@cd...> Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M doc/conventions.rst Log Message: ----------- Merge branch 'master' of https://github.com/python-control/python-control Commit: 52c5058738b5308833828af11f851f63fe8e881a https://github.com/python-control/python-control/commit/52c5058738b5308833828af11f851f63fe8e881a Author: Richard Murray <mu...@cd...> Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M control/bdalg.py Log Message: ----------- Merge branch 'more-parameters' of https://github.com/Marxlp/python-control into Marxlp-more-parameters Commit: be3bea5d7e9be0523387257a8a5f3779b281837d https://github.com/python-control/python-control/commit/be3bea5d7e9be0523387257a8a5f3779b281837d Author: Richard Murray <mu...@cd...> Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M control/bdalg.py M control/tests/bdalg_test.py Log Message: ----------- Slight modifications to Slight modifications to docstrings + unit tests Commit: ccb84a274703ed5de528d2bcb77a7ab2685d9413 https://github.com/python-control/python-control/commit/ccb84a274703ed5de528d2bcb77a7ab2685d9413 Author: Richard Murray <mu...@cd...> Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M control/bdalg.py Log Message: ----------- DOC: small docstring tweaks Commit: 7795a13cac1c5d5cecde9ca5f79a39ed835962aa https://github.com/python-control/python-control/commit/7795a13cac1c5d5cecde9ca5f79a39ed835962aa Author: Richard Murray <mu...@cd...> Date: 2018-01-12 (Fri, 12 Jan 2018) Changed paths: M control/bdalg.py M control/tests/bdalg_test.py Log Message: ----------- Merge pull request #185 from murrayrm/Marxlp-more-parameters more parameters for series and parallel (updated) Compare: https://github.com/python-control/python-control/compare/1801c9a4850b...7795a13cac1c |
