diff --git a/TransPower.m b/TransPower.m index 13f365b..86366d5 100644 --- a/TransPower.m +++ b/TransPower.m @@ -5,9 +5,10 @@ transI=newwordParameter.trans.transI; transJ=newwordParameter.trans.transJ; transR=newwordParameter.trans.transR; transX=newwordParameter.trans.transX; +transK=newwordParameter.trans.transK; cmpSEV=Volt.*exp(1j*VAngel); %¸´Êýµçѹ % cmpY=sparse(r,c,Y.*(1j*YAngel),length(Volt),length(Volt)); -cmpSETransI=(cmpSEV(transI)-cmpSEV(transJ)).*1./(transR+1j*transX); -output_args=real(cmpSEV(transI).*conj(cmpSETransI)); +cmpSETransI=(cmpSEV(transI)./transK-cmpSEV(transJ)).*1./(transR+1j*transX); +output_args=real(cmpSEV(transI)./transK.*conj(cmpSETransI)); end diff --git a/TransReactivePower.m b/TransReactivePower.m index b8a5ec1..6c16a5f 100644 --- a/TransReactivePower.m +++ b/TransReactivePower.m @@ -5,9 +5,10 @@ transI=newwordParameter.trans.transI; transJ=newwordParameter.trans.transJ; transR=newwordParameter.trans.transR; transX=newwordParameter.trans.transX; +transK=newwordParameter.trans.transK; cmpSEV=Volt.*exp(1j*VAngel); %¸´Êýµçѹ % cmpY=sparse(r,c,Y.*(1j*YAngel),length(Volt),length(Volt)); -cmpSETransI=(cmpSEV(transI)-cmpSEV(transJ)).*1./(transR+1j*transX); -output_args=imag(cmpSEV(transI).*conj(cmpSETransI)); +cmpSETransI=(cmpSEV(transI)./transK-cmpSEV(transJ)).*1./(transR+1j*transX); +output_args=imag(cmpSEV(transI)./transK.*conj(cmpSETransI)); end diff --git a/å…¬å¼/å…¬å¼.tex b/å…¬å¼/å…¬å¼.tex index 73dc7ff..45d7cb5 100644 --- a/å…¬å¼/å…¬å¼.tex +++ b/å…¬å¼/å…¬å¼.tex @@ -133,15 +133,13 @@ i----k:1----z----j \\ å˜åŽ‹å™¨æœ‰åŠŸè¾“é€åŠŸçŽ‡ \begin{equation} \begin{aligned} -P_{ij}&=[V_1^2-V_1V_2cos(\theta_1 - \theta_2)]G_{ij}-V_1V_2sin (\theta_1 - \theta_2)B_{ij} \\ -&=\frac{V_1^2}{k^2} G_{ij}-\frac{V_1}{k} V_2[cos(\theta_1 - \theta_2)G_{ij}+sin (\theta_1 - \theta_2)B_{ij}] +P_{ij}&=\frac{V_1^2}{k^2} G_{ij}-\frac{V_1}{k} V_2[cos(\theta_1 - \theta_2)G_{ij}+sin (\theta_1 - \theta_2)B_{ij}] \end{aligned} \end{equation} å˜åŽ‹å™¨æ— åŠŸè¾“é€åŠŸçŽ‡ \begin{equation} \begin{aligned} -Q_{ij}&=-[V_1^2-V_1V_2cos(\theta_1 - \theta_2)]B_{ij}-V_1V_2sin (\theta_1 - \theta_2)G_{ij} \\ -&=-\frac{V_1^2}{k^2}B_{ij}-\frac{V_1}{k} V_2[sin(\theta_1 - \theta_2)G_{ij}-cos (\theta_1 - \theta_2)B_{ij}] +Q_{ij}&=-\frac{V_1^2}{k^2}B_{ij}-\frac{V_1}{k} V_2[sin(\theta_1 - \theta_2)G_{ij}-cos (\theta_1 - \theta_2)B_{ij}] \end{aligned} \end{equation} å˜åŽ‹å™¨è¾“é€æœ‰åŠŸåŠŸçŽ‡Jacobi