facat
/
cimforreduceloss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.注释掉一些不用的输出 

2.删掉一些错误的注释

Signed-off-by: facat@lab.com <facat@lab.com>
This commit is contained in:
facat@lab.com 2014-12-06 22:12:17 +08:00
parent 69cd117f35
commit 000f9b89fa
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testHasttable/aclinesegment.cpp
View File

@ -10,7 +10,7 @@ bool ACLineSegment::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalA=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n";
this->isTerminalA=false; this->isTerminalA=false;
} }
@ -18,14 +18,14 @@ bool ACLineSegment::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalB=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n";
} }
if("ConductingEquipment.Substation"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) if("ConductingEquipment.Substation"==reader.name() && reader.attributes().hasAttribute("rdf:resource"))
{ {
QString ss; QString ss;
ss=reader.attributes().value("rdf:resource").toString(); ss=reader.attributes().value("rdf:resource").toString();
this->containsOfSubstation=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->containsOfSubstation=ss.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Substation "<<this->containsOfSubstation<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Substation "<<this->containsOfSubstation<<"\n";
} }
return true; return true;

6
testHasttable/breaker.cpp
View File

@ -10,7 +10,7 @@ bool Breaker::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalA=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n";
this->isTerminalA=false; this->isTerminalA=false;
} }
@ -18,14 +18,14 @@ bool Breaker::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalB=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n";
} }
if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource"))
{ {
QString ss; QString ss;
ss=reader.attributes().value("rdf:resource").toString(); ss=reader.attributes().value("rdf:resource").toString();
this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<<this->equipmentContainer<<"\n"; qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<<this->equipmentContainer<<"\n";
} }
return true; return true;

2
testHasttable/busbarsection.cpp
View File

@ -12,7 +12,7 @@ bool BusbarSection::derivedParse(QXmlStreamReader& reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminal=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminal=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminal<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminal<<"\n";
// std::cout<<"ConductingEquipment.Terminals"<<this->terminal.toStdString()<<std::endl; // std::cout<<"ConductingEquipment.Terminals"<<this->terminal.toStdString()<<std::endl;
} }

2
testHasttable/compensator.cpp
View File

@ -11,7 +11,7 @@ bool Compensator::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminal=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminal=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminal<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminal<<"\n";
} }
return true; return true;

6
testHasttable/disconnector.cpp
View File

@ -11,7 +11,7 @@ bool Disconnector::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalA=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n";
this->isTerminalA=false; this->isTerminalA=false;
} }
@ -19,14 +19,14 @@ bool Disconnector::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalB=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n";
} }
if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource"))
{ {
QString ss; QString ss;
ss=reader.attributes().value("rdf:resource").toString(); ss=reader.attributes().value("rdf:resource").toString();
this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<<this->equipmentContainer<<"\n"; qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<<this->equipmentContainer<<"\n";
} }
return true; return true;

6
testHasttable/powertransformer.cpp
View File

@ -11,7 +11,7 @@ bool PowerTransformer::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalA=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalA<<"\n";
this->isTerminalA=false; this->isTerminalA=false;
} }
@ -19,14 +19,14 @@ bool PowerTransformer::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminalB=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminalB<<"\n";
} }
if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource"))
{ {
QString ss; QString ss;
ss=reader.attributes().value("rdf:resource").toString(); ss=reader.attributes().value("rdf:resource").toString();
this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<<this->equipmentContainer<<"\n"; qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<<this->equipmentContainer<<"\n";
} }
return true; return true;

2
testHasttable/synchronousmachine.cpp
View File

@ -10,7 +10,7 @@ bool SynchronousMachine::derivedParse(QXmlStreamReader &reader)
{ {
QString terminal; QString terminal;
terminal=reader.attributes().value("rdf:resource").toString(); terminal=reader.attributes().value("rdf:resource").toString();
this->terminal=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->terminal=terminal.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminal<<"\n"; qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminal<<"\n";
} }
return true; return true;

4
testHasttable/terminal.cpp
View File

@ -12,7 +12,7 @@ bool Terminal::derivedParse(QXmlStreamReader& reader)
{ {
QString cn; QString cn;
cn=reader.attributes().value("rdf:resource").toString(); cn=reader.attributes().value("rdf:resource").toString();
this->connectivityNode=cn.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->connectivityNode=cn.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"Terminal.ConnectivityNode "<<this->connectivityNode<<"\n"; qDebug()<<"got "<<"Terminal.ConnectivityNode "<<this->connectivityNode<<"\n";
NodeToTerminal nt; NodeToTerminal nt;
nt.add(this->connectivityNode,this->id); nt.add(this->connectivityNode,this->id);
@ -22,7 +22,7 @@ bool Terminal::derivedParse(QXmlStreamReader& reader)
{ {
QString ce; QString ce;
ce=reader.attributes().value("rdf:resource").toString(); ce=reader.attributes().value("rdf:resource").toString();
this->conductingEquipment=ce.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref this->conductingEquipment=ce.replace("#","").leftRef(-1).toString();
qDebug()<<"got "<<"Terminal.ConductingEquipment "<<this->conductingEquipment<<"\n"; qDebug()<<"got "<<"Terminal.ConductingEquipment "<<this->conductingEquipment<<"\n";
} }
return true; return true;

24
testHasttable/topologyrecorder.cpp
View File

@ -20,15 +20,15 @@ bool TopologyRecorder::startWithNode(const QString& node)
anotherTerminal=anotherTerminalVector.at(atI); anotherTerminal=anotherTerminalVector.at(atI);
if(this->reachedTerminal.contains(anotherTerminal)) if(this->reachedTerminal.contains(anotherTerminal))
{ {
std::cout<<anotherTerminal.toStdString()<<"reached"<<std::endl; // std::cout<<anotherTerminal.toStdString()<<"reached"<<std::endl; //@1
continue; continue;
} }
this->reachedTerminal[anotherTerminal]=0; this->reachedTerminal[anotherTerminal]=0;
std::cout<<"anotherTerminal"<<anotherTerminal.toStdString()<<std::endl; // std::cout<<"anotherTerminal"<<anotherTerminal.toStdString()<<std::endl;//@1
Terminal *anotherTerminalP=static_cast<Terminal *>(ht[anotherTerminal]); Terminal *anotherTerminalP=static_cast<Terminal *>(ht[anotherTerminal]);
QString ce; QString ce;
ce=anotherTerminalP->getConductingEquipment(); ce=anotherTerminalP->getConductingEquipment();
std::cout<<ce.toStdString()<<"from "<<anotherTerminal.toStdString() <<std::endl; // std::cout<<ce.toStdString()<<"from "<<anotherTerminal.toStdString() <<std::endl;//@1
if(ce.startsWith("AC")) if(ce.startsWith("AC"))
{ {
foundCate=true; foundCate=true;
@ -41,7 +41,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
ACLineSegment *AC=static_cast<ACLineSegment *>(ht[acID]); ACLineSegment *AC=static_cast<ACLineSegment *>(ht[acID]);
if(!AC) if(!AC)
{ {
std::cout<<"can not find "<<acID.toStdString()<<std::endl; // std::cout<<"can not find "<<acID.toStdString()<<std::endl;//@1
continue; continue;
} }
QString terminalA; QString terminalA;
@ -50,15 +50,15 @@ bool TopologyRecorder::startWithNode(const QString& node)
terminalB=AC->getTerminalB(); terminalB=AC->getTerminalB();
QString nextTerminal; QString nextTerminal;
nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA; nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA;
std::cout<<"new Terminal"<<nextTerminal.toStdString()<<std::endl; // std::cout<<"new Terminal"<<nextTerminal.toStdString()<<std::endl;//@1
Terminal *nextTerminalP=static_cast<Terminal *>(ht[nextTerminal]); Terminal *nextTerminalP=static_cast<Terminal *>(ht[nextTerminal]);
if(!nextTerminalP) if(!nextTerminalP)
{ {
std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl; // std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl;//@1
continue; continue;
} }
QString nextNode=nextTerminalP->getConnectivityNode(); QString nextNode=nextTerminalP->getConnectivityNode();
std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl; // std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl;//@1
this->startWithNode(nextNode); this->startWithNode(nextNode);
} }
if(ce.startsWith("SW")) if(ce.startsWith("SW"))
@ -72,25 +72,25 @@ bool TopologyRecorder::startWithNode(const QString& node)
Breaker *SW=static_cast<Breaker *>(ht[swID]); Breaker *SW=static_cast<Breaker *>(ht[swID]);
if(!SW) if(!SW)
{ {
std::cout<<"can not SW "<<swID.toStdString()<<std::endl; // std::cout<<"can not SW "<<swID.toStdString()<<std::endl;//@1
continue; continue;
} }
QString terminalA; QString terminalA;
QString terminalB; QString terminalB;
terminalA=SW->getTerminalA(); terminalA=SW->getTerminalA();
terminalB=SW->getTerminalB(); terminalB=SW->getTerminalB();
std::cout<<"terminalA"<<terminalA.toStdString()<<std::endl; // std::cout<<"terminalA"<<terminalA.toStdString()<<std::endl;//@1
std::cout<<"terminalB"<<terminalB.toStdString()<<std::endl; // std::cout<<"terminalB"<<terminalB.toStdString()<<std::endl;//@1
QString nextTerminal; QString nextTerminal;
nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA; nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA;
Terminal *nextTerminalP=static_cast<Terminal *>(ht[nextTerminal]); Terminal *nextTerminalP=static_cast<Terminal *>(ht[nextTerminal]);
if(!nextTerminalP) if(!nextTerminalP)
{ {
std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl; // std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl;//@1
continue; continue;
} }
QString nextNode=nextTerminalP->getConnectivityNode(); QString nextNode=nextTerminalP->getConnectivityNode();
std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl; // std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl;//@1
this->startWithNode(nextNode); this->startWithNode(nextNode);
} }