Closed Teoanadech closed 7 years ago
Please merge with upstream and push again. There are merge conflicts.
Middag,
Is dit nou reg? Hy se nie vir my daar is enige conflicts nie so ek oop so
On Wed, Jun 7, 2017 at 5:01 AM, Carl Sandrock notifications@github.com wrote:
Please merge with upstream and push again. There are merge conflicts.
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/alchemyst/Skogestad-Python/pull/294#issuecomment-306672787, or mute the thread https://github.com/notifications/unsubscribe-auth/AYfumumGQVqmQDEMb3ZwTXgjuhxG0K_Gks5sBhKIgaJpZM4NyCaR .
Conflicts are fixed, but this fails tests on Python2. I've commented about a simple fix for that problem.
I made a mistake in the Sym2mimotf so that, if you do not add a deadtime matrix, it bombs out. Fixed this Created a new plot in utilsplot that will plot any set of numbers on a complex plane. You can give it up to 8 different sets of info and it will plot them. It has the option to plot them all different or the same colors and allows you to change the marker type and size.