From 56724685da212cf881b60482af14de3b4066de10 Mon Sep 17 00:00:00 2001
From: facat <dugg@21cn.com>
Date: Wed, 17 Apr 2013 16:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BA=86=E7=94=B5=E5=8E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat <dugg@21cn.com>
---
 @Opti/equ.asv | 22 ++++++++++++++++------
 @Opti/equ.m   |  7 +++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/@Opti/equ.asv b/@Opti/equ.asv
index 7abd80b..2c640b2 100644
--- a/@Opti/equ.asv
+++ b/@Opti/equ.asv
@@ -1,4 +1,4 @@
-function [ output_args,this ] = equ( this )
+function [ output_args,this ] = equ( this,x )
 %EQU Summary of this function goes here
 %   Detailed explanation goes here
 PDi=this.PDi;
@@ -9,19 +9,29 @@ r=this.r;
 c=this.c;
 PG=this.PG;
 QG=this.QG;
+Balance=this.Balance;
+Y=this.Y;
 PD=x(1:length(PDi));
 QD=x(length(PDi)+1:length(PDi)+length(QDi));
 Volt=x(length(PDi)+length(QDi)+1:length(PDi)+length(QDi)+length(Volt0));
-VAngel=x(length(PDi)+length(QDi)+length(Volt0):end);
-PD_=zeros(PD,length(Volt0));
-QD_=zeros(QD,length(Volt0));
+VAngel=x(length(PDi)+length(QDi)+length(Volt0)+1:end);
+PD_=zeros(length(Volt0),1);
+QD_=zeros(length(Volt0),1);
 PD_(PDi)=PD;
 QD_(QDi)=QD;
 busNum=length(Volt0);
 VMatrix=sparse(r,c,VAngel(r)-VAngel(c)-Angel,busNum,busNum);
 dP=PG-PD_-diag(Volt)*(Y.*cos(VMatrix))*Volt;
 dQ=QG-QD_-diag(Volt)*(Y.*spfun(@sin,VMatrix))*Volt;
-output_args=[dP;dQ];
-this.gle=ze
+output_args=[dP;dQ;VAngel(Balance)];
+%% 开始增加不等式约束-电压\PD\QD
+%电压不等式约束
+output_args=[output_args;Volt];
+output_args=full(output_args);
+this.cu=zeros(length(output_args),1);
+this.cl=this.cu;
+%电压
+this.cu=[this.cu;1.1];
+this.cl=this.cu;
 end
 
diff --git a/@Opti/equ.m b/@Opti/equ.m
index b0a7ad5..9bfc42b 100644
--- a/@Opti/equ.m
+++ b/@Opti/equ.m
@@ -26,9 +26,12 @@ dQ=QG-QD_-diag(Volt)*(Y.*spfun(@sin,VMatrix))*Volt;
 output_args=[dP;dQ;VAngel(Balance)];
 %% 开始增加不等式约束-电压\PD\QD
 %电压不等式约束
-
-output_args=full(output_args);
 this.cu=zeros(length(output_args),1);
 this.cl=this.cu;
+output_args=[output_args;Volt];
+output_args=full(output_args);
+%电压
+this.cu=[this.cu;1.1*ones(length(Volt),1)];
+this.cl=[this.cl;0.9*ones(length(Volt),1)];
 end