From a0a0d45e7d13fbccf9b1bdfa15e5ca5eb0e85c27 Mon Sep 17 00:00:00 2001
From: "dugg@lab-desk" <dugg@lab-desk>
Date: Sat, 19 Jul 2014 16:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E7=9C=9F=E5=AE=9E=E7=9A=84?=
 =?UTF-8?q?=E8=AF=AF=E5=B7=AE=EF=BC=8C=E6=94=B6=E6=95=9B=E4=BA=86=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 | 14 +++++++-------
 OPF.m   | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/FormG.m b/FormG.m
index bed78fe..8a36468 100644
--- a/FormG.m
+++ b/FormG.m
@@ -1,12 +1,12 @@
-function Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD,uPD,lPD)
+function Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD,uPD,lPD,uQD,lQD,uVolt,lVolt)
 
 Mat_G=[
-    sparse(PD(Loadi))-mPD(Loadi)-bigM*PDbi-0.1;
-    sparse(PD(Loadi))-mPD(Loadi)+bigM*PDbi+0.1;
-    sparse(QD(Loadi))-mQD(Loadi)-bigM*QDbi-0.1;
-    sparse(QD(Loadi))-mQD(Loadi)+bigM*QDbi+0.1;
-    Volt'-mVolt'-bigM*Vbi-0.03;
-    Volt'-mVolt'+bigM*Vbi+0.03;
+    sparse(PD(Loadi))-mPD(Loadi)-bigM*PDbi-uPD(Loadi);
+    sparse(PD(Loadi))-mPD(Loadi)+bigM*PDbi+lPD(Loadi);
+    sparse(QD(Loadi))-mQD(Loadi)-bigM*QDbi-uQD(Loadi);
+    sparse(QD(Loadi))-mQD(Loadi)+bigM*QDbi+lQD(Loadi);
+    Volt'-mVolt'-bigM*Vbi-uVolt;
+    Volt'-mVolt'+bigM*Vbi+lVolt;
     Vbi;
     PDbi;
     QDbi;
diff --git a/OPF.m b/OPF.m
index 9d3a654..6d89747 100644
--- a/OPF.m
+++ b/OPF.m
@@ -60,10 +60,10 @@ lPD=RealPD*(1-3*sigma);
 uPD=RealPD*(1+3*sigma);
 lQD=RealQD*(1-3*sigma);
 uQD=RealQD*(1+3*sigma);
-lVolt=rVolt*(1-3*sigma);
-uVolt=rVolt*(1+3*sigma);
+lVolt=rVolt'*(1-3*sigma);
+uVolt=rVolt'*(1+3*sigma);
 %错误数据
-mVolt(2)=5;
+%mVolt(2)=5;
 bigM=10;
 Vbi=sparse(0.5*ones(Busnum,1));
 PDbi=sparse(0.5*ones(length(Loadi),1));
@@ -97,7 +97,7 @@ while(abs(Gap)>Precision*1)
     %% 形成方程矩阵
     Luu=Init_U'.*Init_W'+Init_u*ones(RestraintCount,1);
     Lul=Init_L'.*Init_Z'-Init_u*ones(RestraintCount,1);
-    Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD,uPD,lPD);
+    Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD,uPD,lPD,uQD,lQD,uVolt,lVolt);
     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,eps);
@@ -144,7 +144,7 @@ while(abs(Gap)>Precision*1)
     %% 形成方程矩阵
     Luu=Init_U'.*Init_W'+Init_u*ones(RestraintCount,1);
     Lul=Init_L'.*Init_Z'-Init_u*ones(RestraintCount,1);
-    Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD);
+    Mat_G=FormG(Volt,PD,QD,Loadi,bigM,mVolt,rVolt,sigma,Vbi,PDbi,QDbi,mPD,mQD,uPD,lPD,uQD,lQD,uVolt,lVolt);
     Mat_H=FormH(Busnum,Volt,PG,PD,QG,QD,Y,UAngel,r,c,Angle,Loadi);
     Ly=Mat_H;
     if KK>8