diff --git a/FormLw.m b/FormLw.m index d2dc593..3ec54c3 100644 --- a/FormLw.m +++ b/FormLw.m @@ -11,11 +11,11 @@ PDU(PDU>0)=1.200*PDU(PDU>0); PDU(PDU<0)=0.800*PDU(PDU<0); PDU(PDU==0)=0.400; %PDU=10*ones(length(Loadi),1); -QDU=QD0(Loadi); -QDU(QDU>0)=1.200*QDU(QDU>0); -QDU(QDU<0)=0.800*QDU(QDU<0); -QDU(QDU==0)=0.200; -%QDU=1.2*PD(Loadi).*sqrt(1 -PF.^2)./PF; +% QDU=QD0(Loadi); +% QDU(QDU>0)=1.200*QDU(QDU>0); +% QDU(QDU<0)=0.800*QDU(QDU<0); +% QDU(QDU==0)=0.200; +QDU=1.2*PD(Loadi).*sqrt(1 -PF.^2)./PF; t1=([PU',QU',PDU',QDU',VoltU])'; t2=Mat_G+Init_U'-t1; Lw=t2; diff --git a/FormLz.m b/FormLz.m index f76380f..f7b431c 100644 --- a/FormLz.m +++ b/FormLz.m @@ -1,4 +1,4 @@ -function Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD0,QD0,Loadi,KK) +function Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD,PD0,QD0,Loadi,KK,PF) KK=999; %PL=GenL(:,2);%发电机有功下界 PL=-5*ones(length(GenL(:,2)),1); @@ -11,13 +11,11 @@ PDL(PDL>0)=0.800*PDL(PDL>0); PDL(PDL<0)=1.200*PDL(PDL<0); PDL(PDL==0)=-0.400; %PDL=-10*ones(length(Loadi),1); -QDL=QD0(Loadi); -QDL(QDL>0)=0.800*QDL(QDL>0); -QDL(QDL<0)=1.200*QDL(QDL<0); -QDL(QDL==0)=-0.200; -% QDL(QDL>0)=1; -% QDL(QDL<0)=-1; +% QDL=QD0(Loadi); +% QDL(QDL>0)=0.800*QDL(QDL>0); +% QDL(QDL<0)=1.200*QDL(QDL<0); % QDL(QDL==0)=-0.200; +QDL=0.9*PD(Loadi).*sqrt((1-PF.^2))./PF; t1=([PL',QL',PDL',QDL',VoltL])'; t2=Mat_G-Init_L'-t1; Lz=t2; diff --git a/OPF.m b/OPF.m index 68a0ab3..c6a3484 100644 --- a/OPF.m +++ b/OPF.m @@ -73,7 +73,7 @@ while(abs(Gap)>Precision) Mat_G=FormG(Volt,PVi,PGi,PG,QG,PD,QD,Loadi); Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,QD_NON_ZERO,QD_NON_ZERO_IND,Loadi); Ly=Mat_H; - Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD0,QD0,Loadi,KK); + Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD,PD0,QD0,Loadi,KK,PF); Lw=FormLw(Mat_G,Init_U,GenU,Busnum,PVQU,PD,PD0,QD0,Loadi,KK,PF); Lx=FormLx(deltF,deltH,Init_Y,deltG,Init_Z,Init_W); YY=FormYY(Lul,Lz,Ly,Luu,Lw,Lx);