diff --git a/.gitignore b/.gitignore index 21229f7..43eb260 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.asv \ No newline at end of file +*.asv +*.7z \ No newline at end of file diff --git a/FormG.m b/FormG.m index 9add28b..c10690a 100644 --- a/FormG.m +++ b/FormG.m @@ -10,8 +10,8 @@ Mat_G=[ Vbi; PDbi; QDbi; - (1-Vbi).*Vbi; - (1-PDbi).*PDbi; - (1-QDbi).*QDbi; +% (1-Vbi).*Vbi; +% (1-PDbi).*PDbi; +% (1-QDbi).*QDbi; ]; end \ No newline at end of file diff --git a/FormLw.m b/FormLw.m index 4484aa1..9bbbce2 100644 --- a/FormLw.m +++ b/FormLw.m @@ -18,11 +18,11 @@ indQD=find(realQD>0); QDU(indQD(3:12:end))=1.55*realQD(indQD(3:12:end)); QDU(indQD(9:12:end))=1.05*realQD(indQD(9:12:end)); 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)])'; -t1=[t1; - sparse(ones(Busnum,1)); - sparse(ones(length(Loadi),1)); - sparse(ones(length(Loadi),1)); - ]; +% t1=[t1; +% sparse(ones(Busnum,1)); +% sparse(ones(length(Loadi),1)); +% sparse(ones(length(Loadi),1)); +% ]; t2=Mat_G+Init_U'-t1; Lw=t2; diff --git a/FormLz.m b/FormLz.m index 4df63fb..e091443 100644 --- a/FormLz.m +++ b/FormLz.m @@ -22,11 +22,11 @@ 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',-100*ones(1,length(QDL)),0*QDL',-100*ones(1,length(VoltL)),0*VoltL,0*ones(1,Busnum+length(Loadi)*2)])'; -t1=[t1; - sparse(0*ones(Busnum,1)); - sparse(0*ones(length(Loadi),1)); - sparse(0*ones(length(Loadi),1)); -]; +% t1=[t1; +% sparse(0*ones(Busnum,1)); +% sparse(0*ones(length(Loadi),1)); +% sparse(0*ones(length(Loadi),1)); +% ]; t2=Mat_G-Init_L'-t1; Lz=t2; diff --git a/OPF_Init.m b/OPF_Init.m index 7f9ddba..da090d6 100644 --- a/OPF_Init.m +++ b/OPF_Init.m @@ -3,7 +3,7 @@ Loadi=find(QD~=0 | PD~=0); %Loadi=[1:Busnum]'; RestraintCount=size(Loadi,1)*4+Busnum*2+Busnum+length(Loadi)*2; %约束条件数,放开所有QD %互补约束数量 -RestraintCount=RestraintCount+Busnum+length(Loadi)*2; +RestraintCount=RestraintCount;%+Busnum+length(Loadi)*2; t_Bal_volt=Volt(Balance); Volt=sparse(1*ones(1,Busnum)); Volt(Balance)=t_Bal_volt; diff --git a/func_ddg.m b/func_ddg.m index a75d304..5142d31 100644 --- a/func_ddg.m +++ b/func_ddg.m @@ -1,11 +1,12 @@ function ddgzw=func_ddg(Busnum,ContrlCount,Loadi,Init_Z,Init_W) -CCVbiZW=Init_Z(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum)+Init_W(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum); -CCPDbiZW=Init_Z(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi))+Init_W(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi)); -CCQDbiZW=Init_Z(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi)+1:end)+Init_W(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi)+1:end); -ddgzw=[ -sparse(length(Loadi)*2+Busnum*2,ContrlCount); -sparse(Busnum,length(Loadi)*2+Busnum*2),sparse(-2*eye(Busnum))*diag(CCVbiZW),sparse(Busnum,length(Loadi)*2); -sparse(length(Loadi),length(Loadi)*2+Busnum*2+Busnum),sparse(-2*eye(length(Loadi)))*diag(CCPDbiZW),sparse(length(Loadi),length(Loadi)); -sparse(length(Loadi),length(Loadi)*2+Busnum*2+Busnum+length(Loadi)),sparse(-2*eye(length(Loadi)))*diag(CCQDbiZW); -]; +% CCVbiZW=Init_Z(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum)+Init_W(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum); +% CCPDbiZW=Init_Z(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi))+Init_W(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+1:length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi)); +% CCQDbiZW=Init_Z(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi)+1:end)+Init_W(length(Loadi)*4+Busnum*2+Busnum+length(Loadi)*2+Busnum+length(Loadi)+1:end); +% ddgzw=[ +% sparse(length(Loadi)*2+Busnum*2,ContrlCount); +% sparse(Busnum,length(Loadi)*2+Busnum*2),sparse(-2*eye(Busnum))*diag(CCVbiZW),sparse(Busnum,length(Loadi)*2); +% sparse(length(Loadi),length(Loadi)*2+Busnum*2+Busnum),sparse(-2*eye(length(Loadi)))*diag(CCPDbiZW),sparse(length(Loadi),length(Loadi)); +% sparse(length(Loadi),length(Loadi)*2+Busnum*2+Busnum+length(Loadi)),sparse(-2*eye(length(Loadi)))*diag(CCQDbiZW); +% ]; +ddgzw=0; end \ No newline at end of file diff --git a/func_deltG.m b/func_deltG.m index d1dcb3e..0ca1725 100644 --- a/func_deltG.m +++ b/func_deltG.m @@ -95,5 +95,11 @@ deltG=[dg3_dPD,dg32_dPD,dg4_dPD,dg42_dPD,dg5_dPD,dg6_dPD,dg7_dPD,dgPDbi_dPD,dgQD dg3_dPDbi,dg32_dPDbi,dg4_dPDbi,dg42_dPDbi,dg5_dPDbi,dg6_dPDbi,dg7_dPDbi,dgPDbi_dPDbi,dgQDbi_dPDbi,dgCCVbi_dPDbi,dgCCPDbi_dPDbi,dgCCQDbi_dPDbi; dg3_dQDbi,dg32_dQDbi,dg4_dQDbi,dg42_dQDbi,dg5_dQDbi,dg6_dQDbi,dg7_dQDbi,dgPDbi_dQDbi,dgQDbi_dQDbi,dgCCVbi_dQDbi,dgCCPDbi_dQDbi,dgCCQDbi_dQDbi; ]; - +deltG=[dg3_dPD,dg32_dPD,dg4_dPD,dg42_dPD,dg5_dPD,dg6_dPD,dg7_dPD,dgPDbi_dPD,dgQDbi_dPD; + dg3_dQD,dg32_dQD,dg4_dQD,dg42_dQD,dg5_dQD,dg6_dQD,dg7_dQD,dgPDbi_dQD,dgQDbi_dQD; + dg3_dx,dg32_dx,dg4_dx,dg42_dx,dg5_dx,dg6_dx,dg7_dx,dgPDbi_dx,dgQDbi_dx; + dg3_dvbi,dg32_dvbi,dg4_dvbi,dg42_dvbi,dg5_dvbi,dg6_dvbi,dg7_dvbi,dgPDbi_dvbi,dgQDbi_dvbi; + dg3_dPDbi,dg32_dPDbi,dg4_dPDbi,dg42_dPDbi,dg5_dPDbi,dg6_dPDbi,dg7_dPDbi,dgPDbi_dPDbi,dgQDbi_dPDbi; + dg3_dQDbi,dg32_dQDbi,dg4_dQDbi,dg42_dQDbi,dg5_dQDbi,dg6_dQDbi,dg7_dQDbi,dgPDbi_dQDbi,dgQDbi_dQDbi; +]; end \ No newline at end of file