修改了没有读到线路参数的判断条件

Signed-off-by: facat <facat@ipso.laptop>
This commit is contained in:
facat 2014-04-22 21:33:05 +08:00
parent 92af7fd290
commit cbbcbf2e03
2 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,9 @@
function [ fs30,fs31,fs32,phaseABCY ] = lineWithConfig(setIJ,nodeNum,lineZ,lines,config,baseHighU ) function [ fs30,fs31,fs32,phaseABCY ] = lineWithConfig(setIJ,nodeNum,lineZ,lines,config,baseHighU )
phase3Entry=find(lines(:,1)==config); phase3Entry=find(lines(:,1)==config);
if isempty(phase3Entry) phase3Line=lines(phase3Entry,:);
phase3Line(:,4)=phase3Line(:,4)/1000;
entry=find(lineZ(:,1)==config);
if isempty(entry)
fs30=0; fs30=0;
fs31=0; fs31=0;
fs32=0; fs32=0;
@ -8,9 +11,6 @@ if isempty(phase3Entry)
fprintf('warning: line type %d not found.\n',config) fprintf('warning: line type %d not found.\n',config)
return; return;
end end
phase3Line=lines(phase3Entry,:);
phase3Line(:,4)=phase3Line(:,4)/1000;
entry=find(lineZ(:,1)==config);
phase3R=lineZ(entry+1:entry+3,:); phase3R=lineZ(entry+1:entry+3,:);
phase3X=lineZ(entry+5:entry+7,:); phase3X=lineZ(entry+5:entry+7,:);
phase3B2=lineZ(entry+9:entry+11,:); phase3B2=lineZ(entry+9:entry+11,:);

4
run.m
View File

@ -1,8 +1,8 @@
clc clc
clear clear
lineZ=readLineZ('.\feeder13\lineParameter.txt'); lineZ=readLineZ('D:\share\feeder123\lineParameter.txt');
[ fsY0, fsY1, fsY2,phaseASpotLoadP,phaseBSpotLoadP,phaseCSpotLoadP ... [ fsY0, fsY1, fsY2,phaseASpotLoadP,phaseBSpotLoadP,phaseCSpotLoadP ...
phaseASpotLoadQ,phaseBSpotLoadQ,phaseCSpotLoadQ,setIJ,nodeNum,Balance,phaseABCY]=dataRead(lineZ,'.\feeder13\data2.txt'); phaseASpotLoadQ,phaseBSpotLoadQ,phaseCSpotLoadQ,setIJ,nodeNum,Balance,phaseABCY]=dataRead(lineZ,'D:\share\feeder123\data.txt');
a=exp(1j*2*pi/3); a=exp(1j*2*pi/3);
Tp2f=1/3*[1 1 1; Tp2f=1/3*[1 1 1;
1 a a^2; 1 a a^2;