From 0f4d416ca0fa17c0dececdc4bf10c34184ea5ddc Mon Sep 17 00:00:00 2001
From: "facat@ipso" <facat@ipso>
Date: Sun, 9 Nov 2014 23:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E6=94=B9=E5=A5=BD=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat@ipso <facat@ipso>
---
 run.m  | 14 ++++++++------
 test.m |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/run.m b/run.m
index b79e315..a49ee1a 100644
--- a/run.m
+++ b/run.m
@@ -1,3 +1,4 @@
+function [JMeasurement,SEMeasurement,SEMeasurementNOPQ,SEMeasurementM,SEMeasurementNOPQM]=run()
 %% 利用先把负荷转换为电流的方法。这个方法要求知道电压量。
 %
 close all
@@ -293,12 +294,12 @@ rThreeLoad=[ phaseASpotLoadP'+1j*phaseASpotLoadQ';
     phaseBSpotLoadP'+1j*phaseBSpotLoadQ';
     phaseCSpotLoadP'+1j*phaseCSpotLoadQ';
     ];
-rThreeLoad=rThreeLoad(:,setxor(1:size(SEVoltpABC,2),Balance));
+% rThreeLoad=rThreeLoad(:,setxor(1:size(SEVoltpABC,2),Balance));
 SEThreeLoad=SEVoltpABC(:,setxor(1:size(SEVoltpABC,2),Balance)).*conj(-SEIpABC);
-phaseLoadPError=real(rThreeLoad-SEThreeLoad)./real(rThreeLoad)*100;
-phaseLoadQError=imag(rThreeLoad-SEThreeLoad)./imag(rThreeLoad)*100;
-phaseLoadPError=reshape(phaseLoadPError,size(phaseLoadPError,1)*size(phaseLoadPError,2),1);
-phaseLoadQError=reshape(phaseLoadQError,size(phaseLoadQError,1)*size(phaseLoadQError,2),1);
+% phaseLoadPError=real(rThreeLoad-SEThreeLoad)./real(rThreeLoad)*100;
+% phaseLoadQError=imag(rThreeLoad-SEThreeLoad)./imag(rThreeLoad)*100;
+% phaseLoadPError=reshape(phaseLoadPError,size(phaseLoadPError,1)*size(phaseLoadPError,2),1);
+% phaseLoadQError=reshape(phaseLoadQError,size(phaseLoadQError,1)*size(phaseLoadQError,2),1);
 % figure()
 % barPlot( phaseLoadPError, 10,['相对误差%'],['分布密度'],['有功负荷误差']);
 % figure()
@@ -346,4 +347,5 @@ SEMeasurementM=sum(sum((( abs(rVoltABCV)-abs(mVoltABCV) )./abs(mVoltABCV)./sigma
 SEMeasurementM=(SEMeasurementM/mCount)^.5;
 %没有PD，QD的
 SEMeasurementNOPQM=sum(sum((( abs(rVoltABCV)-abs(mVoltABCV))./abs(mVoltABCV)./sigma).^2));
-SEMeasurementNOPQM=(SEMeasurementNOPQM/mCount)^.5;
\ No newline at end of file
+SEMeasurementNOPQM=(SEMeasurementNOPQM/mCount)^.5;
+end
\ No newline at end of file
diff --git a/test.m b/test.m
index 380621f..69bca8d 100644
--- a/test.m
+++ b/test.m
@@ -8,7 +8,8 @@ SEMeasurementMSum=0;
 SEMeasurementNOPQMSum=0;
 N=1000;
 for I=1:N
-    [JMeasurement,SEMeasurement,SEMeasurementNOPQ,SEMeasurementM,SEMeasurementNOPQM]=OPF();
+    [JMeasurement,SEMeasurement,SEMeasurementNOPQ,SEMeasurementM,SEMeasurementNOPQM]=run();
+% [JMeasurement]=run();
     JMeasurementSum=JMeasurement+JMeasurementSum;
     SEMeasurementSum=SEMeasurement+SEMeasurementSum;
     SEMeasurementNOPQSum=SEMeasurementNOPQ+SEMeasurementNOPQSum;