From a09d642080ae4a737dd7716b5dae7e9217fa53b2 Mon Sep 17 00:00:00 2001
From: "dugg@lab-desk" <dugg@lab-desk>
Date: Thu, 12 Feb 2015 21:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E8=A1=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/AngelBar.m b/AngelBar.m
index af9d8d0..c0d7a90 100644
--- a/AngelBar.m
+++ b/AngelBar.m
@@ -7,7 +7,7 @@ function createfigure(xvector1, yvector1, xvector2, yvector2, xvector3, yvector3
 %  XVECTOR3:  bar xvector
 %  YVECTOR3:  bar yvector
 
-%  Auto-generated by MATLAB on 11-Feb-2015 17:24:27
+%  Auto-generated by MATLAB on 12-Feb-2015 13:48:54
 
 % Create figure
 figure1 = figure('Name','相角直方图','Color',[1 1 1]);
@@ -27,7 +27,7 @@ hold(axes1,'all');
 bar(xvector1,yvector1,'FaceColor',[0 0 0],'Parent',axes1);
 
 % Create xlabel
-xlabel('误差/弧度','FontSize',13);
+xlabel('偏差/rad','FontSize',13);
 
 % Create ylabel
 ylabel('数量','FontSize',13);
@@ -50,7 +50,7 @@ hold(axes2,'all');
 bar(xvector2,yvector2,'FaceColor',[0 0 0],'Parent',axes2);
 
 % Create xlabel
-xlabel('误差/弧度','FontSize',13);
+xlabel('偏差/rad','FontSize',13);
 
 % Create title
 title('情形B','FontSize',13);
@@ -73,7 +73,7 @@ hold(axes3,'all');
 bar(xvector3,yvector3,'FaceColor',[0 0 0],'Parent',axes3);
 
 % Create xlabel
-xlabel('误差/弧度','FontSize',13);
+xlabel('偏差/rad','FontSize',13);
 
 % Create ylabel
 ylabel('数量','FontSize',13);
diff --git a/OPF.m b/OPF.m
index 82372b3..f56dcf3 100644
--- a/OPF.m
+++ b/OPF.m
@@ -36,7 +36,7 @@ for badDataNode=1:1
         mVolt=load('mVolt');
         mVolt=mVolt.mVolt;
         
-%         mVolt(badDataNode)=rVolt(badDataNode)*(1-sigma*6);
+%         mVolt(3)=rVolt(3)*(1-sigma*6);
         %% 画Case A的图
         % figure('Color',[1 1 1]);
         [Busnum,Loadi,Volt,PD,QD,rVolt,UAngel,RealPD,RealQD,rUAngel,Vbi,PDbi,QDbi,plotGapA,isConverge]=subOPF([],PD0,QD0,mVolt,sigma);%全部有
@@ -399,8 +399,8 @@ bar(calTime,'stacked');
 % DeviationFigure(1:33,[CaseAREV;CaseBREV;CaseCREV],[CaseAREA;CaseBREA;CaseCREA],[CaseAREP,CaseBREP,CaseCREP],[CaseAREQ,CaseBREQ,CaseCREQ]);%,[CaseAREA;CaseBREA;CaseCREA],[CaseAREV;CaseBREV;CaseCREV],[CaseAREV;CaseBREV;CaseCREV]);
 % VoltBar(voltBarCaseAX,voltBarCaseAY,voltBarCaseBX,voltBarCaseBY,voltBarCaseCX,voltBarCaseCY);
 % AngelBar(angelBarCaseAX,angelBarCaseBY,angelBarCaseCX,angelBarCaseAY,angelBarCaseBX,angelBarCaseCY);
-% AngelBar(PDBarCaseAX,PDBarCaseAY,PDBarCaseBX,PDBarCaseBY,PDBarCaseCX,PDBarCaseCY);
+% PDBar(PDBarCaseAX,PDBarCaseAY,PDBarCaseBX,PDBarCaseBY,PDBarCaseCX,PDBarCaseCY);
 % QDBar(QDBarCaseAX,QDBarCaseAY,QDBarCaseBX,QDBarCaseBY,QDBarCaseCX,QDBarCaseCY);
 % MaxErrorFigure()
 % MaxBoundErrorFigure();
-DrawLoadProfile();
\ No newline at end of file
+% DrawLoadProfile();
\ No newline at end of file
diff --git a/subOPF.m b/subOPF.m
index e8b4c4e..f0aef7c 100644
--- a/subOPF.m
+++ b/subOPF.m
@@ -121,7 +121,7 @@ Vbi=sparse(0.5*ones(Busnum,1));
 PDbi=sparse(0.5*ones(length(Loadi),1));
 QDbi=sparse(0.5*ones(length(Loadi),1));
 eps=1;
-
+% Gap=0;
 % 第一遍，算连续的值
 fprintf('第1次迭代，算连续量。\n');
 tic;