update data processing code

data-processing/data-processing.sh

@@ -22,5 +22,5 @@ python process-positions.py -data $1
 echo -e '\n'
 echo -e '\n'
 
-# echo 'add-vertex-positions.py'
-# python add-vertex-positions.py -data $1
+# echo 'add-vertex-labels.py'
+# python add-vertex-labels.py -data $1

data-processing/decomposition-to-graph-layer.py

@@ -19,7 +19,7 @@ def getopts(argv):
 
  boundary = 500
 
- # load vertices and positions
+ # # load vertices and positions
  print('loading positions')
  positions = pd.io.parsers.read_csv(
  '../data/' + args['-data'] + '/' + args['-data'] + '-positions.csv',
@@ -109,6 +109,5 @@ def getopts(argv):
 
  # save graph as json
  print('saving graph layer')
- # num_of_leading_zeros = len(str(np.max(peels)))
  with open('../data/' + args['-data'] + '/' + args['-data'] + '-layer-' + str(peel) + '.json', 'w') as outfile:
  json.dump(graph, outfile)

data-processing/gather-statistics.py

@@ -103,19 +103,10 @@ def getopts(argv):
  for j, n in enumerate(cl):
  cl[j] = g_layer.vs[n]['id']
 
- # for i, cmpt in enumerate(components2):
- # for j, n in enumerate(cmpt):
- # cmpt[j] = g_layer.vs[n]['id']
-
  for node in graph_layer['nodes']:
  for i, cmpt in enumerate(comp_list):
-
- # for j, n in enumerate(cmpt):
- # cmpt[j] = g_layer.vs[n]['id']
-
  if int(node['id']) in cmpt:
  node['cmpt'] = i
- # print('found')
  break
 
  # define layer data
@@ -135,6 +126,7 @@ def getopts(argv):
  data['peels'].append(peel)
 
  # save data as json
+ print('saving layer data with component ids')
  with open(graph_layer_data_path, 'w') as outfile:
  json.dump(graph_layer, outfile)