jxing 5 anos atrás
pai
commit
3ee42f99cb
2 arquivos alterados com 6 adições e 3 exclusões
  1. 4 3
      adjacent.py
  2. 2 0
      test.py

+ 4 - 3
adjacent.py

@@ -8,7 +8,7 @@ from operator import itemgetter
 import numpy as np
 import vg
 
-from .utils import BinaryRelationItem, BinaryRelationCollection
+from utils import BinaryRelationItem, BinaryRelationCollection
 
 np.seterr(divide='ignore', invalid='ignore')
 
@@ -21,6 +21,7 @@ def calc_adjacent_relation(columns, segments, v_walls, walls):
     columns_dic = list_to_dict(columns)
     v_walls_dic = list_to_dict(v_walls)
     walls_dic = list_to_dict(walls)
+
     unit_dic = ChainMap(
         columns_dic,
         walls_dic,
@@ -137,10 +138,10 @@ def are_adjacent(segment1, segment2, units):
 
 
 def load_location(x):
-    x['location'] = json.loads(x['location'])
+    x['location'] = json.loads(str(x['location']).replace('\'', '"'))
     return x
 
 
 def load_curve(x):
-    x['curve'] = json.loads(x['curve'])
+    x['curve'] = json.loads(str(x['curve']).replace('\'', '"'))
     return x

+ 2 - 0
test.py

@@ -110,6 +110,8 @@ if __name__ == '__main__':
     v_wall_data = list(map(loads, v_wall_data))
     columns_data = [dict(zip(COLUMNS_KEYS, item)) for item in columns_data]
     columns_data = list(map(loads, columns_data))
+
+
     test_result = calc_adjacent_relation(
         segments=segment_data,
         walls=wall_data,