From 4ca362b083d7b20adfd80f1ec4b46a52789cdeb7 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Mon, 17 Jul 2017 21:02:07 -0300
Subject: Some optimization, model 1 machine implementation start

---
 Project/ElectricCalculation.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Project/ElectricCalculation.cpp')

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(
-- 
cgit