diff --git a/FormG.m b/FormG.m index 1c98270..3325803 100644 --- a/FormG.m +++ b/FormG.m @@ -1,6 +1,9 @@ function Mat_G=FormG(I1r,I1i) +% Mat_G=[ +% I1r; +% I1i; +% ]; Mat_G=[ - I1r; - I1i; + I1r.^2+I1i.^2; ]; end \ No newline at end of file diff --git a/FormLw.m b/FormLw.m index 0479ba0..bca20fa 100644 --- a/FormLw.m +++ b/FormLw.m @@ -7,6 +7,6 @@ function Lw=FormLw(Loadi,Mat_G,Init_U) % VoltU]; % t2=Mat_G+Init_U-t1; % Lw=t2; -upper=0.20*sparse(ones(length(Loadi)*2,1)); +upper=1*sparse(ones(length(Loadi)*1,1)); Lw=Mat_G+Init_U-upper; end \ No newline at end of file diff --git a/FormLz.m b/FormLz.m index 7b2e36c..05c019e 100644 --- a/FormLz.m +++ b/FormLz.m @@ -8,7 +8,7 @@ function Lz=FormLz(Loadi,Mat_G,Init_L) % ]; % t2=Mat_G-Init_L-t1; % Lz=t2; -lower=-0.20*sparse(ones(length(Loadi)*2,1)); +lower=0*sparse(ones(length(Loadi)*1,1)); Lz=Mat_G-Init_L-lower; % Lz=-[] end \ No newline at end of file diff --git a/func_deltG.m b/func_deltG.m index 2657442..0a8756f 100644 --- a/func_deltG.m +++ b/func_deltG.m @@ -1,4 +1,4 @@ -function deltG=func_deltG(busNum,Loadi) +function deltG=func_deltG(busNum,Loadi,I1r,I1i) % dgV_dPD=sparse(length(Loadi),busNum); % dgV_dQD=sparse(length(Loadi),busNum); % dgV_dx=[sparse(1:busNum,1:busNum,ones(busNum,1),busNum,busNum); @@ -15,7 +15,8 @@ function deltG=func_deltG(busNum,Loadi) % %% deltG=[ - zeros(busNum*2,length(Loadi)*2); - eye(length(Loadi)*2); + zeros(busNum*2,length(Loadi)*1); + 2*eye(length(Loadi)*1)*diag(I1r); + 2*eye(length(Loadi)*1)*diag(I1i); ]; end \ No newline at end of file diff --git a/run.m b/run.m index fb6f262..e7a657c 100644 --- a/run.m +++ b/run.m @@ -257,7 +257,7 @@ KK=0; plotGap=zeros(1,60); %³õʼ»¯ %״̬Á¿Îª SEPD SEQD SEVmf1 SEVaf1 -RestraintCount=length(Loadi)*2; +RestraintCount=length(Loadi)*1; ContrlCount=busNum*2+length(Loadi)*2; CenterA=0.1; Init_Z=sparse(ones(RestraintCount,1)); @@ -276,7 +276,7 @@ while Gap>1e-5 && KK<20 KK=KK+1; Init_u=Gap/2/RestraintCount*CenterA; deltH=func_deltH(busNum,fsY1,Loadi,Balance); - deltG=func_deltG(busNum,Loadi); + deltG=func_deltG(busNum,Loadi,I1r,I1i); % deltG=0; L_1Z=diag(Init_Z./Init_L); U_1W=diag(Init_W./Init_U);