diff --git a/run.m b/run.m index 3e49804..34238ac 100644 --- a/run.m +++ b/run.m @@ -274,9 +274,9 @@ wI1i=sqrt(1/9*(IAiW+0.5^2.*IBiW+0.8668^2.*IBrW+0.5^2.*ICiW+0.866^2.*ICrW)); wI1i=wI1i(Loadi); wV1r=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV1) ); -wV1r=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV1) ); +wV1r=sqrt( (2/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV1) ); wV1i=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV1) ); -wV1i=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV1) ); +wV1i=sqrt( (2/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV1) ); wV1r=wV1r(Loadi); wV1i=wV1i(Loadi); % [ V1r,V1i,I1r,I1i ]=IPMLoop(V1measurement,wV1r,wV1i,I1measurement,wI1r,wI1i,BalI1r,BalI1i,busNum,Loadi,fsY11,Balance,1 ); @@ -314,9 +314,9 @@ wI2i=sqrt(1/9*(IAiW+0.5^2.*IBiW+0.8668^2.*IBrW+0.5^2.*ICiW+0.866^2.*ICrW)); wI2i=wI2i(Loadi); wV2r=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV2) ); -wV2r=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV2) ); +wV2r=sqrt( (2/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV2) ); wV2i=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV2) ); -wV2i=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV2) ); +wV2i=sqrt( (2/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV2) ); wV2r=wV2r(Loadi); wV2i=wV2i(Loadi); @@ -356,9 +356,9 @@ wI0i=sqrt(1/9*(IAiW+IBiW+ICiW)); wI0i=wI0i(Loadi); wV0r=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV0) ); -wV0r=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV0) ); +wV0r=sqrt( (2/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV0) ); wV0i=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV0) ); -wV0i=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV0) ); +wV0i=sqrt( (2/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV0) ); wV0r=wV0r(Loadi); wV0i=wV0i(Loadi); % matlabpool local 3