From 7e5c6c71a1894f8eea3230f3804f27a23b8161b9 Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Tue, 10 Mar 2015 20:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B4=E6=8E=A5=E7=BB=99?=
 =?UTF-8?q?=E5=87=BADG=E6=9C=89=E5=8A=9F=E3=80=81=E6=97=A0=E5=8A=9F?=
 =?UTF-8?q?=E7=9A=84=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 testHasttable/cimexporter.cpp | 2 +-
 testHasttable/element/dg.cpp  | 9 +++++++++
 testHasttable/element/dg.h    | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

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<<ite->fromNum<<"\t";
 //            writer<<ite->toNum<<"\t";
 //            writer<<ite->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 <QPair>
 #include <QString>
+#include <cmath>
 #include "branch.h"
 class DG:public Branch
 {
 public:
     DG(const QPair<QString, QString> &fromTo, double DGCapacity, const QString &id, QObject *parent=0);
     DG();
+    double getPG(double pf);//有功出力
+    double getQG(double pf);//无功出力
     ~DG();
     QString id;
     double capacity;