From f196750c699731ca5a0dc2847e9c48c83da1f773 Mon Sep 17 00:00:00 2001
From: facat <facat@ipso.laptop>
Date: Mon, 21 Apr 2014 21:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=B7=B1=E6=89=BE?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=9E=8B=E5=8F=B7=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat <facat@ipso.laptop>
---
 dataRead.m | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

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,:);