From 82a88a7ec063a3ae591bc2234c62700a9145b433 Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Thu, 14 May 2015 21:46:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E7=94=B5=E6=B5=81?=
 =?UTF-8?q?=E6=96=B9=E5=B7=AE=E8=AE=A1=E7=AE=97=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 OPF.m | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/OPF.m b/OPF.m
index 4e17a37..40c3bf0 100644
--- a/OPF.m
+++ b/OPF.m
@@ -3,10 +3,10 @@ function [JMeasurement,AME_Volt,AME_VAngle,AME_PD,AME_QD,AME_mVolt,AME_mPD,AME_m
 tic
 clc
 clear
-lineZ=readLineZ('feeder104\lineParameter.txt');
+lineZ=readLineZ('feeder13\lineParameter.txt');
 [ fsY0, fsY1, fsY2,phaseASpotLoadP,phaseBSpotLoadP,phaseCSpotLoadP ...
     phaseASpotLoadQ,phaseBSpotLoadQ,phaseCSpotLoadQ,setIJ,nodeNum,Balance,phaseABCY ...
-    cap]=dataRead(lineZ,'feeder104\data1.txt');
+    cap]=dataRead(lineZ,'feeder13\data1.txt');
 % phaseASpotLoadP(phaseASpotLoadP==0)=0.002;
 % phaseBSpotLoadP(phaseBSpotLoadP==0)=0.002;
 % phaseCSpotLoadP(phaseCSpotLoadP==0)=0.002;
@@ -210,19 +210,6 @@ rQD3P(2:3:end)=phaseBSpotLoadQ;
 rQD3P(3:3:end)=phaseCSpotLoadQ;
 rPD3P=rPD3P(Loadi);
 rQD3P=rQD3P(Loadi);
-%量测量
-sigma=0.03;
-VoltSigma=(1+normrnd(0,sigma,length(rVoltABCV),1));
-mVoltABCV=rVoltABCV.*VoltSigma;
-PD3PSigma=(1+normrnd(0,sigma,length(rPD3P),1));
-mPD3P=rPD3P.*PD3PSigma;
-QD3PSigma=(1+normrnd(0,sigma,length(rQD3P),1));
-mQD3P=rQD3P.*QD3PSigma;
-%量测方差
-wVolt=1./(abs(mVoltABCV*sigma).^2);
-wPD=1./(abs(mPD3P*sigma).^2);
-wQD=1./(abs(mQD3P*sigma).^2);
-
 %% 没有量测量
 % noLoadi=[1,5,6,10,11];
 noLoadi=[1,8,10,12];
@@ -233,7 +220,22 @@ noPQi3P=zeros(length(noLoadi)*3,1);
 noPQi3P(1:3:end)=(noLoadi-1)*3+1;
 noPQi3P(2:3:end)=(noLoadi-1)*3+2;
 noPQi3P(3:3:end)=(noLoadi-1)*3+3;
-% noPQi3P=Loadi;
+noPQi3P=Loadi;
+%量测量
+sigma=0.03;
+VoltSigma=(1+normrnd(0,sigma,length(rVoltABCV),1));
+mVoltABCV=rVoltABCV.*VoltSigma;
+PD3PSigma=(1+normrnd(0,sigma,length(rPD3P),1));
+mPD3P=rPD3P.*PD3PSigma;
+QD3PSigma=(1+normrnd(0,sigma,length(rQD3P),1));
+mQD3P=rQD3P.*QD3PSigma;
+mPD3P(ismember(Loadi,noPQi3P))=mPD3P(ismember(Loadi,noPQi3P)).*(1+normrnd(0,0.15,length(noPQi3P),1));
+mQD3P(ismember(Loadi,noPQi3P))=mQD3P(ismember(Loadi,noPQi3P)).*(1+normrnd(0,0.15,length(noPQi3P),1));
+%量测方差
+wVolt=1./(abs(mVoltABCV*sigma).^2);
+wPD=1./(abs(mPD3P*.15).^2);
+wQD=1./(abs(mQD3P*.15).^2);
+
 wVolt(setdiff(1:length(wVolt),Loadi))=0;%只有负荷处才有电压量测。
 wVolt( noPQi3P)=0;
 wPD(ismember( Loadi,noPQi3P))=0;