From 0ca6710a7e003952e1212c8e32ebb2e7c008d508 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 24 Jul 2019 00:02:17 -0300 Subject: Newton bug fixed --- Project/ElectricCalculation.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Project/ElectricCalculation.h') diff --git a/Project/ElectricCalculation.h b/Project/ElectricCalculation.h index 0f2049b..d7f003e 100644 --- a/Project/ElectricCalculation.h +++ b/Project/ElectricCalculation.h @@ -18,21 +18,21 @@ #ifndef ELECTRICCALCULATION_H #define ELECTRICCALCULATION_H -#include #include +#include -#include "Element.h" -#include "PowerElement.h" #include "Bus.h" #include "Capacitor.h" +#include "Element.h" +#include "HarmCurrent.h" #include "IndMotor.h" #include "Inductor.h" #include "Line.h" #include "Load.h" +#include "PowerElement.h" #include "SyncGenerator.h" #include "SyncMotor.h" #include "Transformer.h" -#include "HarmCurrent.h" #include "PropertiesData.h" @@ -126,6 +126,7 @@ class ElectricCalculation std::vector > GaussianElimination(std::vector > > matrix, std::vector > array); + std::vector GaussianElimination(std::vector > matrix, std::vector array); Machines::SyncMachineModel GetMachineModel(SyncGenerator* generator); @@ -140,6 +141,11 @@ class ElectricCalculation std::vector > > l, std::vector > b); + /** + * @brief Get the power elements of the system (use GetElementsFromList first). + * @return A list of power elements. + */ + const std::vector GetPowerElementList() const { return m_powerElementList; } /** * @brief Get the buses of the system (use GetElementsFromList first). * @return A list of bus elements. @@ -185,11 +191,12 @@ class ElectricCalculation * @return A list of transformer elements. */ const std::vector GetTransformerList() const { return m_transformerList; } - /** + /** * @brief Get the harmonic current source of the system (use GetElementsFromList first). * @return A list of harmonic current sources elements. */ const std::vector GetHarmCurrentList() const { return m_harmCurrentList; } + protected: std::vector m_powerElementList; std::vector m_busList; -- cgit