From 7ded1380663788614d3f372925978cc94689a2c6 Mon Sep 17 00:00:00 2001
From: facat <dugg@21cn.com>
Date: Mon, 21 Jan 2013 18:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E5=86=99=E8=AE=BA=E6=96=87?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=88=E6=94=B9=E4=B8=BA=E7=94=A8=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=80=BC=E6=AD=A3=E8=B4=9F20%=E4=BD=9C=E4=B8=BA=E8=B4=9F?=
 =?UTF-8?q?=E8=8D=B7=E4=B8=8D=E7=AD=89=E5=BC=8F=E7=BA=A6=E6=9D=9F=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E9=99=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FormLw.asv | 33 +++++++++++++++++++++------------
 FormLw.m   | 16 ++++++++--------
 FormLz.m   | 10 +++++-----
 OPF.m      |  3 ++-
 4 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/FormLw.asv b/FormLw.asv
index 5dd6cf0..987b6ee 100644
--- a/FormLw.asv
+++ b/FormLw.asv
@@ -1,15 +1,24 @@
-function Lw=FormLw(Mat_G,Init_U,GenU,Busnum,PVQU,PD0,Loadi,KK)
-%KK=999;
-PU=1*GenU(:,2);%发电机有功上界
-QU=PVQU(:,1);%发电机无功上界
-%VoltU=(1.5+1/exp(KK))*ones(1,Busnum);
-VoltU=1.5*ones(1,Busnum);
-PDU=PD0(Loadi);
-% PDU(PDU>0)=1200*PDU(PDU>0);
-% PDU(PDU<0)=-800*PDU(PDU<0);
-% PDU(PDU==0)=200;
-PDU=1000000*ones(length(Loadi),1);
-t1=([PU',QU',PDU',VoltU])';
+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;
 
diff --git a/FormLw.m b/FormLw.m
index 9f1a10d..d4811a9 100644
--- a/FormLw.m
+++ b/FormLw.m
@@ -6,18 +6,18 @@ PU=5*ones(length(GenU(:,2)),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=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;
+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;
diff --git a/FormLz.m b/FormLz.m
index a17b92d..4229485 100644
--- a/FormLz.m
+++ b/FormLz.m
@@ -11,11 +11,11 @@ PDL(PDL>0)=0.800*PDL(PDL>0);
 PDL(PDL<0)=1.200*PDL(PDL<0);
 PDL(PDL==0)=-0.400;
 %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.200;
-QDL=0*PD(Loadi).*sqrt((1-PF.^2))./PF;
+QDL=QD0(Loadi);
+QDL(QDL>0)=0.800*QDL(QDL>0);
+QDL(QDL<0)=1.200*QDL(QDL<0);
+QDL(QDL==0)=-0.200;
+% QDL=0*PD(Loadi).*sqrt((1-PF.^2))./PF;
 t1=([PL',QL',PDL',QDL',VoltL])';
 t2=Mat_G-Init_L'-t1;
 Lz=t2;
diff --git a/OPF.m b/OPF.m
index a6d1cf6..79e8e75 100644
--- a/OPF.m
+++ b/OPF.m
@@ -51,7 +51,8 @@ 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');
+%[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;