From a1c362b8a5e989cf9e75be14383fe8f7d3625422 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 22 Jan 2019 14:49:35 -0200 Subject: Merge error removal --- Project/Electromechanical.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Project/Electromechanical.cpp') diff --git a/Project/Electromechanical.cpp b/Project/Electromechanical.cpp index de30184..66d5bb2 100644 --- a/Project/Electromechanical.cpp +++ b/Project/Electromechanical.cpp @@ -235,11 +235,7 @@ void Electromechanical::SetEvent(double currentTime) Bus* parentBus = static_cast(load->GetParentList()[0]); int n = parentBus->GetElectricalData().number; std::complex v = parentBus->GetElectricalData().voltage; -<<<<<<< HEAD - m_yBus[n][n] -= std::complex(data.activePower, -data.reactivePower) / (abs(v) * abs(v)); -======= m_yBus[n][n] -= std::complex(data.activePower, -data.reactivePower) / (std::abs(v) * std::abs(v)); ->>>>>>> aad89bf4d16d45c0790bd2fc010d9ec06cc35430 } // Insert load (only disconnected load) @@ -249,11 +245,7 @@ void Electromechanical::SetEvent(double currentTime) Bus* parentBus = static_cast(load->GetParentList()[0]); int n = parentBus->GetElectricalData().number; std::complex v = parentBus->GetElectricalData().voltage; -<<<<<<< HEAD - m_yBus[n][n] += std::complex(data.activePower, -data.reactivePower) / (abs(v) * abs(v)); -======= m_yBus[n][n] += std::complex(data.activePower, -data.reactivePower) / (std::abs(v) * std::abs(v)); ->>>>>>> aad89bf4d16d45c0790bd2fc010d9ec06cc35430 } } } -- cgit