From a3b1c5a30e670cb61bc6488262999682acbee8c4 Mon Sep 17 00:00:00 2001
From: "dugg@lab-desk" <dugg@lab-desk>
Date: Sun, 19 Oct 2014 15:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=8D=E7=BD=AE0=E7=BD=AE1?=
 =?UTF-8?q?=E7=9A=84=E8=AF=9D=EF=BC=8C=E6=BD=AE=E6=B5=81=E6=96=B9=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=88=E4=B8=8D=E5=B9=B3=E8=A1=A1=E4=BA=86=EF=BC=8C=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E8=AF=A5=08=E5=9B=9E=E6=9D=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dugg@lab-desk <dugg@lab-desk>
---
 FormLw.m         |  2 +-
 IPMLoop.m        |  3 ---
 Modification.m   |  4 ++--
 SolveIt.m        | 14 +++++++-------
 func_deltF.m     |  2 +-
 func_deltdeltF.m |  2 +-
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/FormLw.m b/FormLw.m
index 3da7c95..42081c5 100644
--- a/FormLw.m
+++ b/FormLw.m
@@ -1,5 +1,5 @@
 function Lw=FormLw(Loadi,Mat_G,Init_U)
 
-upper=0.1*sparse(ones(length(Loadi)*1,1));
+upper=0.01*sparse(ones(length(Loadi)*1,1));
 Lw=Mat_G+Init_U-upper;
 end
\ No newline at end of file
diff --git a/IPMLoop.m b/IPMLoop.m
index cff2dc0..9332c8d 100644
--- a/IPMLoop.m
+++ b/IPMLoop.m
@@ -29,7 +29,6 @@ while(abs(Gap)>0.000001)
     deltH=func_deltH(busNum,fsY1,Loadi,Balance);
     %% 形成不等式约束的雅克比
     deltG=func_deltG(busNum,Loadi,I1r,I1i);
-    deltG=zeros(size(deltG));
     %%
     L_1Z=diag(Init_Z./Init_L);
     U_1W=diag(Init_W./Init_U);
@@ -41,7 +40,6 @@ while(abs(Gap)>0.000001)
     ddh=0;
     %%  开始构建ddg
     ddg=func_ddg(busNum,Loadi,Init_Z,Init_W);
-    ddg=zeros(size(ddg));
     %%  开始构建deltF
     deltF=func_deltF(Vmeasurement,Imeasurement,busNum,fsY1,Loadi,V1r,V1i,I1r,I1i);
 %     deltF=0;
@@ -49,7 +47,6 @@ while(abs(Gap)>0.000001)
     Luu=Init_U.*Init_W+Init_u*ones(RestraintCount,1);
     Lul=Init_L.*Init_Z-Init_u*ones(RestraintCount,1);
     Mat_G=FormG(I1r,I1i);
-    Mat_G=zeros(size(Mat_G));
     Mat_H=FormH(fsY1,Loadi,V1r,V1i,I1r,I1i,BalI1r,BalI1i,Balance);
     Ly=Mat_H;
     Lz=FormLz(Loadi,Mat_G,Init_L);
diff --git a/Modification.m b/Modification.m
index 0f8cb37..6c0afcf 100644
--- a/Modification.m
+++ b/Modification.m
@@ -12,9 +12,9 @@ Init_Y=Init_Y+AlphaD*deltY;
 %PG(PGi)=PG(PGi)+deltX(1:size(PGi,1));
 % PG(PGi)=PG(PGi)+AlphaP*deltX(1:size(PGi,1));
 V1r=V1r+AlphaP*deltX(1:Busnum);
-% V1r(Balance)=Vref;
+V1r(Balance)=Vref;
 V1i=V1i+AlphaP*deltX(Busnum+1:2*Busnum);
-% V1i(Balance)=0;
+V1i(Balance)=0;
 %QG(PVi)=QG(PVi)+deltX(size(PGi,1)+1:size(PVi,1)+size(PGi,1) );
 % QG(PVi)=QG(PVi)+AlphaP*deltX(size(PGi,1)+1:size(PVi,1)+size(PGi,1) );
 t=deltX(Busnum*2+1:ContrlCount);
diff --git a/SolveIt.m b/SolveIt.m
index cad8068..f1e21e4 100644
--- a/SolveIt.m
+++ b/SolveIt.m
@@ -11,15 +11,15 @@ yy=[LxComa;-Ly];
 
 % t=size(PVi,1)+size(PGi,1);%电压不变
 % yy(t+Balance)=0;
-% aa(Balance,:)=0;
-% aa(:,Balance)=0;
-% aa=aa+sparse(Balance,Balance,ones(length(Balance),1),ContrlCount+2*Busnum,ContrlCount+2*Busnum);
+aa(Balance,:)=0;
+aa(:,Balance)=0;
+aa=aa+sparse(Balance,Balance,ones(length(Balance),1),ContrlCount+2*Busnum,ContrlCount+2*Busnum);
 
 %暂时改一下
-% t=Busnum;%相角不变
-% aa(t+Balance,:)=0;
-% aa(:,t+Balance)=0;
-% aa(t+Balance,t+Balance)=1;
+t=Busnum;%相角不变
+aa(t+Balance,:)=0;
+aa(:,t+Balance)=0;
+aa(t+Balance,t+Balance)=1;
 dxdy=aa\yy;
 dX=dxdy(1:ContrlCount);
 dY=dxdy(ContrlCount+1:ContrlCount+2*Busnum);
diff --git a/func_deltF.m b/func_deltF.m
index 539618c..1cde7a6 100644
--- a/func_deltF.m
+++ b/func_deltF.m
@@ -11,7 +11,7 @@ deltF=[
     %zeros(busNum*2,1);
     sparse(Loadi,1,-2*(real(Vmeasurement)-V1r(Loadi)),busNum,1);
     sparse(Loadi,1,-2*(imag(Vmeasurement)-V1i(Loadi)),busNum,1);
-    -0*( [real(Imeasurement);imag(Imeasurement)]-[I1r;I1i]);
+    -2*( [real(Imeasurement);imag(Imeasurement)]-[I1r;I1i]);
 ];
 
 end
\ No newline at end of file
diff --git a/func_deltdeltF.m b/func_deltdeltF.m
index 0472868..e687865 100644
--- a/func_deltdeltF.m
+++ b/func_deltdeltF.m
@@ -4,7 +4,7 @@ deltdeltF=[
   %zeros(busNum*2,busNum*2+length(Loadi)*2);
   sparse(Loadi,Loadi,2,busNum,busNum*2+length(Loadi)*2);
   sparse(Loadi,busNum+Loadi,2,busNum,busNum*2+length(Loadi)*2);
-  zeros(length(Loadi)*2,busNum*2),0*eye(length(Loadi)*2);
+  zeros(length(Loadi)*2,busNum*2),2*eye(length(Loadi)*2);
   %sparse(Loadi,busNum*2+Loadi,2,busNum,busNum*2+length(Loadi)*2);
 ];
 end
\ No newline at end of file