diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-07-24 00:02:17 -0300 |
---|---|---|
committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-07-24 00:02:17 -0300 |
commit | 0ca6710a7e003952e1212c8e32ebb2e7c008d508 (patch) | |
tree | 54886abf6d62d9341377d535e52b36016b602107 /Project/ElectricCalculation.h | |
parent | 7f46d390b8cc1d5f37560f52b222198dbc5e1225 (diff) | |
download | PSP.git-0ca6710a7e003952e1212c8e32ebb2e7c008d508.tar.gz PSP.git-0ca6710a7e003952e1212c8e32ebb2e7c008d508.tar.xz PSP.git-0ca6710a7e003952e1212c8e32ebb2e7c008d508.zip |
Newton bug fixed
Diffstat (limited to 'Project/ElectricCalculation.h')
-rw-r--r-- | Project/ElectricCalculation.h | 17 |
1 files changed, 12 insertions, 5 deletions
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 <vector> #include <complex> +#include <vector> -#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<std::complex<double> > GaussianElimination(std::vector<std::vector<std::complex<double> > > matrix, std::vector<std::complex<double> > array); + std::vector<double> GaussianElimination(std::vector<std::vector<double> > matrix, std::vector<double> array); Machines::SyncMachineModel GetMachineModel(SyncGenerator* generator); @@ -141,6 +142,11 @@ class ElectricCalculation std::vector<std::complex<double> > b); /** + * @brief Get the power elements of the system (use GetElementsFromList first). + * @return A list of power elements. + */ + const std::vector<PowerElement*> 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<Transformer*> 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<HarmCurrent*> GetHarmCurrentList() const { return m_harmCurrentList; } + protected: std::vector<PowerElement*> m_powerElementList; std::vector<Bus*> m_busList; |