From 42228639e544794dcc6e216bf8a91ea80aec0956 Mon Sep 17 00:00:00 2001
From: "dugg@lab-desk" <dugg@lab-desk>
Date: Wed, 15 Oct 2014 16:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E7=94=B5=E6=B5=81=E4=B8=8D=E7=AD=89?=
 =?UTF-8?q?=E5=BC=8F=E7=BA=A6=E6=9D=9F=E6=94=B9=E6=88=90=E4=BA=86=E7=94=B5?=
 =?UTF-8?q?=E6=B5=81=E7=9A=84=E5=B9=B3=E6=96=B9=EF=BC=8C=E6=94=B6=E6=95=9B?=
 =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BD=86=E8=BF=98=E6=B2=A1=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=E4=BB=A3=E7=A0=81=E6=98=AF=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E5=85=A8=E5=AF=B9=E3=80=82=E5=90=83=E5=AE=8C=E9=A5=AD=E8=A6=81?=
 =?UTF-8?q?=E7=9C=8B=E7=9C=8B=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>
---
 FormG.m      | 7 +++++--
 FormLw.m     | 2 +-
 FormLz.m     | 2 +-
 func_deltG.m | 7 ++++---
 run.m        | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/FormG.m b/FormG.m
index 1c98270..3325803 100644
--- a/FormG.m
+++ b/FormG.m
@@ -1,6 +1,9 @@
 function Mat_G=FormG(I1r,I1i)
+% Mat_G=[
+%     I1r;
+%     I1i;
+%     ];
 Mat_G=[
-    I1r;
-    I1i;
+    I1r.^2+I1i.^2;
     ];
 end
\ No newline at end of file
diff --git a/FormLw.m b/FormLw.m
index 0479ba0..bca20fa 100644
--- a/FormLw.m
+++ b/FormLw.m
@@ -7,6 +7,6 @@ function Lw=FormLw(Loadi,Mat_G,Init_U)
 %     VoltU];
 % t2=Mat_G+Init_U-t1;
 % Lw=t2;
-upper=0.20*sparse(ones(length(Loadi)*2,1));
+upper=1*sparse(ones(length(Loadi)*1,1));
 Lw=Mat_G+Init_U-upper;
 end
\ No newline at end of file
diff --git a/FormLz.m b/FormLz.m
index 7b2e36c..05c019e 100644
--- a/FormLz.m
+++ b/FormLz.m
@@ -8,7 +8,7 @@ function Lz=FormLz(Loadi,Mat_G,Init_L)
 %     ];
 % t2=Mat_G-Init_L-t1;
 % Lz=t2;
-lower=-0.20*sparse(ones(length(Loadi)*2,1));
+lower=0*sparse(ones(length(Loadi)*1,1));
 Lz=Mat_G-Init_L-lower;
 % Lz=-[]
 end
\ No newline at end of file
diff --git a/func_deltG.m b/func_deltG.m
index 2657442..0a8756f 100644
--- a/func_deltG.m
+++ b/func_deltG.m
@@ -1,4 +1,4 @@
-function deltG=func_deltG(busNum,Loadi)
+function deltG=func_deltG(busNum,Loadi,I1r,I1i)
 % dgV_dPD=sparse(length(Loadi),busNum);
 % dgV_dQD=sparse(length(Loadi),busNum);
 % dgV_dx=[sparse(1:busNum,1:busNum,ones(busNum,1),busNum,busNum);
@@ -15,7 +15,8 @@ function deltG=func_deltG(busNum,Loadi)
 % %% 
 
 deltG=[
-    zeros(busNum*2,length(Loadi)*2);
-    eye(length(Loadi)*2);
+    zeros(busNum*2,length(Loadi)*1);
+    2*eye(length(Loadi)*1)*diag(I1r);
+    2*eye(length(Loadi)*1)*diag(I1i);
 ];
 end
\ No newline at end of file
diff --git a/run.m b/run.m
index fb6f262..e7a657c 100644
--- a/run.m
+++ b/run.m
@@ -257,7 +257,7 @@ KK=0;
 plotGap=zeros(1,60);
 %³õʼ»¯
 %״̬Á¿Îª SEPD SEQD SEVmf1 SEVaf1
-RestraintCount=length(Loadi)*2;
+RestraintCount=length(Loadi)*1;
 ContrlCount=busNum*2+length(Loadi)*2;
 CenterA=0.1;
 Init_Z=sparse(ones(RestraintCount,1));
@@ -276,7 +276,7 @@ while Gap>1e-5 && KK<20
     KK=KK+1;
     Init_u=Gap/2/RestraintCount*CenterA;
     deltH=func_deltH(busNum,fsY1,Loadi,Balance);
-    deltG=func_deltG(busNum,Loadi);
+    deltG=func_deltG(busNum,Loadi,I1r,I1i);
 %     deltG=0;
     L_1Z=diag(Init_Z./Init_L);
     U_1W=diag(Init_W./Init_U);