From 00a4cfad443e3be8da36eae675c80eb42945c5aa Mon Sep 17 00:00:00 2001
From: "dugg@lab-desk" <dugg@lab-desk>
Date: Tue, 11 Nov 2014 11:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dugg@lab-desk <dugg@lab-desk>
---
 FormLwstate1.m | 8 ++++----
 FormLzstate1.m | 8 ++++----
 IPMLoop.m      | 4 ++--
 run.m          | 1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/FormLwstate1.m b/FormLwstate1.m
index 38b70c3..6e11624 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.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(pIr)=1.2*Ir(pIr);
+upper(nIr)=0.8*Ir(nIr);
+upper(pIi+length(Ir))=1.2*Ii(pIi);
+upper(nIi+length(Ir))=0.8*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 ed5d830..dce009d 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.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(pIr)=0.8*Ir(pIr);
+lower(nIr)=1.2*Ir(nIr);
+lower(pIi+length(Ir))=0.8*Ii(pIi);
+lower(nIi+length(Ir))=1.2*Ii(nIi);
 
 % lower=-ones(length(Ir)*2,1);
 % lower([4,5,6])=[-1;-1;-1];
diff --git a/IPMLoop.m b/IPMLoop.m
index 364f926..da6deee 100644
--- a/IPMLoop.m
+++ b/IPMLoop.m
@@ -43,7 +43,7 @@ while(abs(Gap)>0.00001)
 %     U_1W=diag(Init_W./Init_U);
     %% 形成海森阵
     deltdeltF=func_deltdeltF(busNum,fsY1,Loadi,wV1r,wV1i,wI1r,wI1i,V1measurement,V1r,V1i);
-%     deltdeltF=0;
+    deltdeltF=0;
     %% 形成ddHy
 %     ddh=func_ddh(busNum,Loadi,Init_Z,Init_W);
     ddh=0;
@@ -55,7 +55,7 @@ while(abs(Gap)>0.00001)
     end
     %%  开始构建deltF
     deltF=func_deltF(V1measurement,wV1r,wV1i,I1measurement,wI1r,wI1i,busNum,fsY1,Loadi,V1r,V1i,I1r,I1i);
-%     deltF=0;
+    deltF=0;
     %%
     Luu=Init_U.*Init_W+Init_u*ones(RestraintCount,1);
     Lul=Init_L.*Init_Z-Init_u*ones(RestraintCount,1);
diff --git a/run.m b/run.m
index 22023b8..05910a9 100644
--- a/run.m
+++ b/run.m
@@ -261,6 +261,7 @@ I0measurement=mIf0(Loadi);
 wV0r=abs(real(V0measurement)).*sigma;
 wV0i=abs(imag(V0measurement)).*sigma;
 wI0r=abs(real(I0measurement)).*sigma;
+wI0r(abs(wI0r)<1e-5)=1e10;
 wI0i=abs(imag(I0measurement)).*sigma;
 % matlabpool local 3
 tic