From 305f059cf621a2b85bb04141dfb676c6e914de20 Mon Sep 17 00:00:00 2001 From: "dugg@lab-desk" Date: Thu, 22 May 2014 09:46:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=AD=89=E5=BC=8F=E7=BA=A6=E6=9D=9F?= =?UTF-8?q?=20Mat=5FG=3D[=20=20=20=20=20sparse(PD(Loadi))-mPD(Loadi)-bigM*?= =?UTF-8?q?PDbi-0.1;=20=20=20=20=20sparse(PD(Loadi))-mPD(Loadi)+bigM*PDbi+?= =?UTF-8?q?0.1;=20=20=20=20=20sparse(QD(Loadi))-mQD(Loadi)-bigM*QDbi-0.1;?= =?UTF-8?q?=20=20=20=20=20sparse(QD(Loadi))-mQD(Loadi)+bigM*QDbi+0.1;=20?= =?UTF-8?q?=20=20=20=20Volt'-mVolt'-bigM*Vbi-0.03;=20=20=20=20=20Volt'-mVo?= =?UTF-8?q?lt'+bigM*Vbi+0.03;=20=20=20=20=20Vbi;=20=20=20=20=20PDbi;=20=20?= =?UTF-8?q?=20=20=20QDbi;=20=20=20=20=20];?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dugg@lab-desk --- FormG.m | 6 +++--- FormLw.m | 2 +- FormLz.m | 2 +- OPF.m | 2 +- func_deltG.m | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FormG.m b/FormG.m index 045ef32..da763e5 100644 --- a/FormG.m +++ b/FormG.m @@ -1,10 +1,10 @@ -function Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD) +function Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD) Mat_G=[ sparse(PD(Loadi))-mPD(Loadi)-bigM*PDbi-0.1; sparse(PD(Loadi))-mPD(Loadi)+bigM*PDbi+0.1; - sparse(QD(Loadi)); - sparse(QD(Loadi))-0.001; + sparse(QD(Loadi))-mQD(Loadi)-bigM*QDbi-0.1; + sparse(QD(Loadi))-mQD(Loadi)+bigM*QDbi+0.1; Volt'-mVolt'-bigM*Vbi-0.03; Volt'-mVolt'+bigM*Vbi+0.03; Vbi; diff --git a/FormLw.m b/FormLw.m index 5f36d4f..d24712a 100644 --- a/FormLw.m +++ b/FormLw.m @@ -24,7 +24,7 @@ QDU(indQD(3:12:end))=1.55*realQD(indQD(3:12:end)); QDU(indQD(9:12:end))=1.05*realQD(indQD(9:12:end)); % PF=0.85; % QDU=1.0*PD(Loadi).*sqrt(1 -PF.^2)./PF; -t1=([0*PDU',100*ones(1,length(PDU)),QDU',QDU',0*VoltU,100*ones(1,length(VoltU)),1*ones(1,Busnum+length(Loadi)*2)])'; +t1=([0*PDU',100*ones(1,length(PDU)),0*QDU',100*ones(1,length(QDU)),0*VoltU,100*ones(1,length(VoltU)),1*ones(1,Busnum+length(Loadi)*2)])'; t2=Mat_G+Init_U'-t1; Lw=t2; diff --git a/FormLz.m b/FormLz.m index d664aef..5b0490f 100644 --- a/FormLz.m +++ b/FormLz.m @@ -21,7 +21,7 @@ indQD=find(realQD>0); QDL(indQD(3:12:end))=0.95*realQD(indQD(3:12:end)); QDL(indQD(9:12:end))=0.95*realQD(indQD(9:12:end)); % QDL=0*PD(Loadi).*sqrt((1-PF.^2))./PF; -t1=([-100*ones(1,length(PDL)),0*PDL',QDL',QDL',-100*ones(1,length(VoltL)),0*VoltL,0*ones(1,Busnum+length(Loadi)*2)])'; +t1=([-100*ones(1,length(PDL)),0*PDL',-100*ones(1,length(QDL)),0*QDL',-100*ones(1,length(VoltL)),0*VoltL,0*ones(1,Busnum+length(Loadi)*2)])'; t2=Mat_G-Init_L'-t1; Lz=t2; diff --git a/OPF.m b/OPF.m index 8d99300..3dc7aae 100644 --- a/OPF.m +++ b/OPF.m @@ -85,7 +85,7 @@ while(abs(Gap)>Precision) %% Ðγɷ½³Ì¾ØÕó Luu=Init_U'.*Init_W'+Init_u*ones(RestraintCount,1); Lul=Init_L'.*Init_Z'-Init_u*ones(RestraintCount,1); - Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD); + Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD); Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,Loadi); Ly=Mat_H; Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD,RealPD,RealQD,Loadi,KK,PF); diff --git a/func_deltG.m b/func_deltG.m index b3e5ac2..0fee070 100644 --- a/func_deltG.m +++ b/func_deltG.m @@ -54,8 +54,8 @@ dg7_dPDbi=sparse(length(Loadi),Busnum); dgPDbi_dPDbi=sparse(eye(length(Loadi))); dgQDbi_dPDbi=sparse(zeros(length(Loadi))); %% -dg3_dQDbi=sparse(-zeros(sizeLoadi)); -dg32_dQDbi=sparse(zeros(sizeLoadi)); +dg3_dQDbi=sparse(-eye(sizeLoadi)); +dg32_dQDbi=sparse(eye(sizeLoadi)); dg4_dQDbi=sparse(length(Loadi),length(Loadi)); dg42_dQDbi=dg4_dPDbi; dg5_dQDbi=sparse(length(Loadi),Busnum);