diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp index 7059fe9..1112e8b 100644 --- a/testHasttable/cimexporter.cpp +++ b/testHasttable/cimexporter.cpp @@ -286,7 +286,7 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID) ite++) { //保存到节点注入功率中 - nodePQ.push_back(CIMExporter::NodePQ(ite->toNum,-ite->dg->capacity/100000,-ite->dg->capacity/100000) ); + nodePQ.push_back(CIMExporter::NodePQ(ite->toNum,-ite->dg->getPG(0.95)/1000,-ite->dg->getQG(0.95)/1000) );//capapcity的单位是kVA // writer<fromNum<<"\t"; // writer<toNum<<"\t"; // writer<dg->capacity<<"\r\n"; diff --git a/testHasttable/element/dg.cpp b/testHasttable/element/dg.cpp index 501f51b..66644f0 100644 --- a/testHasttable/element/dg.cpp +++ b/testHasttable/element/dg.cpp @@ -11,6 +11,15 @@ DG::~DG() } +double DG::getPG(double pf)//有功出力,满发情况 +{ + return pf*(this->capacity); +} +double DG::getQG(double pf)//无功出力,满发情况 +{ + return std::sqrt(1-pf*pf)*this->capacity; +} + void DG::extract() { //单位阻抗 diff --git a/testHasttable/element/dg.h b/testHasttable/element/dg.h index 5a2f2d3..37bc3e3 100644 --- a/testHasttable/element/dg.h +++ b/testHasttable/element/dg.h @@ -3,12 +3,15 @@ #include #include +#include #include "branch.h" class DG:public Branch { public: DG(const QPair &fromTo, double DGCapacity, const QString &id, QObject *parent=0); DG(); + double getPG(double pf);//有功出力 + double getQG(double pf);//无功出力 ~DG(); QString id; double capacity;