[python-control-developers] [python-control/python-control] 652327: Keep the "smooth" parameter when combining FRD fun...

[Richard M. <mu...@cd...>]

  Branch: refs/heads/master
  Home:   https://github.com/python-control/python-control
  Commit: 65232705d49fcfd9e8451b227b6f0fd5c3f113f0
      https://github.com/python-control/python-control/commit/65232705d49fcfd9e8451b227b6f0fd5c3f113f0
  Author: Rene van Paassen <ren...@gm...>
  Date:   2015-07-08 (Wed, 08 Jul 2015)

  Changed paths:
    M control/frdata.py

  Log Message:
  -----------
  Keep the "smooth" parameter when combining FRD functions with other systems


  Commit: ae0910469a3c6288313f12c0ec9c6949f54d70d1
      https://github.com/python-control/python-control/commit/ae0910469a3c6288313f12c0ec9c6949f54d70d1
  Author: Rene van Paassen <ren...@gm...>
  Date:   2015-07-08 (Wed, 08 Jul 2015)

  Changed paths:
    M control/margins.py
    M control/tests/margin_test.py

  Log Message:
  -----------
  Fix the margin calculation for FRD/data based margins.
TODO: verify the stability margin


  Commit: 7eefe8b7a54b2f5aae19fc02b062a7d648677550
      https://github.com/python-control/python-control/commit/7eefe8b7a54b2f5aae19fc02b062a7d648677550
  Author: Rene van Paassen <m.m...@tu...>
  Date:   2015-07-08 (Wed, 08 Jul 2015)

  Changed paths:
    M control/margins.py
    M control/tests/margin_test.py

  Log Message:
  -----------
  corrected the stability margin calculations


  Commit: f309232856af6353dfe1ef751cb63c1d20b1d940
      https://github.com/python-control/python-control/commit/f309232856af6353dfe1ef751cb63c1d20b1d940
  Author: Rene van Paassen <ren...@gm...>
  Date:   2015-07-08 (Wed, 08 Jul 2015)

  Changed paths:
    M control/margins.py

  Log Message:
  -----------
  still imperfect


  Commit: 815ca2d75f6eb41491751c908727f9703bc22e6c
      https://github.com/python-control/python-control/commit/815ca2d75f6eb41491751c908727f9703bc22e6c
  Author: Rene van Paassen <Ren...@gm...>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M control/margins.py

  Log Message:
  -----------
  further attempts at fixing


  Commit: cd30a00d3e59291f9bf90de013a61140ccc0d7ac
      https://github.com/python-control/python-control/commit/cd30a00d3e59291f9bf90de013a61140ccc0d7ac
  Author: Rene van Paassen <Ren...@gm...>
  Date:   2015-07-11 (Sat, 11 Jul 2015)

  Changed paths:
    M control/margins.py
    M control/tests/margin_test.py

  Log Message:
  -----------
  corrected margin calculations; extended test to do all-margin calculations
check margin calculation on analytic tf with calculation on numeric
(interpolation with FRD) variant. Extended test cases


  Commit: 04ed40d876ed367b5505b13dc2a6efa338a09f1b
      https://github.com/python-control/python-control/commit/04ed40d876ed367b5505b13dc2a6efa338a09f1b
  Author: Rene van Paassen <ren...@gm...>
  Date:   2015-07-11 (Sat, 11 Jul 2015)

  Changed paths:
    M control/margins.py
    M control/tests/margin_test.py
    M control/tests/matlab_test.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
solved the conflict in the margin_test routine
updated the doc for margin to match order of returned values


  Commit: ebde9e4536b3f2d0c1e494bdc3b0584f393e762e
      https://github.com/python-control/python-control/commit/ebde9e4536b3f2d0c1e494bdc3b0584f393e762e
  Author: Rene van Paassen <ren...@gm...>
  Date:   2015-07-11 (Sat, 11 Jul 2015)

  Changed paths:
    M control/margins.py

  Log Message:
  -----------
  need small fix to doc in stability_margins; needed 1e-8 as cutoff for
0-frequency


  Commit: c14b880b66a44f61b63f4f4f51bb54225cfd7d18
      https://github.com/python-control/python-control/commit/c14b880b66a44f61b63f4f4f51bb54225cfd7d18
  Author: Richard Murray <mu...@cd...>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M control/frdata.py
    M control/margins.py
    M control/tests/margin_test.py

  Log Message:
  -----------
  Merge pull request #68 from repagh/master

Fixes to margin calculation


Compare: https://github.com/python-control/python-control/compare/e22d36433c0a...c14b880b66a4