Jelajahi Sumber

mxg:change flowdirection systempath

mengxiangge 5 tahun lalu
induk
melakukan
f60f4d2364

+ 2 - 5
src/system_relation/calc_flowdirection.py

@@ -3,19 +3,16 @@ step1. division block.
 step2. appoint source.
 setp3. calc flow direction.
 '''
-from src.system_relation import systemdatautils
+from relations.src.system_relation import systemdatautils
 import networkx as nx
 
-
-def calc(project_id,block_id):
+def calc(block_datas,source_datas):
 	'''
 	calc block flow direction.
 	:param project_id:
 	:param block_id:
 	:return:
 	'''
-	block_datas= systemdatautils.get_connected_block_data(project_id, block_id)
-	source_datas= systemdatautils.get_connected_block_source_data(project_id, block_id)
 	# get roots
 	roots=list(i.source_id for i in source_datas)
 	g = nx.Graph()

+ 3 - 1
src/system_relation/systemdatautils.py

@@ -2,7 +2,9 @@
 
 """
 import test
-import systemutils
+from relations.src.system_relation import systemutils
+import sys
+sys.path.append("../../..")
 
 
 def get_dicdata(sql,dic):

+ 6 - 3
src/system_relation/test_flowdirection.py

@@ -1,8 +1,11 @@
-import calc_flowdirection, systemdatautils
-
+import sys
+sys.path.append("../../..")
+from relations.src.system_relation import calc_flowdirection, systemdatautils
 if __name__=="__main__":
 	project_id="Pj1101010015"
 	block_id="0"
-	block_datas= calc_flowdirection.calc(project_id, block_id)
+	block_datas= systemdatautils.get_connected_block_data(project_id, block_id)
+	source_datas= systemdatautils.get_connected_block_source_data(project_id, block_id)
+	block_datas= calc_flowdirection.calc(block_datas, source_datas)
 	systemdatautils.update_connected_block_data(block_datas)
 	#systemgraph_display.show_connected_block(project_id,block_id)