From 49ac4c4fcedb03ef09f8faab176159f48896dc7e Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 26 Jul 2017 21:32:35 -0300 Subject: 5 machine models implemented --- Project/ElectricCalculation.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Project/ElectricCalculation.cpp') diff --git a/Project/ElectricCalculation.cpp b/Project/ElectricCalculation.cpp index 2fcab57..e67c9b4 100644 --- a/Project/ElectricCalculation.cpp +++ b/Project/ElectricCalculation.cpp @@ -681,15 +681,16 @@ Machines::SyncMachineModel ElectricCalculation::GetMachineModel(SyncGenerator* g 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 Machines::SM_MODEL_5; - else - return Machines::SM_MODEL_4; - } else - return Machines::SM_MODEL_3; - } else + if(data.subTd0 != 0.0 || data.subTq0 != 0.0) { + return Machines::SM_MODEL_5; + } + return Machines::SM_MODEL_3; + } else { + if(data.subTd0 != 0.0 || data.subTq0 != 0.0) { + return Machines::SM_MODEL_4; + } return Machines::SM_MODEL_2; + } } return Machines::SM_MODEL_1; -- cgit