From 224611b051e5d1ff8a02c02797bf5b1de521d8db Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Mon, 18 May 2015 21:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E6=94=B9=E6=88=90=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E9=98=B6=E5=AF=BC=E7=9A=84=E5=BD=A2=E5=BC=8F?=
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 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OPF.m b/OPF.m
index 40c3bf0..8875311 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('feeder13\lineParameter.txt');
+lineZ=readLineZ('.\..\DistributionNetwork-Power2Current\modified-feeder69\lineParameter.txt');
 [ fsY0, fsY1, fsY2,phaseASpotLoadP,phaseBSpotLoadP,phaseCSpotLoadP ...
     phaseASpotLoadQ,phaseBSpotLoadQ,phaseCSpotLoadQ,setIJ,nodeNum,Balance,phaseABCY ...
-    cap]=dataRead(lineZ,'feeder13\data1.txt');
+    cap]=dataRead(lineZ,'.\..\DistributionNetwork-Power2Current\modified-feeder69\data.txt');
 % phaseASpotLoadP(phaseASpotLoadP==0)=0.002;
 % phaseBSpotLoadP(phaseBSpotLoadP==0)=0.002;
 % phaseCSpotLoadP(phaseCSpotLoadP==0)=0.002;
@@ -220,7 +220,7 @@ 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));
@@ -268,8 +268,10 @@ while(maxD>Precision)
     %%
     %% 形成海森阵
     deltdeltF=func_deltdeltF(wVolt,wPD,wQD,ContrlCount,Loadi);
+%     deltdeltF=zeros(size(deltdeltF));
     %% 形成ddHy
     ddh=func_ddh(Volt,Init_Y,Busnum,Y,UAngel,r,c,Yangle,Loadi,ContrlCount);
+%     ddh=zeros(size(ddh));
     %%  开始构建ddg
     %%  开始构建deltF
     deltF=func_deltF(wVolt,wPD,wQD,mPD3P,PD3P,QD3P,mQD3P,Volt,mVoltABCV,Busnum,Loadi);