Commit b391c289 authored by acpaquette's avatar acpaquette Committed by jlaura
Browse files

Fixed asynchronous edge communication to the cluster (#312)

parent 30c34463

autocnet/graph/edge.py

+0 −4
Original line number Diff line number Diff line
@@ -1008,9 +1008,6 @@ class NetworkEdge(Edge): 
        source = self.source['node_id']

        destin = self.destination['node_id']



        if source > destin:

            source, destin = destin, source



        q = Session().query(Points.id,

                  Points.pointtype,

                  Measures.id.label('mid'),
@@ -1082,4 +1079,3 @@ class NetworkEdge(Edge): 
            bad[o.destin_measure_id] = 1



        return Counter(bad)

autocnet/graph/network.py

+2 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,8 @@ class NetworkCandidateGraph(CandidateGraph): 
        for job_counter, elem in enumerate(onobj.data('data')):

            # Determine if we are working with an edge or a node

            if len(elem) > 2:

                id = (elem[0], elem[1])

                id = (elem[2].source['node_id'],

                      elem[2].destination['node_id'])

                image_path = (elem[2].source['image_path'],

                              elem[2].destination['image_path'])

            else: