From 5a752ca4fb309b7b42a2b56971312e9338641a1d Mon Sep 17 00:00:00 2001
From: "dugg@lab-desk" <dugg@lab-desk>
Date: Tue, 10 Feb 2015 15:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=B5=E5=8E=8B=E5=B9=85?=
 =?UTF-8?q?=E5=80=BC=E4=B8=8B=E9=99=8D=E9=94=99=E8=AF=AF=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dugg@lab-desk <dugg@lab-desk>
---
 OPF.m    | 15 ++++++++++-----
 subOPF.m |  8 +++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/OPF.m b/OPF.m
index ece53b5..26ddf60 100644
--- a/OPF.m
+++ b/OPF.m
@@ -43,7 +43,7 @@ for badDataNode=1:1
         %         badDataResult(I,badDataNode)=sum(Vbi);
         %         badDataLocation(1:33,I)=Vbi;
         %         badDataLocation(34,I)=sum(abs((rVolt-Volt)./rVolt./length(rVolt)))+sum(abs( (UAngel(2:33)-rUAngel(2:33))./rUAngel(2:33)./length(rUAngel(2:33))));
-                break;
+%                 break;
         if isConverge==0
             continue;
         end
@@ -56,10 +56,15 @@ for badDataNode=1:1
         if maxDVAngle_>maxDVAngle
             maxDVAngle=maxDVAngle_;
         end
-        
-        if loopN>=1
-            nodeMaxDVolt(badDataNode)=maxDVolt;
-            nodeMaxDVAngle(badDataNode)=maxDVAngle;
+        nodeMaxDVolt_t=abs((rVolt-Volt))';
+        nodeMaxDVAngle_t=abs((UAngel-rUAngel))';
+        nodeMaxDVolt_t([1:18,23:33])=0;
+        nodeMaxDVAngle_t([1:18,23:33])=0;
+        nodeMaxDVolt(nodeMaxDVolt<nodeMaxDVolt_t)=nodeMaxDVolt_t(nodeMaxDVolt<nodeMaxDVolt_t);
+        nodeMaxDVAngle(nodeMaxDVAngle<nodeMaxDVAngle_t)=nodeMaxDVAngle_t(nodeMaxDVAngle<nodeMaxDVAngle_t);
+        if loopN>=500
+%             nodeMaxDVolt(badDataNode)=maxDVolt;
+%             nodeMaxDVAngle(badDataNode)=maxDVAngle;
             break;
         end
 
diff --git a/subOPF.m b/subOPF.m
index 04a2667..9beec7b 100644
--- a/subOPF.m
+++ b/subOPF.m
@@ -49,7 +49,7 @@ Gap=(Init_L*Init_Z'-Init_U*Init_W');
 KK=0;
 plotGap=zeros(1,60);
 ContrlCount=size(Loadi,1)*2+Busnum*2+Busnum+length(Loadi)*2;
-kmax=350;
+kmax=170;
 Precision=Precision/1;
 %% ¼ÓÎó²î
 %ÕÒDG
@@ -99,6 +99,12 @@ lQD(noMeasurei)=0.15*mQD(noMeasurei);
 uQD(noMeasurei)=0.15*mQD(noMeasurei);
 
 
+% lPD(22)=0.17*mPD(22);%15%
+% uPD(22)=0.17*mPD(22);
+% lQD(22)=0.17*mQD(22);
+% uQD(22)=0.17*mQD(22);
+
+
 %µçѹαÁ¿²â´íÎó
 mVolt(noMeasurei)=.95;