summaryrefslogtreecommitdiffstats
path: root/Project/PowerFlow.h
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2017-01-10 16:12:44 -0200
committerGitHub <noreply@github.com>2017-01-10 16:12:44 -0200
commit76696ec9dca9d8b8f7eb01d03fb15b47cc6a8d5b (patch)
tree5b458c70a0cb301173d1b808374a0f367813dab5 /Project/PowerFlow.h
parentb44aa5ce9401889d948149cc100d1b2ef3611d04 (diff)
parent568d04c7f692e64bc29b2ca195c2de6af7fdd43a (diff)
downloadPSP.git-76696ec9dca9d8b8f7eb01d03fb15b47cc6a8d5b.tar.gz
PSP.git-76696ec9dca9d8b8f7eb01d03fb15b47cc6a8d5b.tar.xz
PSP.git-76696ec9dca9d8b8f7eb01d03fb15b47cc6a8d5b.zip
Merge pull request #22 from Thales1330/wip/fault
Wip fault
Diffstat (limited to 'Project/PowerFlow.h')
-rw-r--r--Project/PowerFlow.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/Project/PowerFlow.h b/Project/PowerFlow.h
index 1e5c621..29e205a 100644
--- a/Project/PowerFlow.h
+++ b/Project/PowerFlow.h
@@ -4,24 +4,25 @@
#include "ElectricCalculation.h"
#include <wx/string.h>
-#include <wx/intl.h> //_()
-#include <wx/log.h> //temp
+#include <wx/intl.h> //_()
class PowerFlow : public ElectricCalculation
{
- public:
+public:
+ PowerFlow();
PowerFlow(std::vector<Element*> elementList);
~PowerFlow();
virtual bool RunGaussSeidel(double systemPowerBase = 100e6,
- int maxIteration = 5000,
- double error = 1e-6,
- double initAngle = 0.0,
- double accFactor = 1.0);
+ int maxIteration = 5000,
+ double error = 1e-6,
+ double initAngle = 0.0,
+ double accFactor = 1.0);
virtual wxString GetErrorMessage() { return m_errorMsg; }
- protected:
+
+protected:
std::vector<std::vector<std::complex<double> > > m_yBus;
wxString m_errorMsg = "";
};
-#endif // POWERFLOW_H
+#endif // POWERFLOW_H