From 8990b8a27891dc77c8f35e23920c8007c0e73cc8 Mon Sep 17 00:00:00 2001
From: facat <dugg@21cn.com>
Date: Sat, 6 Apr 2013 21:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0PD=E5=92=8CQD=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat <dugg@21cn.com>
---
 Run_YALMIP.m | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Run_YALMIP.m b/Run_YALMIP.m
index cedc12d..52e881a 100644
--- a/Run_YALMIP.m
+++ b/Run_YALMIP.m
@@ -31,7 +31,6 @@ dPD=abs(dP./PD);
 dQ=QG-QD-diag(Volt)*Y.*sin(AngleIJ)*Volt';
 dQD=abs(dQ./QD);
 maxdPQ=max([dPD(dPD<10);dQD(dQD<10)]);
-
 [Volt,UAngel,Init_Z,Init_W,Init_L,Init_U,Init_Y,PG,QG,RestraintCount,wPG,wQG,wPD,wQD,PD,PD0,QD,randPDind,Loadi,notLoadi]=OPF_Init(Busnum,Balance,PG,QG,Volt,GenU,GenL,PVi,PGi,PVQU,PVQL,PD0,QD0,QD,PD);
 %% 定义变量
 BalVolt=Volt(Balance);
@@ -50,8 +49,6 @@ assign(Volt(:),1);
 assign(UAngel(:),0);
 assign(PD(:),PD0(:));
 assign(QD(:),QD0(:));
-% assign(PG(:),PG0(:));
-% assign(QG(:),QG0(:));
 %% YALMIP部分
 dP=PG0-PD-diag(Volt)*Y.*cos( sparse(r,c,UAngel(r)-UAngel(c)-Angle,Busnum,Busnum) )*Volt;
 dQ=QG0-QD-diag(Volt)*Y.*sin( sparse(r,c,UAngel(r)-UAngel(c)-Angle,Busnum,Busnum) )*Volt;
@@ -64,7 +61,10 @@ Constraints = [%AngleIJ-sparse(r,c,UAngel(r)-UAngel(c)-Angle,Busnum,Busnum)==0,
      PD(PD0==0)==0, ...
      QD(QD0==0)==0, ...
     0.9*ones(Busnum,1)<=Volt<=1.1*ones(Busnum,1), ...
-    Volt(Balance)==BalVolt;
+    Volt(Balance)==BalVolt, ...
+    UAngel(Balance)==0, ...
+    0.8*PD0<=PD<=1.2*PD0;
+    0.8*QD0<=QD<=1.2*QD0;
     ];
 options = sdpsettings('verbose',2,'showprogress',1,'debug',0,'solver','ipopt','usex0','1');
 sol = solvesdp(Constraints,Objective,options);
@@ -75,7 +75,6 @@ if sol.problem == 0
     dVangle=double(UAngel)
     fprintf('ojb\n');
     optimalObj=double(Objective)
-    double(PG)-PG0;
     sol
 else
     display('Hmm, something went wrong!');