From 1ee3b9312c4d3ab47c3797e96e7bfd182e2af9aa Mon Sep 17 00:00:00 2001
From: dmy <dugg@21cn.com>
Date: Tue, 13 May 2014 16:48:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E6=8E=89=E5=BE=88=E5=A4=9A=E6=B2=A1?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=96=87=E4=BB=B6=202.=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=BD=A2=E6=88=90=EF=BC=8C=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E8=BF=98=E6=B2=A1=E6=94=B9=E5=8F=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy <dugg@21cn.com>
---
 0PD0.mat                        | Bin 671 -> 0 bytes
 0QD0.mat                        | Bin 668 -> 0 bytes
 12PD0.mat                       | Bin 667 -> 0 bytes
 12QD0.mat                       | Bin 669 -> 0 bytes
 16PD0.mat                       | Bin 668 -> 0 bytes
 16QD0.mat                       | Bin 672 -> 0 bytes
 20PD0.mat                       | Bin 671 -> 0 bytes
 20QD0.mat                       | Bin 671 -> 0 bytes
 4PD0.mat                        | Bin 670 -> 0 bytes
 4QD0.mat                        | Bin 666 -> 0 bytes
 8PD0.mat                        | Bin 664 -> 0 bytes
 8QD0.mat                        | Bin 668 -> 0 bytes
 @ForThesis/MaxBranchDeviation.m |   4 +-
 FormG.m                         |   4 +-
 FormH.m                         |   8 +-
 FormLw.asv                      |  25 ----
 FormLw.m                        |  10 +-
 FormLz.asv                      |  20 ---
 FormLz.m                        |  10 +-
 JSMJZM.asv                      |  12 --
 JSMJZM.m                        |  22 ++--
 JSNZN.asv                       |  14 --
 Lineloss.asv                    |  38 ------
 Modification.m                  |   3 +-
 OPF.asv                         | 137 --------------------
 OPF.m                           | 223 ++++++++++++--------------------
 OPFWrongDataCheck.asv           | 106 ---------------
 OPF_Init.asv                    |  34 -----
 OPF_Init.m                      |  10 +-
 SolveIt.asv                     |  42 ------
 case1V.mat                      | Bin 1284 -> 0 bytes
 case2V.mat                      | Bin 1284 -> 0 bytes
 case3V.mat                      | Bin 1284 -> 0 bytes
 caseM.mat                       | Bin 1061 -> 0 bytes
 caseR.mat                       | Bin 1057 -> 0 bytes
 func_ddg.asv                    |   9 --
 func_ddh.m                      |   3 +-
 func_deltF.asv                  |  19 ---
 func_deltF.m                    |   1 +
 func_deltG.asv                  |  56 ++++----
 func_deltG.m                    |  29 +++--
 func_deltH.asv                  |   8 --
 func_deltH.m                    |   3 +-
 func_deltdeltF.asv              |  11 --
 jacobian.asv                    |  40 ------
 openfile2.asv                   |  84 ------------
 pf.asv                          |  34 -----
 plotVolt.asv                    |  26 ----
 plotVolt.m                      |  14 +-
 49 files changed, 182 insertions(+), 877 deletions(-)
 delete mode 100644 0PD0.mat
 delete mode 100644 0QD0.mat
 delete mode 100644 12PD0.mat
 delete mode 100644 12QD0.mat
 delete mode 100644 16PD0.mat
 delete mode 100644 16QD0.mat
 delete mode 100644 20PD0.mat
 delete mode 100644 20QD0.mat
 delete mode 100644 4PD0.mat
 delete mode 100644 4QD0.mat
 delete mode 100644 8PD0.mat
 delete mode 100644 8QD0.mat
 delete mode 100644 FormLw.asv
 delete mode 100644 FormLz.asv
 delete mode 100644 JSMJZM.asv
 delete mode 100644 JSNZN.asv
 delete mode 100644 Lineloss.asv
 delete mode 100644 OPF.asv
 delete mode 100644 OPFWrongDataCheck.asv
 delete mode 100644 OPF_Init.asv
 delete mode 100644 SolveIt.asv
 delete mode 100644 case1V.mat
 delete mode 100644 case2V.mat
 delete mode 100644 case3V.mat
 delete mode 100644 caseM.mat
 delete mode 100644 caseR.mat
 delete mode 100644 func_ddg.asv
 delete mode 100644 func_deltF.asv
 delete mode 100644 func_deltH.asv
 delete mode 100644 func_deltdeltF.asv
 delete mode 100644 jacobian.asv
 delete mode 100644 openfile2.asv
 delete mode 100644 pf.asv
 delete mode 100644 plotVolt.asv

diff --git a/0PD0.mat b/0PD0.mat
deleted file mode 100644
index 00bfc6c4a94ba360086f1310bd3445a5223a1444..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 671
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<ure@FFfuSSRv;NLFnap(GcYiSGchn!%rQM5?Qxk=gzdxs
zDRZQFU#IpYt(oK-Yjyih(5-KpdM4?aA-hawZ*{n+=Q73f>EWV~Q$5$Zrf`^*n3ryw
z8Xajn#Z^q0^Qewi#zb3}Vlh_9)qT_X{#eZUTwo#Jo;c%|MVse>c^=c28u&b`iJ#>!
zc&({oS<K|U8}>Ut>YUKwA?2wq>EdH%&~3h{qa|f>uZvfTO8be<rW~cp6yrd_2~0sA
z+a@S&nwoLaEXb{F!rT<|l?qc`+`moG3iACnNorI73s2q65&w$~z3tV`K40EYdU5r_
z&Y80}JZTN~>SDfe|J9SnE9F%$I=x<f#W91`|CaaL?-zgWNUZq#RUz!|@37Aw=I}b(
zFWI@7N#10l`SDcqI~KC<gkJ9CbD3xUIV@{$Mwo00?-Jg`XD8M!%UB`*yw`C3s+W3t
zU%OW8um76xhH>?_#~WltFV3IH;>{qG`0Ix2O73urWo&}!0=r6G?_7Az@bB2K8}paH
z*-`8E_Jq{CMuqfu4fiiKKRwmPA0O$r=WpEf`<L$V7I#Pf%YG&Gi+|&?yL{$-qV`fJ
z-)~m7{C>B^?Rn!?J3qmD?+#@>=H3=`t8??>$#(0{GM5Im8|*mUIazWh<NgzE_r<4#
z`TX9flwwpa`!&%oPb1re=YVX${y!Fy2bP;YUiRsxLeSw*<zL_TO03^<vWHdAMD18b
k(LCXreG5$^AG%0~pQ*d{_P~67^;>S<sz2C+nf7=90H)j_U;qFB

diff --git a/0QD0.mat b/0QD0.mat
deleted file mode 100644
index 733cc7343811124660c410dacc864a2b1b3cb03b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<urjbzFfuSSRv;NLFnap(GcYiSFflMx%rQM5?QywKg#E*O
zz2xReGh;a}UUZ%w>NodnlwsfIwK9SmPnA5|<B+(q$3eMRbkosq<$BZ4+|4m*S+PJ#
zJ29!_n8e<mZK;Ar6J5Fw#jR;Enq9lM<iX*GbJ`F8TxNXi+)|@$Qgit;osJcW|2}nx
zN7K8)XZ5N0Ti+S^w;e3I!I*S|b9aJy^ghK#n-lF!6Py&^FiMIXjGJ(nF@T{_h_6YC
zubHjyK%fO%lm%mI0oSR8OeF!F%NKHe3E(viI6dukz23G@ixUj(nY!$2`BKDZpRl?v
zwByS$=dh*mUuRjK4BuXMM)%vr+TX&vgn1_zeSY%f%ZC0Xn`TvI?(W=kv;UgzozkE+
z3%+}|t?d;G{(M%tQpU9^=x3!6yKTv>cHxH%tcx~2I`$*?(#tImC&}oyYF(@Gm&h^M
z_w?!?hlw*Q^mkXqx$G?|+~95Z^NpD8yZ-dKd!H|?RW4roe%0=kw@cqTwO#Q!KY3N_
zdS;o{bYpXtSg}_&#&%|>Hed32@oS4i@<O%#U*Ylf+*hwnZU6K9?H7mrUGYI_OQ$@%
zc7c6o@3+}Je-`eS$z1OCr<qGR_2>P1<7?X|f6UtOIsLt_P}d~E>x#y?Tx#BxhT<pH
zq@tB&{jzqy=`j8KQsHFJO#$)B6<J@(&rMyMS9Hh2KilHn0{K^WoL09f?|t`nO~MH$
hUc0Yp)0-AANZ-4ms7ZNZ^skGbLOlL6@Z8>;0|40<B~btX

diff --git a/12PD0.mat b/12PD0.mat
deleted file mode 100644
index 65f1f295e266fe12413c38b827d6d4681a589fd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<vNE<%FfuSSRv;NLFnap(GcYg+Gchn!%rQM5?QywKg#E+(
z$$wr;y?XJe*=54?rzUg#j8}h5eYQd{+bVea|7DlDH+wi~ggua}^4hhw$ICrohSh|v
zYkMCq+uD6hPKV=-liIc=+=o_Z%)ZgvH=VD>V$SCRi~AwRW&|FH5c-<3NpJ2(+0(VT
zW)oXPJJ;;;+P3NY1eZzPDk;_{m4hbvbKQ8=>lEaYvSh{-0ZUEQ)D(41b<q_5Kmh^O
zo9-bg_JNa|U7WWpX}dDXD#%}|W1fs+Z;QHnXQRo)v`dG=Uf1hw`<8sFsE$kGba&0(
zOZE)q3(|kQ{Vs4TNB4Qshl3AJ&;4;*q-CFN@UqAm4k~-&YF`#{eE%7EvNO5)M}p+(
zd%2RW=dv%Ybj?ed{m8@WtxMV}%Ugj~O+3pFd|UI!aM%30$_Y<p5B6&wZ@qulF=TG<
zQW=kL35shpw$*NNe0qD&%MGRtFV^Ln_Za8JY@e~b-j2t)vg7jiDXfO-S)!lA+YM%Z
zi<7E&;!v{8Bf0DLMMJ%f^X|NMS^J>udPTFW<lIkdqh9+KJh#1mD{l9M!&2JX%4Inh
zxqnYvB6sHdSG`rw?{0`U*&ndwe&f9b-oX}k3Z~{%JgR?sBq8KP{c5>G)(6+C{yQUK
zk^K5tm!-W+>7+GMi^VzrJ)Rppzv;!P_?nwFS}gnO6^vGXc^D^AxbQ?P)7pw{;cuAA
gyC0Vni7&ffQ)ee#^6=d+`&CYQ?Ee|KmhHL+07;!FCjbBd

diff --git a/12QD0.mat b/12QD0.mat
deleted file mode 100644
index 371b4f27ac6a0f7cfda6a05918b39619cfee1d45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<vNADNFfuSSRv;NLFnap(GcYiSGBGez%rQM5?J=2Ag#Ckl
z=|bbJ8bxO;xli5J*`9jt?5+6B&p~G+4nOmm%PV8I<LGn_C;o}9Yi~6d@9NJHHs2nZ
zkm~%VFW^P9{zk8r)2lR?MWbw8wsKg<S$%k1aPIKKKbIxjGW`=~oV_xcGhh4go9MUF
z#pXA+s7<_>y(IfL=Om9JPq~xotV<?%cnEH;OSack3sO=pDr%TAp?S#^jgCoECLd;5
zGD$`;D#$nMq~RiE^^SQG9=4XQJxdyAcqm)?&hjwMR7|^cYR&ckF=vkTYp(vOnQ$iW
zrD0Ctf{6b<5&J}(bnB1WiF|+jxLZ5yU5vo0e<%31{?ki2v~Afe<Ha{VuhyE7zqjk%
z9HonMj2M<L*}x>l_fT=;A)Cj?`X_u#`Epxfo`kW@s-D6x_Y#HM=2r>Yez}xCkNfeh
zvp450sb)5)x&P1d^s|=Ie>>wp*l|og!ng8t^Te5cj((vW_pX2QcGBayW|iqVtLV`S
zruS9fa^ycv(~kC97Soa6y+5k(i}H+3G4^FQSr3=Ideq*)8*krw`-vT2{JHY9vJX{?
zLh)<7@0~m-DC}Rdfq8?8%=y~SKbYj+P5S@w&(i?oMV+@&Y7I>LU#|M;x5DYY*v)T=
zM_R6Z%qe9sd&}IJf2;jc$ESbqFKA4w)7m6<%4vptjds${?FN!HSE?Sbk)F10%iWjN
icUOE4+mO04kAthHCS})!t1EWT73*C6pK<22_0Iua0w>1+

diff --git a/16PD0.mat b/16PD0.mat
deleted file mode 100644
index e4e2f654ec0466a9a0ca963b9b49e888304dc7c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<wlXwVFfuSSRv;NLFnap(GcYiSFflMx%rQM5>oJ*8gzdrk
z-kHsH>u<ScI?q_TdF|FMM&H$@E-b#B`0J_J>=H%R)Fm0lCy#V&lvtZ8?wlJb5}o^W
zyUe3)ZtEnucL(Szy-+fg_<NIyecgrbK6}{;i#f%G7Vp#A63=~<P@7yOCYX~t<IvQ7
zcC$T?Y1suA$L!n1FJL!ug3YGcZxnwnY4Di2Rl2&f=fp|7MGC(=C&?(dE}0>tq`G8E
z!<321PgpEHwK`^Hc$i+C7!~CHiqqR~GTS0`wj`C_Cp?A|)za4fd!BTyUS!>q<qhn+
zk4deSpP!I9@po;B71zxkC6hJ14hoX1uiE!4ICUmW@2uZ}pAVya&wn#F;3&SgO=NfC
zsiK(e8`mp5<$UJ4k0DQfW7iJrI+f4M?c(oAw0w4dxbB^7;fzhsOKcA>?)YAJ{_>L}
z8`e6X2{vWfu;6up^(~tO;qGs{em`C@X<2k}H`9z9IV+n2#jcs0v!~Tcxo&$}`6}nM
zvCXf=XTI+FayZ9O?NO3^O!2B8y%OxM^}8!RP2%TXq<?bCK~CQfO7EWqFzovN{muIy
z`X4U8-RO6=??6pf-ScIe1Z~W!-p*}vT=HAt+z*ihMYGLhwZ9);cAm%Ayizf*HdgaB
z|KsRgwkjcR3KNf?s$bdsqS$iQ-i?JFlggb>hcB{-|Fr$PmNnN^wvx8p7I!A8>99KS
hE$n&~vSaq)Y3r9}9c8wU(JKD?pn>H-gHFNT!vJ)nA?g4C

diff --git a/16QD0.mat b/16QD0.mat
deleted file mode 100644
index fe41c6ba5ef90f7ab54a7dd1b6925e08dbdbd43b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 672
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<wlXqQFfuSSRv;NLFnap(GcYhnFflMx%rQNm?J=2AgzbU;
z+=YR~j-E-;f(w^kOPjfF+8j5pt*V-Nk;dT<PGm(i34L9xl<K=H=iauNHCMMK<$2%e
zspRxcuUAn%)ak*(du`Dfo#>DyC6#+i9y}~K*MGQjC(q$IT}d;RzSt;mIC+L{ac$u~
z2JdIC#;rRS{oKpHNKrB<K{%%^#G|<+?cuR7fhG>41nHc1pBs#k6L_s1nJgU?TK7(1
z|NVgBgrYp3qoPQo5TCQ5OylAOO+prIOBb{~E@+Be@qg!xqw<fReNtA?e`5T5dC3%u
z8Cl{HbD#L~$7;!Kn|y9={Ku__JT*7Hlu10|{7tEvJ^q>6)JHF?_wAc@Og~Rxhl*L%
z4~_Ew>l3(BRSMU!obvrLN&4T#>!s80h5XFEx9-~|?dX<3mxxcE?$a~pZ<)A#Vs2<n
z&O-i2rEktmnaJ~YUi04jF-tDadUte=N${+K?J;-WE-{*{To*d2yYBS4ou^*$e9<#e
zm~qB9aCMl_hI?5Hj!UOzms!qwar({kta-Z||17;ZYvMmCuC&5)UB`8{1nF7^E95Up
zaN6O1V&jFMb|*LgR^q<8wtwxeQ`aszEdBW9?d!BIo&DdcDpqvL^^{#%y_Bs=PJ(N<
z(c3HX_06ljHcVVsyDa;>`m`4N)~mnb*dw*8dy?n!J^IXLHMO&R#cmf%xv4qJe!Z_(
mcUPO08E|2Z{`DCdN8cRr<<DOBa%=AN|9d(X*SkG9s0sjNIVaNq

diff --git a/20PD0.mat b/20PD0.mat
deleted file mode 100644
index f8e0b19279e388edd7c7386e21bc59c10b94b694..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 671
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2u>_f@J%dIFg8#yG`BJ~v@$SMFfuSSRv;NLFnap(GcYiSGchn!%rQM5?Qxk=gzdxr
zwWl}5q+aTnAu%!S>`SBQ<SqR<+SBi*`o^B)3Yy*QvGDfn=^J-WTV|v)Y2xH1Is9wq
zY;1ox>5?ALHnH1Y*<mKlhoaanEqGJ$@<9J#OaAuHg%WKmqYfB!uiSic(Nvzvrk9^T
z?^a0^>$cQ6J@f8&K`~Et$rRy}Dzi_D9ZG+e$KhdiQqgJC)F+d2Rr+((m6X(kHcf7L
zqqMto&Kp&(AP>F?&QCZrmAs02R(Kd{DlT>L?VD`0Nb%_t7US^$#fG2l_2!=RXKXzk
z@^^XNT$jSr1^<>-a7^4X>%!YR%PnS2nm$qJd-8_Q3D<6I33U0T<)6K!ZpUZwUvbf^
z6{RB=W$*tjbSG;0{$+po76ql=E(tO}SI)P;_rqKdt&eeapH(_mY_Pwup-{klOT3vy
zwzGj>&r!Mb+XtlQKB@RWW5Va1_tu@RX>GjpI{VxWd8HNcfou1OHmuM7YwYhTafv^0
zUgX`bzq4Gv=PzWIdwqZNx)SYWQ)MPzy2h$A{Zq7xnZ#`U4T~SCMLa2ec&*s>#k!Ka
zAvMN|=5l-yZ}=5<8mUDsy_~%2K%wvdiyVQKPwrM+VEFk;@LqYIa7^0Kzfa1T*;1;t
zmOK(Kh-TR+8+<<S+Kj0Gn-?&*zWUf;{>pj9@smX<Z5Jk<@)L8Z{<yX9e)Y)!S)rXX
l3MyA6yvUWv$~JQr{asjUw8Hh!;%e8|b~8WlOHVkI0{|7KC6WLD

diff --git a/20QD0.mat b/20QD0.mat
deleted file mode 100644
index 0296b5f27a7f0d1a79b06acb1ed2260ec6d0f422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 671
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2u>_f@J%dIFg8#yG`BJ~v@$SMFfuSSRv;NLFnap(GcYiSGchn!%rQM5?Qxk=gzdxr
zm%9#VDC;=tZZX<^B{TK*rjMFuW4EY!$7Jd`Ur*iD?s|Ed$;_lfF%us)O__05x|lyW
zd`nW8RO&Z@8_i<(cn^jOHJZ6?=$p>>$70Us0*m`@ZHano5@&3^a$Pt~<?s@nuUBt+
z9Gcc@>{WQ{(>>=yo=P{JCvmhFoQ#`vX3ZTBRhvm}mrmMknlGau`9$HNu;NJ-C8kNf
zeG_DqREs9Li>S=k@MP3f(JE@1qvE<`#vCP87hk{0K}BtmEC27DaaG=2=jrkWy~s8C
z?>9&Uy_<8x;L$<F<kol0&kb!BZ~ro#Cst!x^mF@9dn#^7bM@UTdt4hByz<D(14#+r
z&K=ppz5mwI%@G-go}Sgu`;u<@XxG1I+djTE+i-oU$gY;SJ$*mLu3r7fAa?IEPvy<x
z6^n1}_*pLfz~I;J!<V+s=<Aqw;nUp+kAGSID>7M+JzM{@$VTJ(%71eCUzE1rl=-gt
zPiaST6XP`>?q6O-ERScVy?L;Njm67&&8?HV%FJIa)IRP1J89|BM@ycBDtyw4SU9tK
znWL;v+xb-v<=Sk``KPRtO(uk?ahTuKPRL&ID)oAnK>E$h%hBf@C9*%g{TJ9d{qVV1
z`}*=Ei;teAdu}ym_+FT98{TTyx>2v@RPX!0ij|))81GpvD!<o0#nIPv|6_kg$s3O}
l-Oq<<x_m3EcbO#jHGIx<`OMUem6N}E%-H;c-O+02cK~jSDbxS}

diff --git a/4PD0.mat b/4PD0.mat
deleted file mode 100644
index 3c6017a176ad079d2506aa1f5a3696c2822d0eb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 670
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<urf7JFfuSSRv;NLFnap(GcYiSF)=Vy%rQM5?K6o{g#Cm6
zhAUf&vJKB}+@`U#+bKo7_^rLr<ZByd-Bsa@i<utzdXw0zX`dUjw#H~*X!yZ2QP8pB
zk@GCab-mY8&$3_Z+WJgsQ>)ungJpIldrG$5KX<Ou!ur1|&*3=_49+;cnwjFLcUa{7
zm!FZ&m(mJn)*5|$v#-CvQ&CgNY16bd%CAqdrM+|G6cjYP>7kM$tf@Ntq}ZmZQzjN|
zYHslGWL>Eenqq#_StLdOrhnE6$D$4yHFpo)z)6dj^j(>p?BaUmOw8Z&N6-A9VLEv}
z)4Dlvg3mpy1p74Czx66#yv-%gYl&sSsxy!KMC=bG6z3n`JK0WSkKnzs-O^Iwb*lo)
z#Sfjd`FWW~{noj!*7xtGUA$@4b6q@g4)2O78@<i0w6ZHPE)(DXcg^OsKy$zQSGv}{
zy1OFGdfB<-x)Of8e=9Q06;eEBg+H&HFyWZpmypN_0=9Fee2P7>>;AV++sAG%-tMSh
za-rkfr^Yv8qTJKWf84v7&~!NJFSn3!)V@C1d@kvNSc9SiGM5y0YgXL+c9SVx>zA=b
zip$<Vy|M2%C%g&0pA^1Kl=Wh?b$&sqK>hDamv`N1Dyvqt&rEnYyUI+LTWaH)2mMjn
zwGA>4lWX@MVEpLrDENOp?=7C27VA$p{|U@qXa2y|y{O6f)}7YpS)p4B5A|@1mal8M
jHe+MS)yZGjguBK6<u3grBQ`7VX}Rm2uKIIJkH!K3jxi-Q

diff --git a/4QD0.mat b/4QD0.mat
deleted file mode 100644
index 5d5ef3a38490893e5e53e3038e320799722faeed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 666
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<urf7OFfuSSRv;NLFnap(GcYg+F)=Vy%rQM5?K6o{g#E*L
ziI%*ny%Do*OZAzYbuZ8Oy_oF=)1;_HK?_CuT<uc4W7a(S#_6Jam#Io4duv;_XJFgT
zi?`NTZkrbC#=o&@p}4y3gIhU%Yx<_2`*!=LC4c(!{j(A!K6AA_416w}XL#5{?ANC|
z&Rk-J5_cJ2KB}8haKdcU+&2o=ogHtKlG0wfY2Nf*vZQCqWUfu^Z&atI$gfm03UYSH
z^0W;U5ViE+6Xdn@DS4t{={Bolp2=jfOI|!rEG!-Ugp@Orr@gAzOZ$2JQ0pI&fIrEX
z-_MVoe&B7_bN5Bt19GP?-9G14bJZ-tU&ojwo_}4TbE(=wc((qpG|mN;5l_AE?(I1z
zw%6vv68YEZDHnaZT+fLJo{YCp%=1v|UjO5R)vtY8c2*2$cYkh*d|jGj!ZMkczlme&
z*DR*VI$7~E(=FGQacoh&`}wJ2hiztD#37}k;sw3cx(pl5bR;XKT7La|oL;^!?r3}F
zyD3*+HElVy=b*^8!w>p=pYGdzVDj`$*&=*4;vRKZ>o+~jKRV(3?rE;EzXOsJ+lBMj
zygKO~WA39mcbj3i^q-JFi}v4b>pbDJ`1(_~b(tT!&EFpg3w-qONSgH~*G}bme`{B)
zHf(Lx{{8XV)V&{!9=8Y0_&7(H{h;~NzZyGwFaPR4Rnjir85nlZ)M{dHZ)DGW*$DIH
eS6ZLV`LOPlFK?N3!Q(Z)(Lawj*KfSAZ7%@XcqEhn

diff --git a/8PD0.mat b/8PD0.mat
deleted file mode 100644
index 5d83ebee8c0018426b60d1cd9b57d3f89e5cfaae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 664
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<v@$hUFfuSSRv;NLFnap(GcYg+FflMx%rQM5?IBzs!uDbR
z$+k9&i3-&k631@sIWseQW71sDzH6s~j^9bk(_=r)l-S|IUwx`YF}ByKRq*m0zqvWv
zB4)2y?#SuIy;_h<jW;RBQ|h9e*Y7<g4~{>a(|-6Tmt?Z+Z;8i?o-;1**m&ygKJ)uc
zb7Xg}S?ITEGryA_#{&rtN0!t8KGB@-Z4#>-n64JcWI1pdSum<Q@-25{WZ7CE7E-`>
z?l9|$_R|+QqAoZZzc|R?meHtvflJN6SvulI-rw^_ztx?&f3Ck_V(+hA%Vf;IX4rKJ
z6)V2_xA$s(RITUHs^o}s+`&0o?>5bj3qCs6xl=NB#v1QQKW@J;So?8jsA;U@ub?0^
zO@ZGY8x`(k<bS#_^JCBZRhRuYs^9wb{f~xiXq<OM)SoGuyXIX#T<z+4aoOrGA4JaT
zo4HwBRetj1*3>yEGyc6gmcKjc@|HQ*{ydu6a>6=zrQyl6m+iKngQr#bMLC*TXM7A|
zjJN&!=C{PweY;=VmEQMu?z?*Ee9jap8CJK?ml)2*ZnDkM`+E7!@^v?^O$-cL_vfKX
z=;SF|OQqZXUVbuh<(1-Vio1S1I8b!^pXaOH3-^itHE^7GYe}wxfm337Vb;^L+)*#K
zfAfl*uy5`6ZTDr4*jC2h`C#GnZcF}VHQ7ZU-K+c;7&=^9Ja-r0Qx;CyukoLaldmiY
e(D_zc)md(!DzLuVLvG&onb%#u@E_FPw+jH+1}8lL

diff --git a/8QD0.mat b/8QD0.mat
deleted file mode 100644
index c73bbab8b6ae7efe5a5ecf8f62ab71e00cabe133..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2v1E>@J%dIFfdavGO{u<vNAAKFfuSSRv;NLFnap(GcYiSFflMx%rQM5>oK`dgzdwA
z>Bufu?&d?QozA4LzB$MH%iWnv(r(PUeP`C}X<I(6Zqev?t29yXS=Od<vs~XxMbS69
z++00HL~7r-op3N%dt!;+714~$H3!xl@8|ntF{ilD;=I+dh`kLPUA~xZ$g)kIbabE5
zZH2_n37OqXynnMRwD8<uo2k(Db^@#QjZeLEH*hbRz`NU#%~GK~Ccr`N2{SuO>jv?z
zMEN)EMgh%iTNbc0OFR^qu|VidLZjA-w!;N1SvQLQo<AB^=M#0Nzd`Bqd_Bk3=D0fZ
zudna1Wv<=0X{X~I=h>T-Pu=2Yv`U_<e?j-l#qE>Y=Sik_+^b#rBjU@lsauwXcs{vq
z`e<FBi^at0NBm2g#J0{>+xF_M;KcbgOsln)Yx=A#Y~Q2#ma8`^@6Nh1mKW_MRvB-;
zUa~QtZnUEC;@z1IyG@K;9<I_je{=7X+Xq&^R&iX_E8XWeyV*qgUPaKeT^`4it6MgA
z%1Q118Bwj>yFBeCxBp|yd2RL5Q`ooaZMqtt{&?5tE8%IsZ?F6wv?);XYWj|q7c7<u
z-+8Za+~Lj7fJ*k2ZYidIp4va3?<kme&|9~8e*e>JTPHt?JhOl1euqPA;!a=xl6Om~
z-Xv@On?>R3YRCMa{(kXy>B@I4j|5i!YEECgjA5>xuV=Z7ez5;1r#~+Z{Bv0+^9Fyf
ikg~e)Eh_Mm-~2FhJ_~ExCHo&=jHp+;XwNWhXE6ZOk}3)S

diff --git a/@ForThesis/MaxBranchDeviation.m b/@ForThesis/MaxBranchDeviation.m
index ac15e4c..b715597 100644
--- a/@ForThesis/MaxBranchDeviation.m
+++ b/@ForThesis/MaxBranchDeviation.m
@@ -29,8 +29,8 @@ end
 Volt0=U;
 UAngel0=Uangle;
 
-[dispLineloss0 dispTransloss0]=Lineloss(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0,Volt0,UAngel0);
-[dispLineloss dispTransloss]=Lineloss(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0,Volt,UAngel);
+[dispLineloss0 dispTransloss0]=Lineloss(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0,Volt0,UAngel0);%测量值
+[dispLineloss dispTransloss]=Lineloss(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0,Volt,UAngel);%估计值
 t1=(dispLineloss0(:,3) - dispLineloss(:,3))./dispLineloss0(:,3);
 t2=(dispTransloss0(:,3) - dispTransloss(:,3))./dispTransloss0(:,3);
 t11=dispLineloss0(:,3)>1e-5;% 太小的值不计算
diff --git a/FormG.m b/FormG.m
index f137773..7cf7e72 100644
--- a/FormG.m
+++ b/FormG.m
@@ -1,8 +1,10 @@
-function Mat_G=FormG(Volt,PVi,PGi,PG,QG,PD,QD,Loadi)
+function Mat_G=FormG(Volt,PVi,PGi,PG,QG,PD,QD,Loadi,Vbi)
 
 Mat_G=[
     sparse(PD(Loadi));
     sparse(QD(Loadi));
     Volt';
+    Volt';
+    Vbi;
     ];
 end
\ No newline at end of file
diff --git a/FormH.m b/FormH.m
index 0779496..e655496 100644
--- a/FormH.m
+++ b/FormH.m
@@ -1,10 +1,4 @@
-function Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,QD_NON_ZERO,QD_NON_ZERO_IND,Loadi)
-%% 
-%QDcos=textread('D:\Project\最小化潮流\最小潮流算例\仙海919PDQDglys.txt');
-%QD(QD~=0)=PD(QD~=0)./tan(QDcos);
-%QD(QD_NON_ZERO_IND)=QD_NON_ZERO;
-%% 
-%PD(Loadi)=QD(Loadi)./tan(acos(0.98));
+function Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,Loadi)
 AngleIJ=sparse(r,c,UAngel(r)-UAngel(c)-Angle',Busnum,Busnum);
 dP=PG-PD-diag(Volt)*Y.*cos(AngleIJ)*Volt';
 dQ=QG-QD-diag(Volt)*Y.*sin(AngleIJ)*Volt';
diff --git a/FormLw.asv b/FormLw.asv
deleted file mode 100644
index 987b6ee..0000000
--- a/FormLw.asv
+++ /dev/null
@@ -1,25 +0,0 @@
-function Lw=FormLw(Mat_G,Init_U,GenU,Busnum,PVQU,PD,PD0,QD0,Loadi,KK,PF,noDataTransCapacity)
-KK=999;
-%PU=GenU(:,2);%发电机有功上界
-PU=5*ones(length(GenU(:,2)),1);
-%QU=PVQU(:,1);%发电机无功上界
-QU=5*ones(length(PVQU(:,1)),1);
-VoltU=(1.1)*ones(1,Busnum);
-%VoltU=10*ones(1,Busnum);
-% PDU=PD0(Loadi);
-PDU=noDataTransCapacity;
-PDU(PDU>0)=1.200*PDU(PDU>0);
-PDU(PDU<0)=0.800*PDU(PDU<0);
-PDU(PDU==0)=0.400;
-%PDU=10*ones(length(Loadi),1);
-% QDU=QD0(Loadi);
-% QDU(QDU>0)=1.200*QDU(QDU>0);
-% QDU(QDU<0)=0.800*QDU(QDU<0);
-% QDU(QDU==0)=0.200;
-% PF=0.85;
-% QDU=1.0*PD(Loadi).*sqrt(1 -PF.^2)./PF;
-t1=([PU',QU',PDU',QDU',VoltU])';
-t2=Mat_G+Init_U'-t1;
-Lw=t2;
-
-end
\ No newline at end of file
diff --git a/FormLw.m b/FormLw.m
index 8c02646..1a7b62e 100644
--- a/FormLw.m
+++ b/FormLw.m
@@ -9,14 +9,22 @@ PDU=PD0(Loadi);
 PDU(PDU>0)=1.200*PDU(PDU>0);
 PDU(PDU<0)=0.800*PDU(PDU<0);
 PDU(PDU==0)=0.400;
+realPD=PD0(Loadi);
+indPD=find(realPD>0);
+PDU(indPD(3:12:end))=1.55*realPD(indPD(3:12:end));
+PDU(indPD(9:12:end))=1.05*realPD(indPD(9:12:end));
 %PDU=10*ones(length(Loadi),1);
 QDU=QD0(Loadi);
 QDU(QDU>0)=1.200*QDU(QDU>0);
 QDU(QDU<0)=0.800*QDU(QDU<0);
 QDU(QDU==0)=0.400;
+realQD=QD0(Loadi);
+indQD=find(realQD>0);
+QDU(indQD(3:12:end))=1.55*realQD(indQD(3:12:end));
+QDU(indQD(9:12:end))=1.05*realQD(indQD(9:12:end));
 % PF=0.85;
 % QDU=1.0*PD(Loadi).*sqrt(1 -PF.^2)./PF;
-t1=([PDU',QDU',VoltU])';
+t1=([PDU',QDU',VoltU,VoltU,0*ones(1,Busnum)])';
 t2=Mat_G+Init_U'-t1;
 Lw=t2;
 
diff --git a/FormLz.asv b/FormLz.asv
deleted file mode 100644
index 48a736e..0000000
--- a/FormLz.asv
+++ /dev/null
@@ -1,20 +0,0 @@
-function Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD,PD0,QD0,Loadi,KK,PF)
-KK=999;
-
-VoltL=(0.9)*ones(1,Busnum);
-%VoltL=-10*ones(1,Busnum);
-PDL=PD0(Loadi);
-PDL(PDL>0)=0.700*PDL(PDL>0);
-PDL(PDL<0)=1.300*PDL(PDL<0);
-PDL(PDL==0)=-0.400;
-%PDL=-10*ones(length(Loadi),1);
-QDL=QD0(Loadi);
-QDL(QDL>0)=0.700*QDL(QDL>0);
-QDL(QDL<0)=1.300*QDL(QDL<0);
-QDL(QDL==0)=-0.400;
-% QDL=0*PD(Loadi).*sqrt((1-PF.^2))./PF;
-t1=([PDL',QDL',VoltL])';
-t2=Mat_G-Init_L'-t1;
-Lz=t2;
-
-end
\ No newline at end of file
diff --git a/FormLz.m b/FormLz.m
index 1f58ebc..b2b8984 100644
--- a/FormLz.m
+++ b/FormLz.m
@@ -7,13 +7,21 @@ PDL=PD0(Loadi);
 PDL(PDL>0)=0.800*PDL(PDL>0);
 PDL(PDL<0)=1.200*PDL(PDL<0);
 PDL(PDL==0)=-0.400;
+realPD=PD0(Loadi);
+indPD=find(realPD>0);
+PDL(indPD(3:12:end))=0.95*realPD(indPD(3:12:end));
+PDL(indPD(9:12:end))=0.45*realPD(indPD(9:12:end));
 %PDL=-10*ones(length(Loadi),1);
 QDL=QD0(Loadi);
 QDL(QDL>0)=0.800*QDL(QDL>0);
 QDL(QDL<0)=1.200*QDL(QDL<0);
 QDL(QDL==0)=-0.400;
+realQD=QD0(Loadi);
+indQD=find(realQD>0);
+QDL(indQD(3:12:end))=0.95*realQD(indQD(3:12:end));
+QDL(indQD(9:12:end))=0.95*realQD(indQD(9:12:end));
 % QDL=0*PD(Loadi).*sqrt((1-PF.^2))./PF;
-t1=([PDL',QDL',VoltL])';
+t1=([PDL',QDL',VoltL,VoltL,0*ones(1,Busnum)])';
 t2=Mat_G-Init_L'-t1;
 Lz=t2;
 
diff --git a/JSMJZM.asv b/JSMJZM.asv
deleted file mode 100644
index 86be91d..0000000
--- a/JSMJZM.asv
+++ /dev/null
@@ -1,12 +0,0 @@
-JSM=[0.0575 0.051 0.0029];
-JZM=[0.003 0.02629 0.0582];
-plot(1:3,JSM,'k');
-axis([0 4 0 0.07])
-text(1,JSM(1)+0.001,'0.0575')
-text(2,JSM(2)+0.001,'0.051')
-text(3,JSM(3)+0.001,'0.0029')
-hold on 
-plot(1:3,JZM,'k--');
-text(1,JZM(1)+0.001,'0.003')
-text(2,JZM(2)+0.001,'0.02629')
-text(3,JZM(3)+0.001,'0.0029')
\ No newline at end of file
diff --git a/JSMJZM.m b/JSMJZM.m
index 936502b..ce51633 100644
--- a/JSMJZM.m
+++ b/JSMJZM.m
@@ -1,18 +1,18 @@
-JSM=[0.0575 0.051 0.0029];
-JZM=[0.0003 0.02629 0.0582];
-for I=0.01:0.01:0.06
+JSM=[0.070244 0.0533 0.004379];
+JZM=[0.002275 0.047311 0.070318];
+for I=0.01:0.01:0.08
     line([0.5 3.5],[I I],'Color',[220 220 220]/255)
 end
 hold on
 plot(1:3,JSM,'k');
 ylabel('统计误差')
-xlabel('情况')
-axis([0.5 3.5 0 0.065])
-text(1,JSM(1)+0.001,'0.0575')
-text(2,JSM(2)+0.001,'0.0510')
-text(3,JSM(3)+0.001,'0.0029')
+xlabel('情形')
+axis([0.5 3.5 0 0.075])
+text(1,JSM(1)+0.001,'0.0702')
+text(2,JSM(2)+0.001,'0.0533')
+text(3,JSM(3)+0.001,'0.0043')
 hold on 
 plot(1:3,JZM,'k--');
-text(1-.3,JZM(1)+0.001,'0.0003')
-text(2,JZM(2)-0.001,'0.0263')
-text(3,JZM(3)-0.001,'0.0029')
+text(1-.3,JZM(1)+0.001,'0.0023')
+text(2-0.3,JZM(2)-0.001,'0.0473')
+text(3,JZM(3)-0.001,'0.0703')
diff --git a/JSNZN.asv b/JSNZN.asv
deleted file mode 100644
index ea4d42c..0000000
--- a/JSNZN.asv
+++ /dev/null
@@ -1,14 +0,0 @@
-JSN=[0.1213 0.1092 0.0587];
-JZN=[0.0971 0.1314 0.1408];
-plot(1:3,JSM,'k');
-ylabel('值')
-xlabel('情况')
-axis([0.5 3.5 0 0.065])
-text(1,JSM(1)+0.001,'0.1213')
-text(2,JSM(2)+0.001,'0.0510')
-text(3,JSM(3)+0.001,'0.0029')
-hold on 
-plot(1:3,JZM,'k--');
-text(1-.3,JZM(1)+0.001,'0.0003')
-text(2,JZM(2)-0.001,'0.0263')
-text(3,JZM(3)-0.001,'0.0029')
\ No newline at end of file
diff --git a/Lineloss.asv b/Lineloss.asv
deleted file mode 100644
index 16e5eaa..0000000
--- a/Lineloss.asv
+++ /dev/null
@@ -1,38 +0,0 @@
-%% 计算线损
-function [dispLineloss dispTransloss]=Lineloss(Linei,Linej,Liner,Linex,Lineb2,Transi,Transj,Transr,Transx,Branchi,Branchg,Branchb,k0,Volt,Angle)
-%format long
-% fprintf('功率为有名值\n');
-% fprintf('节点号\t节点号\t有功损耗 MW\t无功损耗 MVar')
-cmpVolt=Volt'.*cos(Angle')+1i*Volt'.*sin(Angle');
-% cmpVolt=cmpVolt';
-y0=1i*Lineb2;
-%yj0=1i*standardinput(:,7);
-yij=1./(Liner+1i*Linex);
-%% 线路损耗
-Sij=cmpVolt(Linei).*conj(  cmpVolt(Linei) .* y0 + ( cmpVolt(Linei)- cmpVolt(Linej) ).*yij );
-Sji=cmpVolt(Linej).*conj(  cmpVolt(Linej) .*y0 + ( cmpVolt(Linej)- cmpVolt(Linei) ).*yij );
-%Sij1==Sij2
-deltLineS=Sij+Sji;
-
-%% 另一种计算方式begin
-ss=1*(Volt(Linei)'.^2.*abs(yij).*cos( angle(yij) ) -Volt(Linei)'.*Volt(Linej)'.*cos( Angle(Linei)' - Angle(Linej)' - angle(yij)).*abs(yij));
-ss=(Volt(Linei)'.^2+Volt(Linej)'.^2).*abs(yij).*cos(angle(yij))-2*Volt(Linei)'.*Volt(Linej)'.*cos( Angle(Linei)' - Angle(Linej)').*cos( - angle(yij)).*abs(yij);
-ss=Volt(Linei)'.*Volt(Linej)'.*abs(yij).*cos()
-%% 另一种计算方式end
-dispLineloss=[Linei Linej real(deltLineS)*100 imag(deltLineS)*100];
-%full(dispLineloss)
-% dispLineloss=sortrows(dispLineloss,-3);
-full(dispLineloss);
-%% 以下是变压器损耗
-yij=1./(Transr+1i*Transx);
-Sij=cmpVolt(Transi)./k0.*conj(  ( cmpVolt(Transi)./k0- cmpVolt(Transj) ).*yij );
-Sji=cmpVolt(Transj).*conj( ( cmpVolt(Transj)- cmpVolt(Transi)./k0 ).*yij );
-deltTransS=Sij+Sji;
-%% 接地支路损耗
-% 没有考虑变压器变比
-deltTransS =deltTransS+sum(cmpVolt(Branchi).*conj((cmpVolt(Branchi).*(Branchg+1j*Branchb))));
-%% 
-dispTransloss=[Transi Transj real(deltTransS)*100 imag(deltTransS)*100];
-% dispTransloss=sortrows(dispTransloss,-3);
-full(dispTransloss);
-end
\ No newline at end of file
diff --git a/Modification.m b/Modification.m
index 615244e..b1d91e5 100644
--- a/Modification.m
+++ b/Modification.m
@@ -1,4 +1,4 @@
-function [Init_Z,Init_L,Init_W,Init_U,Init_Y,PG,QG,Volt,UAngel,PD,QD]=Modification(Init_Z,Init_L,Init_W,Init_U,Init_Y,deltZ,deltL,deltW,deltU,deltX,deltY,PG,QG,Volt,UAngel,PVi,ContrlCount,Balance,Busnum,PGi,PD,QD,Loadi)
+function [Init_Z,Init_L,Init_W,Init_U,Init_Y,PG,QG,Volt,UAngel,PD,QD,Vbi]=Modification(Init_Z,Init_L,Init_W,Init_U,Init_Y,deltZ,deltL,deltW,deltU,deltX,deltY,PG,QG,Volt,UAngel,PVi,ContrlCount,Balance,Busnum,PGi,PD,QD,Loadi,Vbi)
 AlphaP=FormAlphaP(Init_L,deltL,Init_U,deltU);
 %fprintf('AlphaP %f\n',full(AlphaP));
 AlphaD=FormAlphaD(Init_Z,deltZ,Init_W,deltW);
@@ -24,4 +24,5 @@ balVolt=Volt(Balance);
 Volt=Volt+AlphaP*t(1:Busnum);
 Volt(Balance)=balVolt;
 UAngel=UAngel+AlphaP*t(Busnum+1:2*Busnum);
+Vbi=Vbi+AlphaP*t(2*Busnum+1:end)';
 end
\ No newline at end of file
diff --git a/OPF.asv b/OPF.asv
deleted file mode 100644
index fe989df..0000000
--- a/OPF.asv
+++ /dev/null
@@ -1,137 +0,0 @@
-tic
-clc
-clear
-thesis=ForThesis(4,8);
-for II=1:4
-    [kmax,Precision,UAngel,Volt,Busnum,PVi,PVu,Balance,Y,Angle,P0,Q0,r,c,GB,Linei,Linej,Transfori,Transforj,GenU,GenL,GenC,PG,QG,PD,QD,CenterA,PGi,PVQU,PVQL,Liner,Linex,Lineb,Transforr,Transforx,Transfork0]= ...
-        pf('c:/newFIle.txt');
-    %pf('D:\Project\青秀降损项目\最小化潮流\最小潮流算例\原始\津头站津视922（3-1）_0.5_120%.txt');
-    %pf('D:\Project\最小化潮流\最小潮流算例\仙海919.txt');
-    %pf('c:/file31.txt');
-    
-    
-    %% 计算功率因数
-    Loadi=QD~=0 | PD~=0;
-    PF=sqrt(PD(Loadi).^2./(QD(Loadi).^2+PD(Loadi).^2))
-    %%
-    Volt;
-    UAngel*180/3.1415926;
-    %% 通过潮流计算PG
-    AngleIJ=sparse(r,c,UAngel(r)-UAngel(c)-Angle',Busnum,Busnum);
-    PGBal=PD+diag(Volt)*Y.*cos(AngleIJ)*Volt';
-    QGBal=QD+diag(Volt)*Y.*sin(AngleIJ)*Volt';
-    %% 初值-即测量值
-    PG0=PG;
-    QG0=QG;
-    PD0=PD;
-    QD0=QD;
-    %%
-    PG0(Balance)=PGBal(Balance);
-    PG(Balance)=PGBal(Balance);
-    QG0(Balance)=QGBal(Balance);
-    QG0(PVi)=QGBal(PVi);
-    QG(PVi)=QGBal(PVi);
-    %% 真实值
-    RealPG=PG0;
-    RealQG=QG0;
-    RealPD=PD0;
-    RealQD=QD0;
-    %%
-    %PGi=zeros(1,1);
-    [Volt,UAngel,Init_Z,Init_W,Init_L,Init_U,Init_Y,PG,QG,RestraintCount,wPG,wQG,wPD,wQD,PD,PD0,QD,randPDind,Loadi]=OPF_Init(Busnum,Balance,PG,QG,Volt,GenU,GenL,PVi,PGi,PVQU,PVQL,RealPD,RealQD,QD,PD);
-    Gap=(Init_L*Init_Z'-Init_U*Init_W');
-    KK=0;
-    plotGap=zeros(1,60);
-    ContrlCount=size(Loadi,1)*2+Busnum*2;
-    kmax=60;
-    %% 20120523 临时
-    QD_NON_ZERO=QD(PD==0 & QD~=0);
-    QD_NON_ZERO_IND=find(PD==0 & QD~=0);
-    %%
-    Precision=Precision/10;
-    
-    %% 加误差
-    PD0(Loadi)=PD0(Loadi).*(1+normrnd(0,0.05,length(Loadi),1));
-    QD0(Loadi)=QD0(Loadi).*(1+normrnd(0,0.05,length(Loadi),1));
-%     PG0(PGi)=PG0(PGi).*(1+normrnd(0,0.01,length(PGi),1));
-%     QG0(PVi)=QG0(PVi).*(1+normrnd(0,0.01,length(PVi),1));
-    %% 读变压器容量
-    %[noDataTransNum noDataTransCapacity noDataTransPowerFactor]=ReadNoDataTrans('C:/b/东际911_2751267_2012-09-05/iPso_东际911_2751267_2012-09-05_变压器无负载.txt');
-    noDataTransCapacity=0;
-    
-    while(abs(Gap)>Precision)
-        if KK>kmax
-            break;
-        end
-        plotGap(KK+1)=Gap;
-        Init_u=Gap/2/RestraintCount*CenterA;
-        AngleIJMat=0;
-        %% 开始计算OPF
-        %% 形成等式约束的雅克比
-        deltH=func_deltH(Busnum,Volt,PVi,Y,PGi,UAngel,r,c,Angle,Loadi);
-        %% 形成不等式约束的雅克比
-        deltG=func_deltG(Busnum,PVi,PGi,Loadi,PD,QD);
-        %%
-        L_1Z=diag(Init_Z./Init_L);
-        U_1W=diag(Init_W./Init_U);
-        %% 形成海森阵
-        deltdeltF=func_deltdeltF(PVi,wPG,wQG,wPD,wQD,ContrlCount);
-        %% 形成ddHy
-        ddh=func_ddh(Volt,Init_Y,Busnum,PVi,PGi,Y,UAngel,r,c,Angle,Loadi,ContrlCount);
-        %%  开始构建ddg
-        ddg=func_ddg(PGi,PVi,Busnum,RestraintCount,Loadi,PD,QD);
-        %%  开始构建deltF
-        deltF=func_deltF(PG,QG,PVi,PGi,wPG,wQG,wPD,wQD,PG0,QG0,PD0,PD,QD,QD0,Busnum,Loadi);
-        
-        %% 形成方程矩阵
-        Luu=Init_U'.*Init_W'+Init_u*ones(RestraintCount,1);
-        Lul=Init_L'.*Init_Z'-Init_u*ones(RestraintCount,1);
-        Mat_G=FormG(Volt,PVi,PGi,PG,QG,PD,QD,Loadi);
-        Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,QD_NON_ZERO,QD_NON_ZERO_IND,Loadi);
-        Ly=Mat_H;
-        Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD,RealPD,RealQD,Loadi,KK,PF);
-        Lw=FormLw(Mat_G,Init_U,GenU,Busnum,PVQU,PD,RealPD,RealQD,Loadi,KK,PF,noDataTransCapacity);
-        Lx=FormLx(deltF,deltH,Init_Y,deltG,Init_Z,Init_W);
-        YY=FormYY(Lul,Lz,Ly,Luu,Lw,Lx);
-        %% 开始解方程
-        fprintf('迭代次数 %d Gap %f\n',KK+1,plotGap(KK+1));
-        XX=SolveIt(deltF,deltG,Init_L,Init_Z,Init_U,Init_W,deltdeltF,ddh,ddg,deltH,Init_Y,Ly,Lz,ContrlCount,Lw,Lul,Luu,RestraintCount,Lx,Balance,PVi,PGi,Busnum,Loadi);
-        %%取各分量
-        [deltZ,deltL,deltW,deltU,deltX,deltY]=AssignXX(XX,ContrlCount,RestraintCount,Busnum);
-        [Init_Z,Init_L,Init_W,Init_U,Init_Y,PG,QG,Volt,UAngel,PD,QD]=Modification(Init_Z,Init_L,Init_W,Init_U,Init_Y,deltZ,deltL,deltW,deltU,deltX,deltY,PG,QG,Volt,UAngel,PVi,ContrlCount,Balance,Busnum,PGi,PD,QD,Loadi);
-        Gap=(Init_L*Init_Z'-Init_U*Init_W');
-        KK=KK+1;
-    end
-    fprintf('迭代次数%d\n',KK);
-    fprintf('目标值%f\n',full(ObjectiveFun(PG,PG0,PGi,QG,QG0,PVi,PD,PD0,QD,QD0,wPG,wQG,wPD,wQD,Loadi)));
-    % DrawGap(plotGap);
-    %%
-    %Volt=full(Volt');
-    %PD=full(PD);
-    %% 统计PD误差
-    % absPDLoad=abs(  (PD(Loadi)-PD0(Loadi))./PD0(Loadi)  );
-    absPDLoad=abs(  (PD(Loadi)-RealPD(Loadi))./RealPD(Loadi)  );
-    maxPDError=max(absPDLoad(absPDLoad<10))
-    Loadi(maxPDError==absPDLoad)
-    absQDLoad=abs(  (QD(Loadi)-RealQD(Loadi))./RealQD(Loadi)  );
-    maxQDError=max(absQDLoad(absQDLoad<10))
-    Loadi(maxQDError==absQDLoad)
-    disp('index');
-    %Loadi(absPDLoad==maxPDError);
-    %% 计算总线损
-    totalLoss=(sum(PG)-sum(PD(Loadi)))*100;
-    fprintf('总的损耗为%f(MW 有名值)\n',full(totalLoss));
-    fprintf('线损率为 %f\n',full(totalLoss/sum(PG)));
-    %% 计算各线损
-    %Lineloss(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Transfork0,Volt,UAngel);
-    thesis=thesis.AddPDQDPGQG(PD(Loadi),QD(Loadi),PG(Balance),QG(PVi));
-    
-end
-PD(Loadi)=thesis.MeanPD();
-QD(Loadi)=thesis.MeanQD();
-PG(Balance)=thesis.MeanPG();
-QG(PVi)=thesis.MeanQG();
-thesis.MaxDeviation(RealPG(Balance),RealQG(PVi),RealPD(Loadi),RealQD(Loadi))
-thesis.StatDeviation(RealPG(Balance),RealQG(PVi),RealPD(Loadi),RealQD(Loadi));
-toc
-
diff --git a/OPF.m b/OPF.m
index 5a67bfc..162384d 100644
--- a/OPF.m
+++ b/OPF.m
@@ -3,146 +3,95 @@ clc
 clear
 %% 存在问题
 % 变压器变比的位置没有考虑，由于现在用的变比都是1，所以没有影响。 20130123
-%% 
-thesis=ForThesis(1,45);
-for II=1:1
-    [kmax,Precision,UAngel,Volt,Busnum,PVi,PVu,Balance,Y,Angle,P0,Q0,r,c,GB,Linei,Linej,Transfori,Transforj,GenU,GenL,GenC,PG,QG,PD,QD,CenterA,PGi,PVQU,PVQL,Liner,Linex,Lineb,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0]= ...
-    pf('E:/算例/柳金Ⅰ926_21671693_2012-09-06/newFIle20 - 计算用2 - (最终用这个做20点的计算).txt');
+%%
+thesis=ForThesis(1,62);
+[kmax,Precision,UAngel,Volt,Busnum,PVi,PVu,Balance,Y,Angle,P0,Q0,r,c,GB,Linei,Linej,Transfori,Transforj,GenU,GenL,GenC,PG,QG,PD,QD,CenterA,PGi,PVQU,PVQL,Liner,Linex,Lineb,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0]= ...
+    pf('C:\lz\结题后重新计算\重构结果\78\木材厂堤Ⅰ线_2229880_2013-10-29\木材厂堤Ⅰ线_2229880_2013-10-29_iPso_newFile.txt');
 %         pf('E:\算例\柳金Ⅰ926_21671693_2012-09-06\newFIle16.txt');
-    %pf('D:\Project\青秀降损项目\最小化潮流\最小潮流算例\原始\津头站津视922（3-1）_0.5_120%.txt');
-    %pf('D:\Project\最小化潮流\最小潮流算例\仙海919.txt');
-    %pf('c:/file31.txt'); 
-    %% 计算功率因数
-    Loadi=QD~=0 | PD~=0;
-    PF=sqrt(PD(Loadi).^2./(QD(Loadi).^2+PD(Loadi).^2))
-    %%
-    Volt;
-    UAngel*180/3.1415926;
-    %% 通过潮流计算PG
-    AngleIJ=sparse(r,c,UAngel(r)-UAngel(c)-Angle',Busnum,Busnum);
-    PGBal=PD+diag(Volt)*Y.*cos(AngleIJ)*Volt';
-    QGBal=QD+diag(Volt)*Y.*sin(AngleIJ)*Volt';
-    %% 初值-即测量值
-    PG0=PG;
-    QG0=QG;
-    PD0=PD;
-    QD0=QD;
-    Volt0=Volt;
-    UAngel0=UAngel;
-    %%
-    PG0(Balance)=PGBal(Balance);
-    PG(Balance)=PGBal(Balance);
-    QG0(Balance)=QGBal(Balance);
-    QG0(PVi)=QGBal(PVi);
-    QG(PVi)=QGBal(PVi);
-    %% 真实值
-    RealPG=PG0;
-    RealQG=QG0;
-    RealPD=PD0;
-    RealQD=QD0;
-    %%
-    %PGi=zeros(1,1);
-    [Volt,UAngel,Init_Z,Init_W,Init_L,Init_U,Init_Y,PG,QG,RestraintCount,wPG,wQG,wPD,wQD,PD,PD0,QD,randPDind,Loadi]=OPF_Init(Busnum,Balance,PG,QG,Volt,GenU,GenL,PVi,PGi,PVQU,PVQL,RealPD,RealQD,QD,PD);
-    Gap=(Init_L*Init_Z'-Init_U*Init_W');
-    KK=0;
-    plotGap=zeros(1,60);
-    ContrlCount=size(Loadi,1)*2+Busnum*2;
-    kmax=60;
-    %% 20120523 临时
-    QD_NON_ZERO=QD(PD==0 & QD~=0);
-    QD_NON_ZERO_IND=find(PD==0 & QD~=0);
-    %%
-    Precision=Precision/1;
-    %% 加误差
-    PD0(Loadi)=PD0(Loadi).*(1+normrnd(0,0.05,length(Loadi),1));
-    QD0(Loadi)=QD0(Loadi).*(1+normrnd(0,0.05,length(Loadi),1));
-%     save('20PD0.mat','PD0');
-%     save('20QD0.mat','QD0');
-    load('20PD0.mat');
-    load('20QD0.mat');
-%     PG0(PGi)=PG0(PGi).*(1+normrnd(0,0.01,length(PGi),1));
-%     QG0(PVi)=QG0(PVi).*(1+normrnd(0,0.01,length(PVi),1));
-    %% 读变压器容量
-    noDataTransCapacity=0;
-    while(abs(Gap)>Precision)
-        if KK>kmax
-            break;
-        end
-        plotGap(KK+1)=Gap;
-        Init_u=Gap/2/RestraintCount*CenterA;
-        AngleIJMat=0;
-        %% 开始计算OPF
-        %% 形成等式约束的雅克比
-        deltH=func_deltH(Busnum,Volt,PVi,Y,PGi,UAngel,r,c,Angle,Loadi);
-        %% 形成不等式约束的雅克比
-        deltG=func_deltG(Busnum,PVi,PGi,Loadi,PD,QD);
-        %%
-        L_1Z=diag(Init_Z./Init_L);
-        U_1W=diag(Init_W./Init_U);
-        %% 形成海森阵
-        deltdeltF=func_deltdeltF(PVi,wPG,wQG,wPD,wQD,ContrlCount);
-        %% 形成ddHy
-        ddh=func_ddh(Volt,Init_Y,Busnum,PVi,PGi,Y,UAngel,r,c,Angle,Loadi,ContrlCount);
-        %%  开始构建ddg
-        ddg=func_ddg(PGi,PVi,Busnum,RestraintCount,Loadi,PD,QD);
-        %%  开始构建deltF
-        deltF=func_deltF(PG,QG,PVi,PGi,wPG,wQG,wPD,wQD,PG0,QG0,PD0,PD,QD,QD0,Busnum,Loadi);
-        %% 形成方程矩阵
-        Luu=Init_U'.*Init_W'+Init_u*ones(RestraintCount,1);
-        Lul=Init_L'.*Init_Z'-Init_u*ones(RestraintCount,1);
-        Mat_G=FormG(Volt,PVi,PGi,PG,QG,PD,QD,Loadi);
-        Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,QD_NON_ZERO,QD_NON_ZERO_IND,Loadi);
-        Ly=Mat_H;
-        Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD,RealPD,RealQD,Loadi,KK,PF);
-        Lw=FormLw(Mat_G,Init_U,GenU,Busnum,PVQU,PD,RealPD,RealQD,Loadi,KK,PF,noDataTransCapacity);
-        Lx=FormLx(deltF,deltH,Init_Y,deltG,Init_Z,Init_W);
-        YY=FormYY(Lul,Lz,Ly,Luu,Lw,Lx);
-        %% 开始解方程
-        fprintf('迭代次数 %d Gap %f\n',KK+1,plotGap(KK+1));
-        XX=SolveIt(deltF,deltG,Init_L,Init_Z,Init_U,Init_W,deltdeltF,ddh,ddg,deltH,Init_Y,Ly,Lz,ContrlCount,Lw,Lul,Luu,RestraintCount,Lx,Balance,PVi,PGi,Busnum,Loadi);
-        %%取各分量
-        [deltZ,deltL,deltW,deltU,deltX,deltY]=AssignXX(XX,ContrlCount,RestraintCount,Busnum);
-        [Init_Z,Init_L,Init_W,Init_U,Init_Y,PG,QG,Volt,UAngel,PD,QD]=Modification(Init_Z,Init_L,Init_W,Init_U,Init_Y,deltZ,deltL,deltW,deltU,deltX,deltY,PG,QG,Volt,UAngel,PVi,ContrlCount,Balance,Busnum,PGi,PD,QD,Loadi);
-        Gap=(Init_L*Init_Z'-Init_U*Init_W');
-        KK=KK+1;
+%pf('D:\Project\青秀降损项目\最小化潮流\最小潮流算例\原始\津头站津视922（3-1）_0.5_120%.txt');
+%pf('D:\Project\最小化潮流\最小潮流算例\仙海919.txt');
+%pf('c:/file31.txt');
+%% 计算功率因数
+Loadi=QD~=0 | PD~=0;
+PF=sqrt(PD(Loadi).^2./(QD(Loadi).^2+PD(Loadi).^2));
+%%
+Volt;
+UAngel*180/3.1415926;
+%% 通过潮流计算PG
+AngleIJ=sparse(r,c,UAngel(r)-UAngel(c)-Angle',Busnum,Busnum);
+PGBal=PD+diag(Volt)*Y.*cos(AngleIJ)*Volt';
+QGBal=QD+diag(Volt)*Y.*sin(AngleIJ)*Volt';
+%% 初值-即测量值
+PG0=PG;
+QG0=QG;
+PD0=PD;
+QD0=QD;
+Volt0=Volt;
+UAngel0=UAngel;
+%%
+PG0(Balance)=PGBal(Balance);
+PG(Balance)=PGBal(Balance);
+QG0(Balance)=QGBal(Balance);
+QG0(PVi)=QGBal(PVi);
+QG(PVi)=QGBal(PVi);
+%% 真实值
+RealPG=PG0;
+RealQG=QG0;
+RealPD=PD0;
+RealQD=QD0;
+%%
+[Volt,UAngel,Init_Z,Init_W,Init_L,Init_U,Init_Y,PG,QG,RestraintCount,wPG,wQG,wPD,wQD,PD,PD0,QD,randPDind,Loadi]=OPF_Init(Busnum,Balance,PG,QG,Volt,GenU,GenL,PVi,PGi,PVQU,PVQL,RealPD,RealQD,QD,PD);
+Gap=(Init_L*Init_Z'-Init_U*Init_W');
+KK=0;
+plotGap=zeros(1,60);
+ContrlCount=size(Loadi,1)*2+Busnum*2+Busnum;
+kmax=60;
+Precision=Precision/1;
+%% 加误差
+PD0(Loadi)=PD0(Loadi).*(1+normrnd(0,0.05,length(Loadi),1));
+QD0(Loadi)=QD0(Loadi).*(1+normrnd(0,0.05,length(Loadi),1));
+Vbi=sparse(ones(Busnum,1));
+while(abs(Gap)>Precision)
+    if KK>kmax
+        break;
     end
-    fprintf('迭代次数%d\n',KK);
-    fprintf('目标值%f\n',full(ObjectiveFun(PG,PG0,PGi,QG,QG0,PVi,PD,PD0,QD,QD0,wPG,wQG,wPD,wQD,Loadi)));
-    % DrawGap(plotGap);
+    plotGap(KK+1)=Gap;
+    Init_u=Gap/2/RestraintCount*CenterA;
+    AngleIJMat=0;
+    %% 开始计算OPF
+    %% 形成等式约束的雅克比
+    deltH=func_deltH(Busnum,Volt,PVi,Y,PGi,UAngel,r,c,Angle,Loadi);
+    %% 形成不等式约束的雅克比
+    deltG=func_deltG(Busnum,PVi,PGi,Loadi,PD,QD);
     %%
-    %Volt=full(Volt');
-    %PD=full(PD);
-    %% 统计PD误差
-    % absPDLoad=abs(  (PD(Loadi)-PD0(Loadi))./PD0(Loadi)  );
-    absPDLoad=abs(  (PD(Loadi)-RealPD(Loadi))./RealPD(Loadi)  );
-    maxPDError=max(absPDLoad(absPDLoad<10))
-    Loadi(maxPDError==absPDLoad)
-    absQDLoad=abs(  (QD(Loadi)-RealQD(Loadi))./RealQD(Loadi)  );
-    maxQDError=max(absQDLoad(absQDLoad<10))
-    Loadi(maxQDError==absQDLoad)
-    disp('index');
-    %Loadi(absPDLoad==maxPDError);
-    %% 计算总线损
-    totalLoss=(sum(PG)-sum(PD(Loadi)))*100;
-    fprintf('总的损耗为%f(MW 有名值)\n',full(totalLoss));
-    fprintf('线损率为 %f\n',full(totalLoss/sum(PG)));
-    %% 计算各线损
-    %Lineloss(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Transfork0,Volt,UAngel);
-    thesis=thesis.AddPDQDPGQG(PD(Loadi),QD(Loadi),PG(Balance),QG(PVi));
-    
+    L_1Z=diag(Init_Z./Init_L);
+    U_1W=diag(Init_W./Init_U);
+    %% 形成海森阵
+    deltdeltF=func_deltdeltF(PVi,wPG,wQG,wPD,wQD,ContrlCount);
+    %% 形成ddHy
+    ddh=func_ddh(Volt,Init_Y,Busnum,PVi,PGi,Y,UAngel,r,c,Angle,Loadi,ContrlCount);
+    %%  开始构建ddg
+    ddg=func_ddg(PGi,PVi,Busnum,RestraintCount,Loadi,PD,QD);
+    %%  开始构建deltF
+    deltF=func_deltF(PG,QG,PVi,PGi,wPG,wQG,wPD,wQD,PG0,QG0,PD0,PD,QD,QD0,Busnum,Loadi);
+    %% 形成方程矩阵
+    Luu=Init_U'.*Init_W'+Init_u*ones(RestraintCount,1);
+    Lul=Init_L'.*Init_Z'-Init_u*ones(RestraintCount,1);
+    Mat_G=FormG(Volt,PVi,PGi,PG,QG,PD,QD,Loadi,Vbi);
+    Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,Loadi);
+    Ly=Mat_H;
+    Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD,RealPD,RealQD,Loadi,KK,PF);
+    Lw=FormLw(Mat_G,Init_U,GenU,Busnum,PVQU,PD,RealPD,RealQD,Loadi,KK,PF);
+    Lx=FormLx(deltF,deltH,Init_Y,deltG,Init_Z,Init_W);
+    YY=FormYY(Lul,Lz,Ly,Luu,Lw,Lx);
+    %% 开始解方程
+    fprintf('迭代次数 %d Gap %f\n',KK+1,plotGap(KK+1));
+    XX=SolveIt(deltF,deltG,Init_L,Init_Z,Init_U,Init_W,deltdeltF,ddh,ddg,deltH,Init_Y,Ly,Lz,ContrlCount,Lw,Lul,Luu,RestraintCount,Lx,Balance,PVi,PGi,Busnum,Loadi);
+    %%取各分量
+    [deltZ,deltL,deltW,deltU,deltX,deltY]=AssignXX(XX,ContrlCount,RestraintCount,Busnum);
+    [Init_Z,Init_L,Init_W,Init_U,Init_Y,PG,QG,Volt,UAngel,PD,QD,Vbi]=Modification(Init_Z,Init_L,Init_W,Init_U,Init_Y,deltZ,deltL,deltW,deltU,deltX,deltY,PG,QG,Volt,UAngel,PVi,ContrlCount,Balance,Busnum,PGi,PD,QD,Loadi,Vbi);
+    Gap=(Init_L*Init_Z'-Init_U*Init_W');
+    KK=KK+1;
 end
-PD(Loadi)=thesis.MeanPD();
-QD(Loadi)=thesis.MeanQD();
-PG(Balance)=thesis.MeanPG();
-QG(PVi)=thesis.MeanQG();
-thesis.MaxDeviation(RealPG(Balance),RealQG(PVi),RealPD(Loadi),RealQD(Loadi))
-thesis.StatDeviation(RealPG(Balance),RealQG(PVi),RealPD(Loadi),RealQD(Loadi))
-thesis.MaxDeviation(PG0(Balance),QG0(PVi),PD0(Loadi),QD0(Loadi))
-thesis.StatDeviation(PG0(Balance),QG0(PVi),PD0(Loadi),QD0(Loadi))
-% thesis.SqareDeviation(RealPG(Balance(1)),RealQG(PVi(1)),RealPD(Loadi),RealQD(Loadi))
-thesis.SqareDeviation(PG0(Balance(1)),QG0(PVi(1)),PD0(Loadi),QD0(Loadi))
-thesis.PercentOfPass(PG0(Balance(1)),QG0(PVi(1)),PD0(Loadi),QD0(Loadi))
-thesis.MaxBranchDeviation(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0,Volt0,UAngel0,Volt,UAngel,'E:\算例\柳金Ⅰ926_21671693_2012-09-06\newFIle20.txt',PD0,QD0)
-thesis.StatBranchDeviation(Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,Transforx,Branchi,Branchg,Branchb,Transfork0,Volt0,UAngel0,Volt,UAngel)
 toc
 
diff --git a/OPFWrongDataCheck.asv b/OPFWrongDataCheck.asv
deleted file mode 100644
index 04bce85..0000000
--- a/OPFWrongDataCheck.asv
+++ /dev/null
@@ -1,106 +0,0 @@
-clc
-    
-    clear
- for II=1:16   
-     tic
-    [kmax,Precision,UAngel,Volt,Busnum,PVi,PVu,Balance,Y,Angle,P0,Q0,r,c,GB,Linei,Linej,Transfori,Transforj,GenU,GenL,GenC,PG,QG,PD,QD,CenterA,PGi,PVQU,PVQL]= ...
-        pf('D:\Project\最小化潮流\最小潮流算例\金湖924（2-1）_0.5_85%.txt');
-    %pf('c:/file31.txt');
-    %pf('ieee118PG.dat');
-    
-    %% 计算功率因数
-    atan(PD(QD~=0 | PD~=0)./QD(QD~=0 | PD~=0));
-    Volt;
-    UAngel*180/3.1415926;
-    %% 通过潮流计算PG
-    AngleIJ=sparse(r,c,UAngel(r)-UAngel(c)-Angle',Busnum,Busnum);
-    PGBal=diag(Volt)*Y.*cos(AngleIJ)*Volt';
-    
-    %% 初值-即测量值
-    PG0=PG;
-    PD0=PD;
-    
-    PDReal=PD;%真值
-    
-    %%
-    PG0(Balance)=PGBal(Balance);
-    %%
-    [Volt,UAngel,Init_Z,Init_W,Init_L,Init_U,Init_Y,PG,QG,RestraintCount,wG,wD,PD,PD0,randPDind,Loadi]=OPF_Init(Busnum,Balance,PG,QG,Volt,GenU,GenL,PVi,PGi,PVQU,PVQL,PD0,QD,PD);
-    PD0(Loadi(II))=PD0(Loadi(II))*(1+0.018);
-    Gap=(Init_L*Init_Z'-Init_U*Init_W');
-    KK=0;
-    plotGap=zeros(1,50);
-    ContrlCount=size(PVi,1)+size(PGi,1)+size(Loadi,1)+Busnum*2;
-    kmax=60;
-    %% 20120523 临时
-    QD_NON_ZERO=QD(PD==0 & QD~=0);
-    QD_NON_ZERO_IND=find(PD==0 & QD~=0);
-    %%
-    while(abs(Gap)>Precision)
-        if KK>kmax
-            break;
-        end
-        plotGap(KK+1)=Gap;
-        Init_u=Gap/2/RestraintCount*CenterA;
-        AngleIJMat=0;
-        %% 开始计算OPF
-        %% 形成等式约束的雅克比
-        deltH=func_deltH(Busnum,Volt,PVi,Y,PGi,UAngel,r,c,Angle,Loadi);
-        %% 形成不等式约束的雅克比
-        deltG=func_deltG(Busnum,PVi,PGi,Loadi);
-        %%
-        L_1Z=diag(Init_Z./Init_L);
-        U_1W=diag(Init_W./Init_U);
-        %% 形成海森阵
-        deltdeltF=func_deltdeltF(PVi,wG,wD,ContrlCount);
-        %% 形成ddHy
-        ddh=func_ddh(Volt,Init_Y,Busnum,PVi,PGi,Y,UAngel,r,c,Angle,Loadi,ContrlCount);
-        %%  开始构建ddg
-        ddg=func_ddg(PGi,PVi,Busnum,RestraintCount,Loadi);
-        %%  开始构建deltF
-        deltF=func_deltF(PG,PVi,PGi,wG,wD,PG0,PD0,PD,Busnum,Loadi);
-        
-        %% 形成方程矩阵
-        Luu=Init_U'.*Init_W'+Init_u*ones(RestraintCount,1);
-        Lul=Init_L'.*Init_Z'-Init_u*ones(RestraintCount,1);
-        Mat_G=FormG(Volt,PVi,PGi,PG,QG,PD,Loadi);
-        Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,QD_NON_ZERO,QD_NON_ZERO_IND);
-        Ly=Mat_H;
-        Lz=FormLz(Mat_G,Init_L,GenL,Busnum,PVQL,PD0,Loadi,KK);
-        Lw=FormLw(Mat_G,Init_U,GenU,Busnum,PVQU,PD0,Loadi,KK);
-        Lx=FormLx(deltF,deltH,Init_Y,deltG,Init_Z,Init_W);
-        YY=FormYY(Lul,Lz,Ly,Luu,Lw,Lx);
-        %% 开始解方程
-        XX=SolveIt(deltF,deltG,Init_L,Init_Z,Init_U,Init_W,deltdeltF,ddh,ddg,deltH,Init_Y,Ly,Lz,ContrlCount,Lw,Lul,Luu,RestraintCount,Lx,Balance,PVi,PGi,Busnum,Loadi);
-        %%取各分量
-        [deltZ,deltL,deltW,deltU,deltX,deltY]=AssignXX(XX,ContrlCount,RestraintCount,Busnum);
-        [Init_Z,Init_L,Init_W,Init_U,Init_Y,PG,QG,Volt,UAngel,PD]=Modification(Init_Z,Init_L,Init_W,Init_U,Init_Y,deltZ,deltL,deltW,deltU,deltX,deltY,PG,QG,Volt,UAngel,PVi,ContrlCount,Balance,Busnum,PGi,PD,Loadi);
-        Gap=(Init_L*Init_Z'-Init_U*Init_W');
-        KK=KK+1;
-    end
-    fprintf('迭代次数%d\n',KK);
-    ObjectiveFun(PG,PG0,PGi,PD,PD0,wG,wD,Loadi);
-    %DrawGap(plotGap);
-    %%
-    %Volt=full(Volt');
-    %PD=full(PD);
-    %% 统计PD误差
-    % absPDLoad=abs(  (PD(Loadi)-PD0(Loadi))./PD0(Loadi)  );
-    absPDLoad=abs(  (PD(Loadi)-PDReal(Loadi))./PDReal(Loadi)  );
-    maxPDError=max(absPDLoad);
-    %disp('index')
-    LoadiArray=Loadi(absPDLoad==maxPDError);
-    if length(LoadiArray)>1
-        disp('没找出')
-        Loadi(II)
-    end
-    if length(LoadiArray)==1
-        if LoadiArray~=Loadi(II)
-            disp('没找出')
-            Loadi(II)
-        end
-    end
-    toc;
-    
-end
-
diff --git a/OPF_Init.asv b/OPF_Init.asv
deleted file mode 100644
index 724c726..0000000
--- a/OPF_Init.asv
+++ /dev/null
@@ -1,34 +0,0 @@
-function [Volt,UAngel,Init_Z,Init_W,Init_L,Init_U,Init_Y,PG,QG,RestraintCount,wPG,wQG,wPD,wQD,PD,PD0,QD,randPDind,Loadi]=OPF_Init(Busnum,Balance,PG,QG,Volt,GenU,GenL,PVi,PGi,PVQU,PVQL,PD0,QD0,QD,PD)
-Loadi=find(QD~=0 | PD~=0);
-%Loadi=[1:Busnum]';
-RestraintCount=size(Loadi,1)*2+Busnum*1; %约束条件数,放开所有QD
-t_Bal_volt=Volt(Balance);
-Volt=sparse(1*ones(1,Busnum));
-Volt(Balance)=t_Bal_volt;
-UAngel=sparse(1,Busnum);
-Init_Z=sparse(ones(1,RestraintCount));
-Init_W=sparse(-1*ones(1,RestraintCount));
-Init_L=1*sparse(ones(1,RestraintCount));
-Init_U=1*sparse(ones(1,RestraintCount));
-Init_Y=sparse(1,2*Busnum);%与学姐一致
-tPU=sparse(GenU(:,2));% 发电机有功上限
-tQU=sparse(PVQU(:,1));% 无功上限
-tPL=sparse(GenL(:,2));% 发电机有功下限
-tQL=sparse(PVQL(:,1));% 无功下限
-wPG=0;
-wQG=0;
-%randInt=randperm(size(Loadi,1));
-%randPDind=randInt(1:10);
-randPDind=0;
-wPD=1/.05^2*ones(size(Loadi,1),1);
-% wPD(1:2:end)=0;
-wQD=1/.05^2*zeros(size(Loadi,1),1);
-% wQD(1:2:end)=0;
-%wD(randPDind)=0;%一些负荷不约束
-%wD(7)=0;
-% wD(11)=0;
-PD=0.5*PD0;
-%powerFacter=0.98;
-%QD=PD*sqrt((1-powerFacter^2)/powerFacter^2);
-QD=.5*QD0;
-end
\ No newline at end of file
diff --git a/OPF_Init.m b/OPF_Init.m
index 6ffb2e4..b475997 100644
--- a/OPF_Init.m
+++ b/OPF_Init.m
@@ -1,7 +1,7 @@
 function [Volt,UAngel,Init_Z,Init_W,Init_L,Init_U,Init_Y,PG,QG,RestraintCount,wPG,wQG,wPD,wQD,PD,PD0,QD,randPDind,Loadi]=OPF_Init(Busnum,Balance,PG,QG,Volt,GenU,GenL,PVi,PGi,PVQU,PVQL,PD0,QD0,QD,PD)
 Loadi=find(QD~=0 | PD~=0);
 %Loadi=[1:Busnum]';
-RestraintCount=size(Loadi,1)*2+Busnum*1; %约束条件数,放开所有QD
+RestraintCount=size(Loadi,1)*2+Busnum*2+Busnum; %约束条件数,放开所有QD
 t_Bal_volt=Volt(Balance);
 Volt=sparse(1*ones(1,Busnum));
 Volt(Balance)=t_Bal_volt;
@@ -20,15 +20,15 @@ wQG=0;
 %randInt=randperm(size(Loadi,1));
 %randPDind=randInt(1:10);
 randPDind=0;
-wPD=1/.05^2*zeros(size(Loadi,1),1);
+wPD=zeros(size(Loadi,1),1);
 wPD(1:2:end)=0;
-wQD=1/.05^2*zeros(size(Loadi,1),1);
+wQD=zeros(size(Loadi,1),1);
 wQD(1:2:end)=0;
 %wD(randPDind)=0;%一些负荷不约束
 %wD(7)=0;
 % wD(11)=0;
-PD=0.5*PD0;
+PD=0.8*PD0;
 %powerFacter=0.98;
 %QD=PD*sqrt((1-powerFacter^2)/powerFacter^2);
-QD=.5*QD0;
+QD=.8*QD0;
 end
\ No newline at end of file
diff --git a/SolveIt.asv b/SolveIt.asv
deleted file mode 100644
index dceba29..0000000
--- a/SolveIt.asv
+++ /dev/null
@@ -1,42 +0,0 @@
-function XX=SolveIt(deltF,deltG,Init_L,Init_Z,Init_U,Init_W,deltdeltF,ddh,ddg,deltH,Init_Y,Ly,Lz,ContrlCount,Lw,Lul,Luu,RestraintCount,Lx,Balance,PVi,PGi,Busnum,Loadi)
-LxComa=FormLxComa(deltF,deltG,deltH,Init_L,Luu,Lul,Init_Z,Init_Y,Lz,Init_U,Init_W,Lw,Lx);
-H=-deltdeltF+ddh;%+ddg*(Init_Z'+Init_W');
-t1=diag(Init_L.\Init_Z-Init_U.\Init_W);
-t2=-deltG*( t1 )*deltG';
-aa=[
-    (H+t2),deltH;
-    deltH',zeros(size(Init_Y,2));
-    ];
-yy=[LxComa;-Ly];
-%% 平衡节点电压不变 
-t=size(PVi,1)+size(PGi,1)+size(Loadi,1);
-aa(t+Balance,:)=0;
-aa(:,t+Balance)=0;
-%aa(t+Balance,t+Balance)=1;
-aa=aa+sparse(t+Balance,t+Balance,ones(length(Balance)),ContrlCount+2*Busnum,ContrlCount+2*Busnum);
-deltG(t+Balance,:)=0;
-%%
-t=size(PVi,1)+size(PGi,1)+size(Loadi,1)+Busnum*1;
-aa(t+Balance,:)=0;
-aa(:,t+Balance)=0;
-%aa(t+Balance,t+Balance)=1;
-aa=aa+sparse(t+Balance,t+Balance,ones(length(Balance)),ContrlCount,ContrlCount);
-deltG(t+Balance,:)=0;
-%%
-dxdy=aa\yy;
-dX=dxdy(1:ContrlCount);
-dY=dxdy(ContrlCount+1:ContrlCount+2*Busnum);
-dL=Lz+deltG'*dX;
-dU=-Lw-deltG'*dX;
-dZ=-diag(Init_L)\Lul-diag(Init_L)\diag(Init_Z)*dL;
-dW=-diag(Init_U)\Luu-diag(Init_U)\diag(Init_W)*dU;
-XX=[
-    dX;
-    dY;
-    dZ;
-    dW;
-    dL;
-    dU;
-    
-];
-end
\ No newline at end of file
diff --git a/case1V.mat b/case1V.mat
deleted file mode 100644
index d303cf982fdbcbf1aa8325a1780f1baedfb50ea4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1284
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2rkW2@J%dIFg8>$GPE)^wlX$VFfuSSRv;NLFnap(GcYjJurM%G%z1mcJNQbd2>S>5
z^9}+g6PDZDa(y&W>0^NM_ZAkN6N??<nvw)K8WlSB2=V4>lrZ_6DpPo@D9P5$VbpNc
z*u_ENfQO1J8<XhsO+LpCEBwlP*Yn@`^0}I4XLdgSSNHwRz0FxN$M4p3J{A$2>X0aV
ze5uzWlj#rVJvW+T^ITqjwn}8ZLgb(SpXdMccvl%zb$*fpcaehrTF+;!$)Df%XdIRb
zU<{4m&RW1Hp`K^Ehev7wr?dn27Dx6HNB%E~$`TEV5{-s?m~0+2bLKDwSBRcDAft0Y
zD6aYJ2G%tR+7X9eCopeIVE?v(ciUmU3TBxHzBf3T6e_r762&bJ-hRNN_khc(fVunz
zuiOL9xCgxN5A1%xyl(^hp9Att3Ia_D`Yg^IZ<_xKaIrtI<!CObkXKR=;&T#lIm|A=
zys?1ek%AnbGn2|8L64@z6L>W5eEx5yzW1=0W#*yImFs?YRUYJZ+sJq8;m>l3nUzPx
z<)qWLl%Hq)x`541)u?yR(ki!FCg<1BZbyjU_I;^v?MO*ms^T@d@-A+-zfO6F3(o8J
zRI$dXZjGq7Fn+kX<9o&q>(9~Fk~h;!eftytu8s&y(>@nzZ?Q)IyY}LL8edP!Jc*Q&
zZ58e9(YwAhvoB%({ps~O#Vf44)Ix;v4NrZ{-`wd^dwlJg1!`B6r&rDT?^Hjx%U+LT
zL)_x&cXmn|CT7<~u)Uh^`Ca_gjd`gz#0$LUWVG(NcI@00$)7tKPu;&7+mqs_7cPJ3
z-*RbpYnA7fEGhP(ZaGD|dkvfaUAGXeGjCt9e^L0FnzoBCCdOE{e(q^{x_E2xIipkk
z(`KHrJG(-|eCwH4GRnzyf2Slg1ZHnu(;X?exa+sgZk0d#uD4J5Jmr*RFK>s@CViu*
z+wZO%`Oo%#=6bKbU8ge6X|B-I@1OW|#^-MVUrc}faN%FyfARP}XQMic{))@@<JKj8
ziSAhJ<jc4?bla94#S<=0^3ExUH(Q*&>QRTroa`62Q!1Cuz4$)dKL6Rn-?x6wdgb-&
zgv6~YVIA+^zF2x&y4`NlrP9{Q6N_tNHvbfTao_obyu&?-<U2D0Ph}V$x_n&d{PE@1
zw`V-wGi^fJd)F(si`!N!X-R(6ky$HSIB$R74ey1s107wLHgA|7Si1lJiJ#d$uO2IZ
zQs3~uyEb$4<I)-W^2%E?pB%DeK0G7IZThbx=a)^me)at}e@9!N*X!Dr+*d!Pczf4}
zJ=GyAwsC&a%zfW}e6?icnib!dcS=~E=(=mQFKx+9k$Kg!&u^}{6D|9f<+m8ibUUk4
zC-&I5WwU%<X1PkHBB$fx^7BDc-zDj>KhKW+wmAO0j^11LCt62;eckrsZ_g?*pKUzn
zCjEN6VcO-?&0ii`T@~E>CGymK{jS*`<}IBv^Uf6aWt&U%K0p6`ZFNtToa}nBzb*UB
z@9Yk0`MvVjzw__d_FONi@(eKhk@U`n`3LvKi0xcUnjgQ|d?i2iALBdIjWPeGy!3Tj
z$=p@Ww?MD2Hb}nVMnYZmlhz$In{>~Mex4^@zhlXo`GKcS9c59xroDU8-7?-i73b}_
IQVr(-06^heivR!s

diff --git a/case2V.mat b/case2V.mat
deleted file mode 100644
index e823a8e3e329423d44e11b32ecc2dd34d848dc49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1284
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2rkW2@J%dIFg8>$GPE)^wlXzUFfuSSRv;NLFnap(GcYjJurM%G%z1mc*ZgX^4Eu-q
z)w+i|oa7!A*`~=QZ_WD|q;g7U;jTrB6FFvk=(xYTwnX6iT8T`#b0)p1IXUg#l_vz;
zlCHVkwvzi5XD$8AV$1i~?{ogO&%Ik5_q^Ed{`>F$?B@UeUAIo_ut6*r&t|qj!MNz-
z2I)%!r=2#`FSc}>$Jx>AH(}j>rPx3JKhOW?@&0G{O<Qkf?i&jFw<n+DKKAUsWF)uO
z0v@doRx6sM66Q#hUTFBbfziZ~drPA7iw3<HjdnRq%myrc5{-rh2U&a$@|-!yq?2eI
zaZoye*DQg%EP<bI1FOtI&U-CuH}KwTdV8Q*c7yPo#s=;khxBgn<~`u6KEV8~NxkBr
z-3|VGAIyFnur6Szd8qKC(Vpdiq6Lq81Ak+INRxs@-@)AiObZ3rjw{OeIk31K^6Y2|
z7T`53kV;bId-Tw@LSE<rkBXDf=TH03o_H5<W}5058N*<$bAlxSpGsdne){M5l$g%>
z*Ldn(JfA-`JHEGfipR0vmB#l2jO0|m<wz|`G5mb*7jH*(MH`>E!2a25zxExpJHKi5
z=iiB5b>I5TRvoRH?zZsQ{ffTW&ChS1^7GmezV4mG!K&OZy<ftvNPc~IeY2ZJ=H-lk
zX3{_Zv{Ywh3af^mE6Z}WIR5NqxY3RMuQ$%0eaX3V!HT_;`fFVSBfXTrt>@hl?R6pE
z*|UAS^0m7qbL`CA{v0T<(W`uM_2)uQ{f{i?wysU<o2k@q^zHUh=Xo9>IbCuAi)NY5
zDHeJ@Tm1T*>DOkP&(DqT-l629H_!F|-pJYK&MJm&)K}AqS)_8}YOAtP;HEntEGHLE
zon*f*n>*Q9lhfqNX|t2dk1U=nonz>5a^cNsjGu$N-aYv*_eJrZ{^c3wX)&%R_s+R9
zbMDkBOM0ti4R(8We$_10Ufwq;f_vXe1M%lcdIiTWTo0MmHNRH=-tFFO?KMnZzoK(5
zyP8gsxSKSSt4l*u|Mg=_{-8-8?@Y7q_+_rVz4c>Y_`NPwo&Ej4qkaZ2=)FJtQQ7ZS
z&R-o5Qo~apm%C5f;eKr)|NaRDp^Tq?1|-f;G*$g)e7y9?iJNyH?QHPZ+_;fX?%9Li
zm7nikZ4Z3k-5l9@`Nsbj!uRLRFNjMt>)g-!_1ji!vyHnnPtH2!zxjpheCeP2j_-4-
zefMmoyT$#e@?)=#vw8VN)QVZO#nfe*E_@`Ws+gJh@RE)9lLWc`+VknVg-Zj@dp*w3
zTzlLmvvk@ECG&UE+yXV8CsSKrZCL8$^=rqv)y+q5=to4zINE-_X8G`gtJl1pF1DdQ
zOO8B0cX+>>VSZhp=E9x!33e|3-gusQ`jzW`m(-W&Z*xk&+ZBDky~{YNqJGXSSK--?
zoPqQCMB`UYn6RZ(Yw@n<DoY9$e)$qC&v|mjNzYkElP7%o@=yJnzDDOf{^_R={|@!?
z4b(gK_laEQ#r$K%_1PvjqAY%7y_54X+s2Yq`_pq?9RDwqO!Gx|cU(`od^K*X-WS&j
z-hDUx*XFPL=3-J%tX=F_@@S3D&E$K*))B%#`85OkR-C)j_qFNstiryIn487_7~^i}
GF987MKU)z1

diff --git a/case3V.mat b/case3V.mat
deleted file mode 100644
index 38606e3b270adeab7a2afd4f8aa1016c571a239f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1284
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2rkW2@J%dIFg8>$GPE)^wK6bKFfuSSRv;NLFnap(GcYjJurM%G%z1mc*ZgX^4Eu-p
z-8;OE&VQaTaffQ<vP(~9dnZ<U9N9KY+h1JSE%0pA^vgD-k4hwZmBU<2Y<K9mPd<9*
zjL*EYF0T)s_!;-);gihj`%h*5JEwo2bN%O>^WT5(y?_3D-TwL7=M8!~&KekXyl>jV
zba>8`BU5X5KdZ$b_As;y6g;l_`0%8I|Lya?x_>%%KI~qk&^<;mkF{q!f3fC%j_+T?
z8X3V}v_bC4Lt6)H!>$D^rxq}+TEO<c*(#$!E#n~Dg*JW%_L4;97YEfYuroh6kamNq
zZG&h}g0w_4=Zq%F8O^K_O`;Kp%Wg1QA7m>#*q*?>`ye038^-DfP0SXD;%>0}J>b#%
zAozwoynwm<Lj&^zPWFS`dmak>Xwa|WnSWq;fkfYd^at!VAKDiSFf<CV928)x;b=AB
zXg{yWr1Vh2#nGgO(NKW<_(PT>jy9j4?LWI_&%@elUWa@pT+faECHK$CGwlD&(>H6U
z^n5O<|Mq&}lYI8wK`(btIiaJb6aQ=CBxlAjW&T|ng%g53ue$r(&ze8A>x5xg$F<{s
zc$-h|o0V5HU%L3W-m#-A1E+G|cz$Qntm<lG)ykQE6YCRVBnmw*G+23>zM31fcM8kZ
zrEY0T;gNr4)$f=#N#OtD<^PUYWxiX@t#fAnnVd?&D_$o>`!)ATJ*)mw5~}h%VDB3(
zo#Q_v5-(2^?l5ul%;LD{acjx<oa?Wu+}~ejWR*DI8=O<!wBqY^j%vB*dsoHS-TgCR
zQc7u9j>)z6F%x*FU%6dZXX(m!(R**|dWq-#axcX9IK|wzw3t23@8sMiOQ(Fv*Ib#j
z=+zw~jg_bCHf%ARI%&tX4bA$-nmfz9+VX#Q2rXrn>t+qt*tkt{v-hFDX5JrLf|ssP
z=Lw0^TGn#^;cbzqj^A2_>+9=gPx3h@x%SoP8}^o)@)(})N}MSfea+3&GJEa9YBSYk
zrt2I(O`W3RwON{_a*B`Zv-3|&9{j80ot3%6q0?>Go@k9%QEw{Z^mCRx>G>!)RqxL|
zlZVf2jIW%WpHXzH|4)1Vr1i(A1ulxPe00p!uCh2OEtXYPE}Xqbcmn_Z$I>}J=1o$&
zw&S|OC+kmBt#Vf^|1jfec+;M>e@k8UuKo74+JB?Ds#tZ~yxq|nnSm!?6#wX*q}2QA
z!2&I>Q-8$V^pp0cviuHnGW}L)7;x4x&sbk-t;V7ws}5Z>5wE<wb)ks(nfRKtU#aGw
z>JD$aH`~ceN>Xq=`%dolQMX@<y^H_8`j-0rz(X&5o)mr7%+&wlRo_+h@y(hQM?}0_
zK5xA>$HJ?kv2AVdi|rp`n@yGrm)54uWxqImmhrXjuNLd~IRsqky|c7UcvbuF%WLOc
zHh(D~ymVv3@64k~N&ypIU$@a!W8K_(d|p+D=c&^@KLYz^#E5UPH~Y{2-k@l`ioo}3
zrIbC-WbPeb@k0Hl)|=C_Z<)p3*?6mb_9xL(hYa@lcj-zUw6tY!cYFR}UD2t7wda()
z&Z&tl|Ct=O@tWBo@s0CuKYrG?!ys+`)84x2zB21H{>r}3U3j?gSjC*k8=L+vzFPZ_
Jl~voU8~`~fVod-5

diff --git a/caseM.mat b/caseM.mat
deleted file mode 100644
index 1dbbd7fdf86e852ef73d35ac6abc19bc592778f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1061
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2rkW2@J%dIFg8>$GPE)=w=ytSFfuSSRv;NLFnap(GcYjBWoBTgnByA6?K3%D<nO{0
z4#s!A3k_ZwS!*Bhb-C8dyLVICjvcKVS8Alb=vcwICF1EtzFY$iC)QmPb?pK)J4DzH
zbGf}L=+SCYIJH=GB|n?UgjWv^=k&Gne=#xp=)Z5yoa*=A=N7-OPcN1+Kl#`qe1Y_L
zrnmQb*vk(ET3wLizOU%}g?ZOwiORmDcZ?^M&PDv5Ex~(T#6wriZ65Dp$!F3%SF%-g
zkJcO9vfgOt&NC-+>Z_NRj%Iu)`sr|`)a}}PuT9a7{PDV5UY#@C^+3?vj{SSo<LT+X
zivJD@9&8f5+w+I%-OaenG?BMSpG6-0n{D{q{M?R{8B-@a?UVYscCM+La7k#X^WMi>
zKRn!b^jYsNYvIhR@e1|DTh<>hm>T#<`rppw6Zs!b>#R7jJ^x3D5R={Wz2!nz4t!3V
z7r+_9(X>T;;ru5nzOOv>nV)6W<3Do$IecWd$^Pa1%VH7lGcTtx{@~8)t1HSMdS8B9
z^?7-b&%y&9M^Dt*EBt>s%|>uT#>Ztnr8j%-@V)yOTh8(KY|Q-<>;8*B9+_Q#$J}$v
z%Xi_b_zTBZWQEnKFJ|94u_?B-C&l;EgQ_#(H})z&|9xNL>gu1``E!rl>C3GXTb(*Z
z({E!)sIgGL&CCsd&UDOvwL-gnee}6#;mNlzly`b8Z;cDT6gBILvDg0<SH6D?blbN{
z|L`TBivPM_57@kT&TIQ}ZA)HJ^5?~kY;HgA_vlPnc>lnbf@rRqGnY=hZo6n6zopn$
zx#rLIx9dZ<ALM;F(dp>>o@s2`?Y=tI-aOeJc=zZG{}W#ps}$_~w&uL%i>aCZz4d(m
zeyMHVvrOn$>YQq|FI!f=f5*9>DR%k3x3jW)ye=QLZBBpqeS_U6=PT#m8oc_$`|ba|
z<QTSl;a9>kb(6lNzY^-6>n{IBH*a0zxz<B$nm@vqsqWr$;Po!A*N+eK-`$X@6MCb2
zef^3ZB`twIu7_@~7d7~G-FfcIuAe`)=mq^uGZa$M5V}2CLUf<KN^D21aMthe?K3{s
zCzVxmY@B{i@Yao@A9MFr?Kr?|lT|Kq-fsWv^6yg2zR62==}#1y+7oy~HuZSAX0pls
z1<%j(NiROFeBAz<m{Ps!P0N3hi-jLuxcAR{#%re7x3MqS&xZcD?JfWQ{*BMh{HmSh
zjMuzo$`xMyWIDTbMYnO!F)qX9UB?{tCI4s|A4)1Yk=^uvx(vJ4bJ^eD!V}h(m*nbw
jtBrT9J!1d1$EE7Lzez_r`_s>x8#eZp&tu-1DP9c#I^hA!

diff --git a/caseR.mat b/caseR.mat
deleted file mode 100644
index 67c6031dfa40011a072807a62b6b2efaf5a363cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1057
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2rkW2@J%dIFg8>$GPE)=u`;w!FfuSSRv;NLFnap(GcYjBWM*KfnByA6=`)#K<lojX
zZm-2T6%RT?(%ZS510^^5J2tyd?bU1wb`)65Y7(>h<Ej;cZMU;7gn3@A3J}=YCan2@
zap@wztfe8AL9eA|+{(CjztKHr>aQC<KPKDX|G)S9zwi6XKS;I}7D%LNDE9x9|1JM6
z-LB(a?Ei-XYFX(;ZPK;Zi|yDA`5v^#n%HGHY4Fv3T)#;6q4sHs#6QU`@htN=&qlE%
zzxS?{S-7txDRHr6V(O&DF%C0wcO_Xk-H?kEN?z~g5s-G`m7HS9icL*fC-ST<RIhth
zS}Z!T_?b1wrIpWF%{KkcdysA#AnU&`QE@x(!{<+)?@B&$o%7oDpVubs|8-7=`)Fy1
z&#A`~>N74^C8rrXd7j~$x0TItt8dPQiTmGlM@MEJnfi4$^D55#cUSA;Jv5Aen!GXQ
zKVrU5;J2F4vfdbl{a60~*F5>G>Q(#wn=)np<-Xeb{dML#TK;{j%Gc|s1!euE9V52?
zI>a;Wi}&YRp=!?9J##yK-38Y@<5Us!YLSZ#U$R?9@z%OEHuIV{lvO-GdMTM>V%@!K
zAH-N*JkxFyRZzJbu>be8XRGVqt4@wvWT$S>d_E(iuIl6E^ydN}^!Z=UuorL=*%q-s
zUa%}&jOE$nbvM(mt~<=Hv3^N(#1e;!{jIXO+U^`X)LzZ3l2Tk$%ITi#G(*4NXuXQ;
z@3rSkZm-aLtyZsdRhehA*xI1L{ikDB&5JU9yS#%_%C$y+&)s(lvfA7BiGAz{&se-v
z-AiM>${GDB7T@2WOx-`%{l+BATdNx?Hl$8eb7?I|IJo6b%A@ng*IwlC77P-vui4x2
ziq+4v^2J~ELtCO_t_m?9irtp``p)VUdzJfg&L6Xr%UW6Dlxz2{+SPkR(Ifn&^UvhT
zsp)2d|1WKQ78oyj=*9;I_x<-K?}>aA@krh;_l=G39<5z-E5BMFn!3u?zfMK=Q9%Ft
ztyk(BizY4YdDVKlDfs!NKNoG^EVrG>F<pGw@8=ix7WS9?n49A|;rx}9887wLu1yct
zn|$wRayIjO;r{CptBzg%qZYnL_>9@c3Df1`=dVtD_$^^O-}}2dXL3T`yy!|em>jz5
zirw7S<*_@j<;QSr-=FOve6eQk&!Y1sxBOeKuGs5WdHb#KUv6LK^5;`^MZ8YrO^%IE
zRG-VZZQDb?TdzAWI4%F7cc`UhNByG{{|&A8r^zOMl`g)Pb?A}8cj>^A_vh5TPj~ln
ad^Y={8|_wBf4FDjLS5!cJH}J<1&jbXcjz$y

diff --git a/func_ddg.asv b/func_ddg.asv
deleted file mode 100644
index 43d283b..0000000
--- a/func_ddg.asv
+++ /dev/null
@@ -1,9 +0,0 @@
-function ddg=func_ddg(PGi,PVi,Busnum,RestraintCount,Loadi,PD,QD)
-
-ddg1=sparse(size(PVi,1)+size(PGi,1)+Loadi*2+Busnum,RestraintCount);
-t1=sparse(length(Loadi),size(PVi,1)+size(PGi,1)+Busnum)
-ddg2=sparse(length(Loadi),diag(-2./PD.^2-2*(QD.^2-PD.^2)/(PD.^2+QD.^2)));
-ddg3=diag(2*(PD.^2-QD.^2)/(PD.^2+QD.^2));
-ddg4=sparse(Busnum,RestraintCount);
-ddg=[ddg1;ddg2;ddg3;ddg4];
-end
\ No newline at end of file
diff --git a/func_ddh.m b/func_ddh.m
index 7fc87c9..8850a0c 100644
--- a/func_ddh.m
+++ b/func_ddh.m
@@ -51,6 +51,7 @@ t=[ddPdVdV+ddQdVdV,ddPdVdT+ddQdVdT;
 sizeLoadi=size(Loadi,1)*2;
 ddh=[
     sparse(sizeLoadi,ContrlCount);
-    sparse(2*Busnum,sizeLoadi),-t;
+    sparse(2*Busnum,sizeLoadi),-t,sparse(2*Busnum,Busnum);
+    sparse(Busnum,ContrlCount);
     ];
 end
\ No newline at end of file
diff --git a/func_deltF.asv b/func_deltF.asv
deleted file mode 100644
index 8fb2e42..0000000
--- a/func_deltF.asv
+++ /dev/null
@@ -1,19 +0,0 @@
-function deltF=func_deltF(PG,PVi,GenC,ContrlCount,PGi,wG,wD,PG0,PD0,PD,Busnum)
-%t1=PG(setdiff(PVi,Balance));
-% t2=Volt'*Volt;
-% t3=real(GB).*cos(AngleIJMat)+imag(GB).*sin(AngleIJMat);
-% t4=t2.*t3;
-% t5=sum(t4,2);
-% PBal=t5(Balance);
-% PPG=([PQ(1),PBal])';%暂时用土办法处理一下
-%% 
-t1=2
-t2=2*wD.*(PD-PD0);
-deltF=[
-    zeros(size(PGi));
-    zeros(size(PVi));
-    t2;
-    zeros(2*Busnum,1);
-];
-
-end
\ No newline at end of file
diff --git a/func_deltF.m b/func_deltF.m
index a6f63cf..e98aaa6 100644
--- a/func_deltF.m
+++ b/func_deltF.m
@@ -4,6 +4,7 @@ t4=2*wQD.*(QD(Loadi)-QD0(Loadi));
 deltF=[sparse(t3);
     sparse(t4);
     sparse(2*Busnum,1);
+    sparse(Busnum,1);
 ];
 
 end
\ No newline at end of file
diff --git a/func_deltG.asv b/func_deltG.asv
index 65b99ed..5355449 100644
--- a/func_deltG.asv
+++ b/func_deltG.asv
@@ -1,46 +1,34 @@
 function deltG=func_deltG(Busnum,PVi,PGi,Loadi,PD,QD)
-%%
-sizePGi=size(PGi,1);
-sizePVi=size(PVi,1);
 sizeLoadi=size(Loadi,1);
-%%
-dg1_dPg=sparse(1:sizePGi,1:sizePGi,ones(sizePGi,1),sizePGi,sizePGi);
-dg2_dPg=sparse(sizePGi,sizePVi);
-dg3_dPg=sparse(sizePGi,sizeLoadi);
-dg4_dPg=sparse(sizePGi,length(Loadi));
-dg5_dPg=sparse(sizePGi,Busnum);
-%% 
-dg1_dQr=sparse(sizePVi,sizePGi);
-dg2_dQr=sparse(1:sizePVi,1:sizePVi,ones(sizePVi,1),sizePVi,sizePVi);
-dg3_dQr=sparse(sizePVi,sizeLoadi);
-dg4_dQr=sparse(sizePVi,1);
-dg5_dQr=sparse(sizePVi,Busnum);
-%%
-dg1_dPD=sparse(size(Loadi,1),size(PGi,1));
-dg2_dPD=sparse(size(Loadi,1),size(PVi,1));
 dg3_dPD=sparse(1:size(Loadi,1),1:size(Loadi,1),ones(size(Loadi,1),1),size(Loadi,1),size(Loadi,1));
-dg4_dPD=sparse(size(Loadi,1),1);
+dg4_dPD=sparse(size(Loadi,1),length(Loadi));
 dg5_dPD=sparse(size(Loadi,1),Busnum);
+dg6_dPD=dg5_dPD;
+dg7_dPD=sparse(sizeLoadi,Busnum);
 %% 
-dg1_dQD=sparse(size(Loadi(1),1),size(PGi,1));
-dg2_dQD=sparse(size(Loadi(1),1),size(PVi,1));
-dg3_dQD=sparse(length(Loadi(1)),length(Loadi));
-dg4_dQD=sparse(1:size(Loadi(1),1),1:size(Loadi(1),1),ones(size(Loadi(1),1),1),size(Loadi(1),1),size(Loadi(1),1));
-dg5_dQD=sparse(size(Loadi(1),1),Busnum);
-
+dg3_dQD=sparse(length(Loadi),length(Loadi));
+dg4_dQD=sparse(1:size(Loadi,1),1:size(Loadi,1),ones(size(Loadi,1),1),size(Loadi,1),size(Loadi,1));
+dg5_dQD=sparse(size(Loadi,1),Busnum);
+dg6_dQD=dg5_dQD;
+dg7_dQD=sparse(sizeLoadi,Busnum);
 %% 
-dg1_dx=sparse(2*Busnum,sizePGi);
-dg2_dx=sparse(2*Busnum,sizePVi);
 dg3_dx=sparse(2*Busnum,sizeLoadi);
-dg4_dx=sparse(2*Busnum,1);
+dg4_dx=sparse(2*Busnum,length(Loadi));
 dg5_dx=[sparse(1:Busnum,1:Busnum,ones(Busnum,1),Busnum,Busnum);
     sparse(Busnum,Busnum);
     ];
-%% 
-deltG=[dg1_dPg,dg2_dPg,dg3_dPg,dg4_dPg,dg5_dPg;
-       dg1_dQr,dg2_dQr,dg3_dQr,dg4_dQr,dg5_dQr;
-       dg1_dPD,dg2_dPD,dg3_dPD,dg4_dPD,dg5_dPD;
-       dg1_dQD,dg2_dQD,dg3_dQD,dg4_dQD,dg5_dQD;
-       dg1_dx,dg2_dx,dg3_dx,dg4_dx,dg5_dx;
+dg6_dx=dg5_dx;
+dg7_dx=sparse(2*Busnum,Busnum);
+%%
+dg3_dvbi=sparse(Busnum,sizeLoadi);
+dg4_dvbi=sparse(Busnum,length(Loadi));
+dg5_dvbi=sparse(Busnum,Busnum);
+dg6_dvbi=sparse(Busnum,Busnum);
+dg6_dvbi=sparse(Busnum,Busnum);
+%%
+deltG=[dg3_dPD,dg4_dPD,dg5_dPD,dg6_dPD;
+       dg3_dQD,dg4_dQD,dg5_dQD,dg6_dQD;
+       dg3_dx,dg4_dx,dg5_dx,dg6_dx;
+       dg3_dvbi,dg4_dvbi,dg5_dvbi,dg6_dvbi;
 ];
 end
\ No newline at end of file
diff --git a/func_deltG.m b/func_deltG.m
index 230db27..ee01ea9 100644
--- a/func_deltG.m
+++ b/func_deltG.m
@@ -1,29 +1,34 @@
 function deltG=func_deltG(Busnum,PVi,PGi,Loadi,PD,QD)
-%%
-
 sizeLoadi=size(Loadi,1);
-%%
-
-
-%%
 dg3_dPD=sparse(1:size(Loadi,1),1:size(Loadi,1),ones(size(Loadi,1),1),size(Loadi,1),size(Loadi,1));
 dg4_dPD=sparse(size(Loadi,1),length(Loadi));
 dg5_dPD=sparse(size(Loadi,1),Busnum);
+dg6_dPD=dg5_dPD;
+dg7_dPD=sparse(sizeLoadi,Busnum);
 %% 
 dg3_dQD=sparse(length(Loadi),length(Loadi));
 dg4_dQD=sparse(1:size(Loadi,1),1:size(Loadi,1),ones(size(Loadi,1),1),size(Loadi,1),size(Loadi,1));
 dg5_dQD=sparse(size(Loadi,1),Busnum);
-
+dg6_dQD=dg5_dQD;
+dg7_dQD=sparse(sizeLoadi,Busnum);
 %% 
 dg3_dx=sparse(2*Busnum,sizeLoadi);
 dg4_dx=sparse(2*Busnum,length(Loadi));
 dg5_dx=[sparse(1:Busnum,1:Busnum,ones(Busnum,1),Busnum,Busnum);
     sparse(Busnum,Busnum);
     ];
-%% 
-
-deltG=[dg3_dPD,dg4_dPD,dg5_dPD;
-       dg3_dQD,dg4_dQD,dg5_dQD;
-       dg3_dx,dg4_dx,dg5_dx;
+dg6_dx=dg5_dx;
+dg7_dx=sparse(2*Busnum,Busnum);
+%%
+dg3_dvbi=sparse(Busnum,sizeLoadi);
+dg4_dvbi=sparse(Busnum,length(Loadi));
+dg5_dvbi=sparse(Busnum,Busnum);
+dg6_dvbi=sparse(Busnum,Busnum);
+dg7_dvbi=sparse(eye(Busnum,Busnum));
+%%
+deltG=[dg3_dPD,dg4_dPD,dg5_dPD,dg6_dPD,dg7_dPD;
+       dg3_dQD,dg4_dQD,dg5_dQD,dg6_dQD,dg7_dQD;
+       dg3_dx,dg4_dx,dg5_dx,dg6_dx,dg7_dx;
+       dg3_dvbi,dg4_dvbi,dg5_dvbi,dg6_dvbi,dg7_dvbi;
 ];
 end
\ No newline at end of file
diff --git a/func_deltH.asv b/func_deltH.asv
deleted file mode 100644
index 317b2f3..0000000
--- a/func_deltH.asv
+++ /dev/null
@@ -1,8 +0,0 @@
-function deltH=func_deltH(Busnum,Volt,PVi,Y,PGi,UAngel,r,c,Angle,Loadi)
-
-dH_dPg=sparse(1:size(PGi,1),PGi,ones(size(PGi,1),1),size(PGi,1),2*Busnum);
-dH_dQr=sparse(1:size(PVi,1),PVi+Busnum,ones(size(PVi,1),1),size(PVi,1),2*Busnum);
-dH_dPD=[sparse(1:size(Loadi,1),Loadi,-ones(size(Loadi,1),1),size(Loadi,1),Busnum) sparse(size(Loadi,1),Busnum)];
-dH_dx = jacobian_M3(Busnum,Volt,Y,Angle,UAngel,r,c);  %形成雅克比矩阵
-deltH=[dH_dPg;dH_dQr;dH_dPD;dH_dx'];
-end
\ No newline at end of file
diff --git a/func_deltH.m b/func_deltH.m
index e2b8401..5e411a7 100644
--- a/func_deltH.m
+++ b/func_deltH.m
@@ -2,6 +2,7 @@ function deltH=func_deltH(Busnum,Volt,PVi,Y,PGi,UAngel,r,c,Angle,Loadi)
 dH_dPD=[sparse(1:size(Loadi,1),Loadi,-ones(size(Loadi,1),1),size(Loadi,1),Busnum) sparse(size(Loadi,1),Busnum)];
 dH_dQD=[sparse(size(Loadi,1),Busnum) sparse(1:size(Loadi,1),Loadi,-ones(size(Loadi,1),1),size(Loadi,1),Busnum)];
 dH_dx = jacobian_M(Busnum,Volt,Y,Angle,UAngel,r,c);  %形成雅克比矩阵
-deltH=[dH_dPD;dH_dQD;dH_dx'];
+dH_dvbi=sparse(Busnum,2*Busnum);
+deltH=[dH_dPD;dH_dQD;dH_dx';dH_dvbi];
 
 end
\ No newline at end of file
diff --git a/func_deltdeltF.asv b/func_deltdeltF.asv
deleted file mode 100644
index 87f3a1a..0000000
--- a/func_deltdeltF.asv
+++ /dev/null
@@ -1,11 +0,0 @@
-function deltdeltF=func_deltdeltF(Busnum,PVi,PGi,wG,wD,ContrlCount)
-
-ContrlCount=size(PVi,1)+size(PGi,1)+size(wD,1)+Busnum*2; %P,Q,Volt theta这些控制变量数
-C=[wG' zeros(size(PVi))' wD'];
-sizeC=size(C,2);
-diagC=sparse(1:sizeC,1:sizeC,C,sizeC,sizeC);
-deltdeltF=[
-    diagC*2,sparse(sizeC,ContrlCount-sizeC);
-    sparse(ContrlCount-sizeC,ContrlCount);
-    ];
-end
\ No newline at end of file
diff --git a/jacobian.asv b/jacobian.asv
deleted file mode 100644
index 1056b37..0000000
--- a/jacobian.asv
+++ /dev/null
@@ -1,40 +0,0 @@
-function [Jacob,PQ,U,Uangle]=jacobian(Busnum,Balance,PVi,PVu,U,Uangle,Y,Angle,P0,Q0,r,c)   
-%**************************************************************************
-%  程序功能 : 子函数——形成雅可比矩阵Jacobian
-%  编    者： 
-%  编制时间：2010.12
-%**************************************************************************
-%% 分别求雅克比矩阵的子阵H,L,N,J及有功无功分量P,Q
-AngleIJ = Uangle(r) - Uangle(c)- Angle';
-U(PVi) = PVu;
-U(Balance)=;
-temp1= -sparse(1:Busnum,1:Busnum,U,Busnum,Busnum)*Y*sparse(1:Busnum,1:Busnum,U,Busnum,Busnum);                                                          % 计算雅克比矩阵可利用的中间变量
-temp2 = sum(temp1.*sparse(r,c,sin(AngleIJ)),2);                     
-temp3 = sum(temp1.*sparse(r,c,cos(AngleIJ)),2);
-temp4=sparse(1:Busnum,1:Busnum,temp2,Busnum,Busnum);
-temp5=sparse(1:Busnum,1:Busnum,temp3,Busnum,Busnum);
-H = temp1.*sparse(r,c,sin(AngleIJ))-temp4;
-L = temp1.*sparse(r,c,sin(AngleIJ))+temp4;
-N = temp1.*sparse(r,c,cos(AngleIJ))+temp5;
-J = -temp1.*sparse(r,c,cos(AngleIJ))+temp5;
-
-Q = Q0+temp2';                                                                              %求有功分量P
-P = P0+temp3';                                                                               %求无功分量Q
-%% 处理平衡节点和pv节点
-H(:,Balance) = 0;                                                     
-H(Balance,:) = 0;
-%H(Balance,Balance) = 100;                                                           % 平衡节点对应的对角元素置一个有限数
-H=H+sparse(Balance,Balance,ones(1,length(Balance)),Busnum,Busnum);
-L(:,PVi) = 0;
-L(PVi,:) = 0;
-L = L+sparse(PVi,PVi,ones(1,length(PVi)),Busnum,Busnum); % PV节点对应的对角元素置为1
-J(:,Balance) = 0;
-J(PVi,:) = 0;
-N(:,PVi) = 0;
-N(Balance,:) = 0; 
-Q(PVi) = 0;                                                                                       % 将pv节点的无功不平衡分量置零   
-P(Balance) = 0;                                                                               % 平衡节点的有功功率不平衡分量置零
-%% 合成PQ和雅可比矩阵
-PQ = cat(2,P,Q);                                                                             % 形成功率不平衡分量列向量
-Jacob = cat(1,cat(2,H,N),cat(2,J,L));                                            % 形成Jacobian矩阵
-end
\ No newline at end of file
diff --git a/openfile2.asv b/openfile2.asv
deleted file mode 100644
index 6d24bb0..0000000
--- a/openfile2.asv
+++ /dev/null
@@ -1,84 +0,0 @@
-function [Busnum,Balance,PQstandard,Precision,Linei,Linej,Liner,Linex,Lineb,kmax,Transfori ,...
-    Transforj,Transforr,Transforx,Transfork0,Branchi,Branchb,Pointpoweri,PG,QG,PD,QD,PVi,PVu,GenU,GenL,GenC,CenterA,PGi,PVQU,PVQL] = openfile2(FileName)
-%**************************************************************************
-%    程序简介 : 子函数——读取潮流计算所需数据
-%    编    者：
-%    编制时间 ：2010.12
-%**************************************************************************
-data = dlmread(FileName);                                           % 一次读入全部数据
-zeroRow = find(data(:,1)==0); 
-Busnum= data(1,1);                                                       % 节点数
-PQstandard = data(1,3);                                               % 基准容量
-kmax = data(1,4);                                                           %最大迭代次数
-Precision = data(1,4);                                                    % 精度
-%Balance = data(3,2);     
-Balance=data(3:zeroRow(2)-1,2);% 生成1到节点号的列向量
-%CenterA=data(1,5);  %中心参数
-%LineNum=data(1,2); %支路数
-Base=data(1,3);
-%% 各参数矩阵分块
-
-line = data(zeroRow(2)+1:zeroRow(3)-1,:);               % 形成线路参数矩阵
-ground = data(zeroRow(5)+1:zeroRow(6)-1,:);         % 形成对地支路参数矩阵
-tran = data(zeroRow(3)+1:zeroRow(4)-1,:);              % 形成变压器参数矩阵
-buspq = data(zeroRow(8)+1:zeroRow(9)-1,:);          % 形成节点功率参数矩阵
-PV = data(zeroRow(11)+1:zeroRow(12)-1,:);                % 形成pv节点功率参数矩阵
-GenP=data(zeroRow(9)+1:zeroRow(10)-1,:);
-GenQ=data(zeroRow(11)+1:zeroRow(12)-1,:);
-%% 线路参数矩阵分块
-Linei = line(:,2);                                                             % 节点i
-Linej= line(:,3);                                                              % 节点j
-Liner = line(:,4);                                                             % 线路电阻
-Linex = line(:,5);                                                            % 线路电抗
-Lineb = line(:,6);                                                            % b/2
-%% 对地支路参数矩阵
-Branchi = ground(:,2);                                                  % 对地支路节点号
-Branchb = ground(:,4);                                                 % 对地支路的导纳
-%% 变压器参数矩阵
-Transfori = tran(:,3);                                                     % 节点i
-Transforj= tran(:,4);                                                      % 节点j
-Transforr = tran(:,5);                                                     % 变压器电阻
-Transforx= tran(:,6);                                                     % 变压器电抗
-Transfork0 = tran(:,7);                                                  % 变压器变比
-%% 节点功率参数矩阵
-Pointpoweri = buspq(:,3);
-PG=buspq(:,5);                                                             % 发电机有功
-QG=buspq(:,6);                                                             % 发电机无功
-PD=buspq(:,7);                                                              % 负荷有功
-QD=buspq(:,8);                                                             % 负荷无功
-%%除以基值
-PG=PG/Base;
-QG=QG/Base;
-PD=PD/Base;
-QD=QD/Base;
-%%
-PD=sparse(PD);
-QD=sparse(QD);
-PG=sparse(PG);
-QG=sparse(QG);
-%% pv节点功率参数矩阵
-PVi = PV(:,3); % PV节点的节点号
-PVu = PV(:,5); % PV节点电压
-PVQL=PV(:,6);%PV节点无功下限
-PVQL=PVQL/Base;
-PVQU=PV(:,7); %PV节点无功上限
-PVQU=PVQU/Base;
-%% 发电机参数
-%GenU=Gen(:,[1 5 6]);
-%GenL=Gen(:,[1 7 8]);
-GenC=GenP(:,[3 7:9]);
-t=GenC(:,2);
-GenC(:,2)=GenC(:,4);
-GenC(:,4)=t;
-%%%%%%%%%%%%%%%%%%%%
-%GenC(:,2:4)=100*GenC(:,2:4);
-t=GenP(:,[3 5]);
-%GenL=[t,PVQL(PVi)];
-GenL=t;%有功下界
-GenL(:,2)=GenL(:,2)/Base;
-t=GenP(:,[3 6]);
-%GenU=[t,PVQU(PVi)];
-GenU=t;%有功上届
-GenU(:,2)=GenU(:,2)/Base;
-PGi=GenP(:,3);%发电机节点号
-end
\ No newline at end of file
diff --git a/pf.asv b/pf.asv
deleted file mode 100644
index 575e701..0000000
--- a/pf.asv
+++ /dev/null
@@ -1,34 +0,0 @@
-function [kmax,Precision,Uangle,U,Busnum,PVi,PVu,Balance,Y,Angle,P0,Q0,r,c,GB,Linei,Linej,Transfori,Transforj,GenU,GenL,GenC,PG,QG,PD,QD,CenterA,PGi,PVQU,PVQL]=pf(FileName)
-%**************************************************************************
-%    程序名称：电力系统潮流计算程序
-%    程序算法：极坐标下的牛顿-拉夫逊法
-%    程序功能：主函数
-%    程序编者：
-%    编制时间：2010.12
-%**************************************************************************
-clc;
-tic;
-%% 读取数据文件
-[Busnum,Balance,PQstandard,Precision,Linei,Linej,Liner,Linex,Lineb,kmax,Transfori ,...
-    Transforj,Transforr,Transforx,Transfork0,Branchi,Branchb,Pointpoweri,PG,QG,PD,QD,PVi,PVu,GenU,GenL,GenC,CenterA,PGi,PVQU,PVQL]= openfile(FileName);
-%% 形成节点导纳矩阵
-[GB,Y,r,c,Angle] = admmatrix(Busnum,Linei,Linej,Liner,Linex,Lineb,Transfori,Transforj,Transforr,...
-    Transforx,Transfork0,Branchi,Branchb);
-[P0,Q0,U,Uangle] = Initial(PG,PD,PQstandard,Pointpoweri,QG,QD,Busnum);                         %求功率不平衡量
-disp('迭代次数i  最大不平衡量');
-%% 循环体计算
-for i = 0:kmax
-    [Jacob,PQ,U,Uangle] = jacobian(Busnum,Balance,PVi,PVu,U,Uangle,Y,Angle,P0,Q0,r,c);  %形成雅克比矩阵
-   % disp('第一次雅克比');
-    m = max(abs(PQ));
-    m=full(m);
-    fprintf('       %u         %.8f \n',i,m);
-    if m > Precision                                                                                                                                 %判断不平衡量是否满足精度要求
-        [Uangle,U] = solvefun(Busnum,Jacob,PQ,Uangle,U);                                                           %求解修正方程，更新电压变量
-    else
-        disp(['收敛，迭代次数为',num2str(i),'次']);
-        break                                                                                                                                             %若满足精度要求，则计算收敛
-    end
-end
-toc;
-end
\ No newline at end of file
diff --git a/plotVolt.asv b/plotVolt.asv
deleted file mode 100644
index 84e68f8..0000000
--- a/plotVolt.asv
+++ /dev/null
@@ -1,26 +0,0 @@
-%% 画电压，为了写论文用
-load('case1V.mat');
-CV1=Volt;
-load('case2V.mat');
-CV2=Volt;
-load('case3V.mat');
-CV3=Volt;
-load('caseR.mat');
-CVR=Volt;
-load('caseM.mat');
-CVM=Volt;
-subplot(3,2,1)
-hist(CVR)
-title('真实值')
-
-
-subplot(2,2,3)
-hist(CV1)
-title('Case 1')
-subplot(2,2,4)
-hist(CV2)
-title('Case 2')
-subplot(2,2,5)
-hist(CV3)
-title('Case 3')
-
diff --git a/plotVolt.m b/plotVolt.m
index 895db0a..adf5a27 100644
--- a/plotVolt.m
+++ b/plotVolt.m
@@ -5,6 +5,8 @@ load('case2V.mat');
 CV2=Volt;
 load('case3V.mat');
 CV3=Volt;
+load('case4V.mat');
+CV4=Volt;%负荷曲线偏差大
 load('caseR.mat');
 CVR=Volt;
 load('caseM.mat');
@@ -23,18 +25,22 @@ subplot(3,2,3)
 hist(CV1)
 xlabel('电压/p.u');
 ylabel('数量/个');
-title('情形1电压分布')
+title('100%可知情形电压分布')
 subplot(3,2,4)
 hist(CV2)
 xlabel('电压/p.u');
 ylabel('数量/个');
-title('情形2电压分布')
+title('50%可知情形电压分布')
 subplot(3,2,5)
 hist(CV3)
 xlabel('电压/p.u');
 ylabel('数量/个');
-title('情形3电压分布')
-
+title('始端覆盖情形电压分布')
+subplot(3,2,6)
+hist(CV4)
+xlabel('电压/p.u');
+ylabel('数量/个');
+title('典型负荷曲线偏差大情形电压分布')
 
 % figure()
 % hold on