diff --git a/dataRead.m b/dataRead.m index a31dccb..7f2476f 100644 --- a/dataRead.m +++ b/dataRead.m @@ -15,27 +15,16 @@ Balance=data(1,1); Balance=nodeNum(setIJ==Balance); %%three-phase phaseABCY=sparse(3*length(nodeNum),3*length(nodeNum)); -%% 601 begin -[fs30,fs31,fs32,retphaseABCY]=lineWithConfig(setIJ,nodeNum,lineZ,lines,601,baseHighU); +%把线路型号都给读出来 +linePar=lines(:,1); +for I=1:length(linePar) +[fs30,fs31,fs32,retphaseABCY]=lineWithConfig(setIJ,nodeNum,lineZ,lines,linePar(I),baseHighU); %phaseABCY 三相的导纳矩阵3n x 3n 维 -fsY0=fs30; -fsY1=fs31; -fsY2=fs32; -phaseABCY=phaseABCY+retphaseABCY; -% 601 end -%% 602 begin -[fs30,fs31,fs32,retphaseABCY]=lineWithConfig(setIJ,nodeNum,lineZ,lines,602,baseHighU); fsY0=fsY0+fs30; fsY1=fsY1+fs31; fsY2=fsY2+fs32; -phaseABCY=phaseABCY+retphaseABCY; -% 602 end -%% -[fs30,fs31,fs32,retphaseABCY]=lineWithConfig(setIJ,nodeNum,lineZ,lines,123,baseHighU); -fsY0=fsY0+fs30; -fsY1=fsY1+fs31; -fsY2=fsY2+fs32; -phaseABCY=phaseABCY+retphaseABCY; +phaseABCY=phaseABCY+retphaseABCY; +end %% spot load busNum=length(nodeNum); spotloads=data(zeroEntries(3)+1:zeroEntries(4)-1,:);