From 9f6e6d7bf7a2fc52434727ef1d2600c79009f38b Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Wed, 21 Jan 2015 22:37:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=8Btask.txt?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=82=202.=E6=9C=89=E4=BA=9B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=89=E6=8B=93=E6=89=91=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=98=E6=B2=A1=E6=90=9E=E5=AE=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 testHasttable/elementreduction.cpp |   1 +
 testHasttable/task.cpp             |   2 +-
 testHasttable/task.txt             | 108 ++++++++++++++---------------
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/testHasttable/elementreduction.cpp b/testHasttable/elementreduction.cpp
index 95b5ccc..3139324 100644
--- a/testHasttable/elementreduction.cpp
+++ b/testHasttable/elementreduction.cpp
@@ -57,6 +57,7 @@ void ElementReduction::doIt()
 
 void ElementReduction::merge(QDomElement &element,QHash<QString,BranchStruc *>& idToBranch)
 {
+    return;
     QString parentID=idToBranch[element.tagName()]->id;
     QStringList sep=parentID.split('-');
     QString toID=sep.at(1)+sep.at(0);
diff --git a/testHasttable/task.cpp b/testHasttable/task.cpp
index b39f134..a80da37 100644
--- a/testHasttable/task.cpp
+++ b/testHasttable/task.cpp
@@ -64,7 +64,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT)
             QString lineName=sep.at(0);
             QString lineID=sep.at(1);
             QString loadDir=sep.at(2);
-//            std::cout<<lineName.toLocal8Bit().data()<<std::endl;
+            std::cout<<lineName.toLocal8Bit().data()<<std::endl;
             eleHT.SetLoadFilePath(loadDir);
             eleHT.SetACLineID(lineID);
             eleHT.SetFDSet(setSep.toVector());
diff --git a/testHasttable/task.txt b/testHasttable/task.txt
index 0d0ad16..ef64386 100644
--- a/testHasttable/task.txt
+++ b/testHasttable/task.txt
@@ -1,60 +1,60 @@
-727泰林东乙线,AC-671678,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\727泰林东乙线,(FD-2096,),
+#727泰林东乙线,AC-671678,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\727泰林东乙线,(FD-2096,),
+721南源线,AC-591821,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\721南源线,(FD-2014,FD-2019,FD-2000,)
 
-
-709美的甲线,AC-671399,(FD-2003,)
-720美的乙线,AC-671401,(FD-2003,)
+709美的甲线,AC-671399,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\709美的甲线、720美的乙线,(FD-2003,)
+720美的乙线,AC-671401,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\709美的甲线、720美的乙线,(FD-2003,)
 #715北都联络线,AC-975725|AC-456393,(FD-2050,)
-705林港I线,AC-591832,(FD-2049,)
-719林港IV线,AC-591838,(FD-2055,)
-721南源线,AC-591821,(FD-2014,FD-2019,FD-2000,)
-701欲华线,AC-591811,(FD-2000,FD-2000,)
-718新城I线,AC-591837,(FD-2054,)
-702高尔夫I线,AC-591829,(FD-2046,FD-2054,)
-710林头线,AC-591834,(FD-2051,FD-2056)
-704广水III线,AC-591831,(FD-2048,)
-705广水Ⅰ线,AC-831215,(FD-2048,)
-719广水Ⅱ线,AC-831217,(FD-2048,)
-714东兴线,AC-591825,(FD-2019,)
-712金茂线,AC-671400,(FD-2004,)
+705林港I线,AC-591832,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\705林港I线,(FD-2049,)
+719林港IV线,AC-591838,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\719林港IV线,(FD-2055,)
+721南源线,AC-591821,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\721南源线,(FD-2014,FD-2019,FD-2000,)
+701欲华线,AC-591811,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\701欲华线,(FD-2000,FD-2000,)
+718新城I线,AC-591837,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\718新城I线、702高尔夫I线,(FD-2054,)
+702高尔夫I线,AC-591829,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\718新城I线、702高尔夫I线,(FD-2046,FD-2054,)
+710林头线,AC-591834,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\710林头线,(FD-2051,FD-2056)
+704广水III线,AC-591831,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\704广水III线，泰安站705广水I线、719广水II线,(FD-2048,)
+705广水Ⅰ线,AC-831215,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\704广水III线，泰安站705广水I线、719广水II线,(FD-2048,)
+719广水Ⅱ线,AC-831217,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\704广水III线，泰安站705广水I线、719广水II线,(FD-2048,)
+714东兴线,AC-591825,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\714东兴线,(FD-2019,)
+712金茂线,AC-671400,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\712金茂线,(FD-2004,)
 #707林港Ⅲ线,AC-591861,()没有svg
-723开发区Ⅰ线,AC-591839,(FD-2056,)
-711新城Ⅱ线,AC-831181,(FD-2045,)
-706林港Ⅱ线,AC-591827,(FD-2023,)
-703济虹线,AC-591830,(FD-2019)
-717新基线,AC-591836,(FD-2053,FD-2019)
-724开发区Ⅱ线,AC-591840,(FD-2057,FD-2052)
-713东基线,AC-591858,(FD-2083,FD-2014,FD-2000)
+723开发区Ⅰ线,AC-591839,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\723开发区I线,(FD-2056,)
+711新城Ⅱ线,AC-831181,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\711新城II线,(FD-2045,)
+706林港Ⅱ线,AC-591827,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\706林港II线,(FD-2023,)
+703济虹线,AC-591830,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\703济虹线,(FD-2019)
+717新基线,AC-591836,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\717新基线,(FD-2053,FD-2019)
+724开发区Ⅱ线,AC-591840,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\724开发区II线,(FD-2057,FD-2052)
+713东基线,AC-591858,D:\Project\佛山项目\数据\搭网架参数文件\北滘\北滘负荷\713东基线,(FD-2083,FD-2014,FD-2000)
 
-730东环乙线,AC-671531,(FD-2094,)
-729东环甲线,AC-671532,(FD-2093,)
-724创业乙线,AC-671535,(FD-2025,)
-727二支甲线,AC-671534,(FD-2071,)
-714六丰乙线,AC-671537,(FD-2028,)
-728二支乙线,AC-671533,(FD-2084,)
-717创业甲线,AC-671536,(FD-2021,)
-713六丰甲线,AC-671538,(FD-2027,)
+730东环乙线,AC-671531,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\730东环乙线,(FD-2094,)
+729东环甲线,AC-671532,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\729东环甲线,(FD-2093,)
+724创业乙线,AC-671535,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\724创业乙线,(FD-2025,)
+727二支甲线,AC-671534,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\727二支甲线,(FD-2071,)
+714六丰乙线,AC-671537,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\714六丰乙线,(FD-2028,)
+728二支乙线,AC-671533,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\728二支乙线,(FD-2084,)
+717创业甲线,AC-671536,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\717创业甲线,(FD-2021,)
+713六丰甲线,AC-671538,D:\Project\佛山项目\数据\搭网架参数文件\群力\群力负荷\713六丰甲线,(FD-2027,)
 
-727泰林东乙线,AC-671678,(FD-2096,)
-713泰林东甲线,AC-671669,(FD-2098,FD-2096)
-709泰兴乙线,AC-671665,(FD-1988,)
-702沿江线,AC-803934,(FD-1998,)
-715加利源线,AC-1140123,(FD-65488,)
-701港前南线,AC-671660,(FD-1993,)
-721威特线,AC-671673,(FD-1990,)
-707威奇线,AC-671663,(FD-1986)
-704鸿业线,AC-671662,(FD-1996,FD-2021)
-708泰兴甲线,AC-671664,(FD-1987)
-728泰林西甲线,AC-671679,(FD-2097)
-718发展线,AC-671672,(FD-1997)
-705广水Ⅰ线,AC-831215,(FD-2048)
-719广水Ⅱ线,AC-831217,(FD-2048)
+727泰林东乙线,AC-671678,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\727泰林东乙线,(FD-2096,)
+713泰林东甲线,AC-671669,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\713泰林东甲线,(FD-2098,FD-2096)
+709泰兴乙线,AC-671665,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\709泰兴乙线,(FD-1988,)
+702沿江线,AC-803934,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\702沿江线,(FD-1998,)
+715加利源线,AC-1140123,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\715加利源线,(FD-65488,)
+701港前南线,AC-671660,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\701港前南线,(FD-1993,)
+721威特线,AC-671673,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\721威特线,(FD-1990,)
+707威奇线,AC-671663,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\707威奇线,(FD-1986)
+704鸿业线,AC-671662,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\704鸿业线,(FD-1996,FD-2021)
+708泰兴甲线,AC-671664,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\708泰兴甲线,(FD-1987)
+728泰林西甲线,AC-671679,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\728泰林西甲线,(FD-2097)
+718发展线,AC-671672,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\718发展线,(FD-1997)
+705广水Ⅰ线,AC-831215,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\705广水I线、719广水II线，北郊变电站704广水III线,(FD-2048)
+719广水Ⅱ线,AC-831217,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\705广水I线、719广水II线，北郊变电站704广水III线,(FD-2048)
 #704广水Ⅲ线,AC-591831,()无svg
-703港前北线,AC-671661,(FD-1992,FD-1998)
-730泰港乙线,AC-903666,(FD-58442,FD-2025,)
-716兴业南线,AC-591810,(FD-1994,FD-58443)
-712洗碗机线,AC-671668,(FD-2042)
-714泰林西乙线,AC-671670,(FD-2103,)
-722洗涤线,AC-671674,(FD-2002)
-726制钢甲线,AC-671677,(FD-2038)
-717兴业北线,AC-671671,(FD-1995)
-729泰港甲线,AC-903667,(FD-58443,FD-1994)
\ No newline at end of file
+703港前北线,AC-671661,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\703港前北线,(FD-1992,FD-1998)
+730泰港乙线,AC-903666,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\730泰港乙线,(FD-58442,FD-2025,)
+716兴业南线,AC-591810,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\716兴业南线,(FD-1994,FD-58443)
+712洗碗机线,AC-671668,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\712洗碗机线,(FD-2042)
+714泰林西乙线,AC-671670,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\714泰林西乙线,(FD-2103,)
+722洗涤线,AC-671674,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\722洗涤线,(FD-2002)
+726制钢甲线,AC-671677,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\726制钢甲线,(FD-2038)
+717兴业北线,AC-671671,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\717兴业北线,(FD-1995)
+729泰港甲线,AC-903667,D:\Project\佛山项目\数据\搭网架参数文件\泰安\泰安负荷\729泰港甲线,(FD-58443,FD-1994)
\ No newline at end of file