From 1f9734d7276b6b307215e9284617e3a16fb7a69d Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Fri, 6 Feb 2015 15:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLoadInfo=E4=B8=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=8F=98=E9=87=8F=E6=B2=A1=E6=9C=89=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 testHasttable/loadinfo.cpp             | 33 ++++++++++++++++++++++++++
 testHasttable/loadinfo.h               |  5 ++++
 testHasttable/main.cpp                 |  2 +-
 testHasttable/special/loadexporter.cpp |  6 ++---
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/testHasttable/loadinfo.cpp b/testHasttable/loadinfo.cpp
index 13ed179..ec0a71f 100644
--- a/testHasttable/loadinfo.cpp
+++ b/testHasttable/loadinfo.cpp
@@ -3,6 +3,11 @@
 LoadInfo::LoadInfo(double powerFactor):powerFactor(powerFactor)
 {
 
+    this->pqA=QPair<double,double>(0,0);
+    this->pqB=QPair<double,double>(0,0);
+    this->pqC=QPair<double,double>(0,0);
+    this->ph3P=0;
+    this->ph3Q=0;
 }
 
 LoadInfo::~LoadInfo()
@@ -30,6 +35,18 @@ QPair<double,double> LoadInfo::getPQ(double current)
     return QPair<double,double>(p,q);
 }
 
+double LoadInfo::get3PhP()
+{
+//    std::cout<<"get p "<<this->ph3P<<std::endl;
+    return this->ph3P;
+}
+
+double LoadInfo::get3PhQ()
+{
+//    std::cout<<"get q "<<this->ph3Q<<std::endl;
+    return this->ph3Q;
+}
+
 double LoadInfo::getPA()
 {
     return this->pqA.first;
@@ -128,6 +145,22 @@ bool LoadInfo::updateByTime(const QTime& time)
                 this->pqA=pqA;
                 this->pqB=pqB;
                 this->pqC=pqC;
+                bool ok3PhP;
+                bool ok3PhQ;
+                this->ph3P=this->trimDoubleQuotation(sep.at(5)).toDouble(&ok3PhP);
+                if(!ok3PhP)
+                {
+                    this->ph3P=0;
+                }
+//                std::cout<<"nb "<<sep.at(5).toStdString()<<std::endl;
+//                std::cout<<this->ph3P<<std::endl;
+                this->ph3Q=this->trimDoubleQuotation(sep.at(6)).toDouble(&ok3PhQ);
+                if(!ok3PhQ)
+                {
+                    this->ph3Q=0;
+                }
+//                std::cout<<"nb "<<sep.at(6).toStdString()<<std::endl;
+//                std::cout<<this->ph3Q<<std::endl;
                 ret=true;
                 break;
             }
diff --git a/testHasttable/loadinfo.h b/testHasttable/loadinfo.h
index 7fc203e..f1aef10 100644
--- a/testHasttable/loadinfo.h
+++ b/testHasttable/loadinfo.h
@@ -18,12 +18,15 @@ public:
     void setLoadName(const QString &name);
     void setLoadPath(const QString &path);
     bool updateByTime(const QTime& time);
+    double get3PhP();
+    double get3PhQ();
     double getPA();
     double getPB();
     double getPC();
     double getQA();
     double getQB();
     double getQC();
+
 private:
     bool isStartWithTime(const QString& str);
     QString trimDoubleQuotation(const QString& str);
@@ -33,6 +36,8 @@ private:
     QPair<double,double> pqA;
     QPair<double,double> pqB;
     QPair<double,double> pqC;
+    double ph3P;
+    double ph3Q;
     QPair<double,double> getPQ(double current);
 };
 
diff --git a/testHasttable/main.cpp b/testHasttable/main.cpp
index e02a73a..0fc9191 100644
--- a/testHasttable/main.cpp
+++ b/testHasttable/main.cpp
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
     Task task;
     task.doAgainstTaskFile(eleReader);
     LoadExporter loadExporter;
-    loadExporter.toSingleFile("D:/MyPro/cimforreduceloss/testHasttable/output/pan/load/singlefile.txt");
+    loadExporter.toSingleFile("D:/MyPro/cimforreduceloss/testHasttable/output/pan/load/singlefile.csv");
     std::cout<<"Finished."<<std::endl;
     return a.exec();
 }
diff --git a/testHasttable/special/loadexporter.cpp b/testHasttable/special/loadexporter.cpp
index 0d47bb7..b8e4687 100644
--- a/testHasttable/special/loadexporter.cpp
+++ b/testHasttable/special/loadexporter.cpp
@@ -33,8 +33,8 @@ void LoadExporter::toSingleFile(const QString& filePath)
         foreach(QString key, keys)
         {
             QSharedPointer<LoadInfo> p=this->ht.get(key);
-            double P=p->getPA()+p->getPB()+p->getPC();
-            double Q=p->getQA()+p->getQB()+p->getQC();
+            double P=p->get3PhP();//p->getPA()+p->getPB()+p->getPC();
+            double Q=p->get3PhQ();//p->getQA()+p->getQB()+p->getQC();
             loadSequence[key].push_back(QPair<double,double>(P,Q) );
         }
     }
@@ -52,7 +52,7 @@ void LoadExporter::toSingleFile(const QString& filePath)
             int seq=0;
             for(QList<QPair<double,double> >::iterator ite=loadList.begin();ite!=loadList.end();ite++)
             {
-                stream<<"["<<seq++<<"]"<<"("<<ite->first<<"&&"<<ite->second<<")"<<",";
+                stream<<"["<<seq++<<"],"<<ite->first<<","<<ite->second<<",";
             }
             stream<<"\t\n";
         }