diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-07-17 21:02:07 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-07-17 21:02:07 -0300 |
| commit | 4ca362b083d7b20adfd80f1ec4b46a52789cdeb7 (patch) | |
| tree | c6c5fc9f963400fac02076ca415d79cb9e5d2c68 /Project/ElectricCalculation.cpp | |
| parent | 54291220edb747c2a059ac5d316f6f7b14445404 (diff) | |
| download | PSP.git-4ca362b083d7b20adfd80f1ec4b46a52789cdeb7.tar.gz PSP.git-4ca362b083d7b20adfd80f1ec4b46a52789cdeb7.tar.xz PSP.git-4ca362b083d7b20adfd80f1ec4b46a52789cdeb7.zip | |
Some optimization, model 1 machine implementation start
Diffstat (limited to 'Project/ElectricCalculation.cpp')
| -rw-r--r-- | Project/ElectricCalculation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Project/ElectricCalculation.cpp b/Project/ElectricCalculation.cpp index a0667d9..2fcab57 100644 --- a/Project/ElectricCalculation.cpp +++ b/Project/ElectricCalculation.cpp @@ -676,23 +676,23 @@ std::vector<std::complex<double> > ElectricCalculation::GaussianElimination( return solution; } -SyncMachineModel ElectricCalculation::GetMachineModel(SyncGenerator* generator) +Machines::SyncMachineModel ElectricCalculation::GetMachineModel(SyncGenerator* generator) { auto data = generator->GetElectricalData(); if(data.transTd0 != 0.0) { if(data.transTq0 != 0.0) { if(data.subTd0 != 0.0) { if(data.subTq0 != 0.0) - return SM_MODEL_5; + return Machines::SM_MODEL_5; else - return SM_MODEL_4; + return Machines::SM_MODEL_4; } else - return SM_MODEL_3; + return Machines::SM_MODEL_3; } else - return SM_MODEL_2; + return Machines::SM_MODEL_2; } - return SM_MODEL_1; + return Machines::SM_MODEL_1; } std::vector<std::complex<double> > ElectricCalculation::ComplexMatrixTimesVector( |