diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2018-07-14 13:08:48 -0300 |
---|---|---|
committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2018-07-14 13:08:48 -0300 |
commit | 2458c9d8a5763a10388550650d8b571a659b0094 (patch) | |
tree | d2874fe7e0f15f0b5181f9159cd3b6a0a48af56f /Project/TransferFunction.cpp | |
parent | f4de628c999810808d961899299686a9f0c50b5b (diff) | |
parent | 73e934c17098281ffccd214f7517cd0f6ce03ab6 (diff) | |
download | PSP.git-2458c9d8a5763a10388550650d8b571a659b0094.tar.gz PSP.git-2458c9d8a5763a10388550650d8b571a659b0094.tar.xz PSP.git-2458c9d8a5763a10388550650d8b571a659b0094.zip |
Merge branch 'wip/induction-motor' of https://github.com/Thales1330/PSP into wip/induction-motor
Diffstat (limited to 'Project/TransferFunction.cpp')
-rw-r--r-- | Project/TransferFunction.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 8e7b68f..b78d74a 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -291,10 +291,11 @@ void TransferFunction::CalculateSpaceState(int maxIteration, double error) } for(int i = 0; i < order - 1; i++) { ss.A[order - 2][i] = -(denominator[order - 1 - i] / denominator[0]); - ss.C[i] = (numerator[order - 1 - i] - denominator[order - 1 - i] * numerator[0]) / denominator[0]; + ss.C[i] = numerator[order - 1 - i] / denominator[0] - + (denominator[order - 1 - i] / denominator[0]) * (numerator[0] / denominator[0]); } ss.B[order - 2] = 1.0; - ss.D = numerator[0]; + ss.D = numerator[0] / denominator[0]; m_ss = ss; |