From 0ad8514b6a6607fa39f032880a20a0d2a30d577d Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Thu, 2 Apr 2015 15:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=BA=86=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=96=87=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 IPMLoop.m                |  7 +++---
 feeder13/data - 鍓湰.txt | 18 ++++++++--------
 feeder13/data1.txt       | 46 +++++++++++++++++++++++++++++++++++-----
 run.m                    | 26 +++++++++++++++++++++++
 4 files changed, 79 insertions(+), 18 deletions(-)

diff --git a/IPMLoop.m b/IPMLoop.m
index 6733d00..b33a757 100644
--- a/IPMLoop.m
+++ b/IPMLoop.m
@@ -8,7 +8,6 @@ KK=0;
 plotGap=zeros(1,60);
 %初始化
 %状态量为 SEPD SEQD SEVmf1 SEVaf1
-state=1;%state1表示用l<=I1r<=u 这样的约束形式
 RestraintCount=length(Loadi)*2;
 ContrlCount=busNum*2+length(Loadi)*2;
 CenterA=0.1;
@@ -18,9 +17,9 @@ Init_L=1*sparse(ones(RestraintCount,1));
 Init_U=1*sparse(ones(RestraintCount,1));
 Init_Y=sparse(2*busNum,1);%等式约束乘子
 Gap=(Init_L'*Init_Z-Init_U'*Init_W);
-kmax=60;
+kmax=15;
 while(abs(Gap)>0.00001)
-    if KK>kmax
+    if KK>=kmax
         break;
     end
     plotGap(KK+1)=Gap;
@@ -64,7 +63,7 @@ while(abs(Gap)>0.00001)
     KK=KK+1;
 end
 % f=sum(([real(I1measurement);imag(I1measurement)]-[I1r;I1i]).^2)+sum((real(V1measurement)-V1r(Loadi)).^2)+sum((imag(V1measurement)-V1i(Loadi)).^2);
-if abs(Gap)<0.00001
+if abs(Gap)<0.00001 && KK<kmax
     isConverged=1;
 else
     isConverged=0;
diff --git a/feeder13/data - 鍓湰.txt b/feeder13/data - 鍓湰.txt
index 372bbe6..fed6b5d 100644
--- a/feeder13/data - 鍓湰.txt	
+++ b/feeder13/data - 鍓湰.txt	
@@ -1,16 +1,16 @@
 650
 0
-603	632	645	500
+600	632	645	500
 602	632	633	500
--1	633	634	0
-603	645	646	300
+601	633	634	0
+600	645	646	300
 601	650	632	2000
-607	684	652	800
+602	684	652	800
 601	632	671	2000
-604	671	684	300
-601	671	680	1000
--2	671	692	0
-605	684	611	300
-606	692	675	500
+600	671	684	300
+602	671	680	1000
+600	671	692	0
+602	684	611	300
+601	692	675	500
 0
 
diff --git a/feeder13/data1.txt b/feeder13/data1.txt
index 208b1fd..e7c35c7 100644
--- a/feeder13/data1.txt
+++ b/feeder13/data1.txt
@@ -1,14 +1,50 @@
 650 4.16
 0
+600	632	645	500
+602	632	633	500
+601	633	634	600
+600	645	646	300
 601	650	632	2000
-602	632	631	1800
-602	631	630	1700
+602	684	652	800
+601	632	671	2000
+600	671	684	300
+602	671	680	1000
+600	671	692	300
+602	684	611	300
+601	692	675	500
 0
 632 0 0 0
 0
-630 80 70 60 50 40 30
-631 40 10 11 50 30 10
-632 120 90 120 80 90 70
+634 160 110 120 90 120 90
+645 123 102 170 125 133 110
+646 172 150 230 132 211 160
+652 128 86 30 10 80 70
+675 85 10 68 60 20 12
+611 52 42 85 60 70 40
+0
+600	632	645	500
+602	632	633	500
+601	633	634	600
+600	645	646	300
+601	650	632	2000
+602	684	652	800
+601	632	671	2000
+600	671	684	300
+602	671	680	1000
+600	671	692	300
+602	684	611	300
+601	692	675	500
+0
+632 0 0 0
+0
+634 160 110 120 90 120 90
+645 123 102 170 125 133 110
+646 172 150 230 132 0 211 160
+652 128 86 30 10 80 70
+671 385 220 385 220 385 220
+675 485 190 68 60 290 212
+692 142 140 153 121 170 151
+611 156 142 185 60 170 80
 0
 
 
diff --git a/run.m b/run.m
index 30adad6..0d0775b 100644
--- a/run.m
+++ b/run.m
@@ -60,6 +60,13 @@ VoltpA=sparse(ones(busNum,1));
 VoltpB=sparse(ones(busNum,1)).*exp(1j*-120/180*pi);
 VoltpC=sparse(ones(busNum,1)).*exp(1j*+120/180*pi);
 
+xs=1;
+phaseASpotLoadP=phaseASpotLoadP*xs;
+phaseBSpotLoadP=phaseBSpotLoadP*xs;
+phaseCSpotLoadP=phaseCSpotLoadP*xs;
+phaseASpotLoadQ=phaseASpotLoadQ*xs;
+phaseBSpotLoadQ=phaseBSpotLoadQ*xs;
+phaseCSpotLoadQ=phaseCSpotLoadQ*xs;
 
 while(k<=kmax && maxD> EPS)
     k=k+1;
@@ -324,6 +331,25 @@ deltmCurpC=conj((mphaseCSpotLoadP+1j*mphaseCSpotLoadQ)./mVoltpC)*0.2;
 deltF012=Tp2f*conj([deltmCurpA';deltmCurpB';deltmCurpC']);
 dI_F=conj(deltF012)';
 dI_F=dI_F(Loadi,:);
+
+% deltmCurpA1=conj((mphaseASpotLoadP+1j*mphaseASpotLoadQ)./mVoltpA)*0.8;
+% deltmCurpB1=conj((mphaseBSpotLoadP+1j*mphaseBSpotLoadQ)./mVoltpB)*0.8;
+% deltmCurpC1=conj((mphaseCSpotLoadP+1j*mphaseCSpotLoadQ)./mVoltpC)*0.8;
+% 
+% deltF012=Tp2f*conj([-deltmCurpA1'+mCurpA';-deltmCurpB1'+mCurpB';-deltmCurpC1'+mCurpC']);
+% dI_F=conj(deltF012)';
+% dI_F=dI_F(Loadi,:);
+% 
+% 
+% deltmCurpA1=conj((mphaseASpotLoadP+1j*mphaseASpotLoadQ)./mVoltpA)*1.2;
+% deltmCurpB1=conj((mphaseBSpotLoadP+1j*mphaseBSpotLoadQ)./mVoltpB)*1.2;
+% deltmCurpC1=conj((mphaseCSpotLoadP+1j*mphaseCSpotLoadQ)./mVoltpC)*1.2;
+% 
+% deltF012=Tp2f*conj([deltmCurpA1'-mCurpA';deltmCurpB1'-mCurpB';deltmCurpC1'-mCurpC']);
+% dI_F=conj(deltF012)';
+% dI_F=dI_F(Loadi,:);
+
+
 tic
 for II=1:3