From fb1bde0e22a5b074c6a43e75b7b982d1e1375105 Mon Sep 17 00:00:00 2001
From: "facat@ipso" <facat@ipso>
Date: Mon, 10 Nov 2014 00:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=99=9A=E6=8B=9F=E7=94=B5=E5=8E=8B?=
 =?UTF-8?q?=E5=81=9A=E9=87=8F=E6=B5=8B=E9=87=8F=E5=B1=85=E7=84=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=94=B6=E6=95=9B=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat@ipso <facat@ipso>
---
 FormLwstate1.m |  8 ++++----
 FormLzstate1.m |  8 ++++----
 run.m          | 23 +++++++++++++++++------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/FormLwstate1.m b/FormLwstate1.m
index bc33469..38b70c3 100644
--- a/FormLwstate1.m
+++ b/FormLwstate1.m
@@ -8,10 +8,10 @@ pIi=find(Ii>0);
 nIi=find(Ii<0);
 % lower=-0.2*sparse(ones(length(Loadi)*2,1));
 upper=ones(length(Loadi)*2,1);
-upper(pIr)=1.1*Ir(pIr);
-upper(nIr)=0.9*Ir(nIr);
-upper(pIi+length(Ir))=1.1*Ii(pIi);
-upper(nIi+length(Ir))=0.9*Ii(nIi);
+upper(pIr)=1.5*Ir(pIr);
+upper(nIr)=0.5*Ir(nIr);
+upper(pIi+length(Ir))=1.5*Ii(pIi);
+upper(nIi+length(Ir))=0.5*Ii(nIi);
 
 % upper([4,5,6])=[1;1;1];
 % upper([4,5,6])=0.2*Ii(nIi);
diff --git a/FormLzstate1.m b/FormLzstate1.m
index 103dd3e..ed5d830 100644
--- a/FormLzstate1.m
+++ b/FormLzstate1.m
@@ -7,10 +7,10 @@ pIi=find(Ii>0);
 nIi=find(Ii<0);
 % lower=-0.2*sparse(ones(length(Loadi)*2,1));
 lower=ones(length(Loadi)*2,1);
-lower(pIr)=0.9*Ir(pIr);
-lower(nIr)=1.1*Ir(nIr);
-lower(pIi+length(Ir))=0.9*Ii(pIi);
-lower(nIi+length(Ir))=1.1*Ii(nIi);
+lower(pIr)=0.5*Ir(pIr);
+lower(nIr)=1.5*Ir(nIr);
+lower(pIi+length(Ir))=0.5*Ii(pIi);
+lower(nIi+length(Ir))=1.5*Ii(nIi);
 
 % lower=-ones(length(Ir)*2,1);
 % lower([4,5,6])=[-1;-1;-1];
diff --git a/run.m b/run.m
index a49ee1a..9964043 100644
--- a/run.m
+++ b/run.m
@@ -128,6 +128,9 @@ fprintf('
 %% 开始进入状态估计
 % clear PD QD PG QG;
 %准备量测量
+rIf0=If0;
+rIf1=If1;
+rIf2=If2;
 sigma=0.03;
 iterPhaseASpotLoadP=phaseASpotLoadP;
 iterPhaseBSpotLoadP=phaseBSpotLoadP;
@@ -146,6 +149,14 @@ mphaseCSpotLoadQ=phaseCSpotLoadQ.*(1+normrnd(0,sigma,length(phaseCSpotLoadQ),1))
 mVoltpA=VoltpA.*(1+normrnd(0,sigma,length(VoltpA),1));
 mVoltpB=VoltpB.*(1+normrnd(0,sigma,length(VoltpB),1));
 mVoltpC=VoltpC.*(1+normrnd(0,sigma,length(VoltpC),1));
+%
+mVoltpA=abs(VoltpA).*(1+normrnd(0,sigma,length(VoltpA),1));
+mVoltpB=abs(VoltpB).*(1+normrnd(0,sigma,length(VoltpB),1)).*exp(1j*-120/180*pi);
+mVoltpC=abs(VoltpC).*(1+normrnd(0,sigma,length(VoltpC),1)).*exp(1j*+120/180*pi);
+%
+% mVoltpA=sparse(ones(busNum,1));
+% mVoltpB=sparse(ones(busNum,1)).*exp(1j*-120/180*pi);
+% mVoltpC=sparse(ones(busNum,1)).*exp(1j*+120/180*pi);
 %转换得到徐电压的量测量
 fV012=Tp2f*conj([mVoltpA';mVoltpB';mVoltpC']);
 mfV0=conj(fV012(1,:)');
@@ -171,8 +182,8 @@ mIf2=-mIf2;
 %% 先算正序的
 %平衡节点电流
 fprintf('正序\n');
-BalI1r=real(-sum(mIf1));
-BalI1i=imag(-sum(mIf1));
+BalI1r=real(-sum(rIf1));
+BalI1i=imag(-sum(rIf1));
 %电压
 %制作量测量
 % mfsY11=fsY11;
@@ -200,8 +211,8 @@ wI1i=abs(imag(I1measurement)).*sigma;
 % fprintf('目标值 %f\n',full(f));
 %% 算负序的
 fprintf('负序\n');
-BalI2r=real(-sum(mIf2));
-BalI2i=imag(-sum(mIf2));
+BalI2r=real(-sum(rIf2));
+BalI2i=imag(-sum(rIf2));
 %电压
 %制作量测量
 % mfsY22=fsY22;
@@ -229,8 +240,8 @@ wI2i=abs(imag(I2measurement)).*sigma;
 % fprintf('目标值 %f\n',full(f));
 %% 算零序
 fprintf('零序\n');
-BalI0r=real(-sum(mIf0));
-BalI0i=imag(-sum(mIf0));
+BalI0r=real(-sum(rIf0));
+BalI0i=imag(-sum(rIf0));
 %电压
 %制作量测量
 % mfsY00=fsY00;