Commit 46d69e13 authored by Jay's avatar Jay
Browse files

Updates completed for looser dependency resolution 

Upgraded to:

- OpenCV > 3
- NX >=3
- No scipy pinning

Tests are still not all passing via CI.
parent ebc33abe

autocnet/graph/network.py

+3 −3
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ class CandidateGraph(nx.Graph): 


    """



    #node_factory = Node

    #edge_factory = Edge

    node_factory = Node

    edge_factory = Edge

    measures_keys = ['point_id', 'image_index', 'keypoint_index',

                     'edge', 'match_idx', 'x', 'y', 'x_off', 'y_off', 'corr']

    # dtypes are usful for allowing merges, otherwise they default to object
@@ -138,7 +138,7 @@ class CandidateGraph(nx.Graph): 
            self.graph['node_name_map'][i] = node_id



        # Relabel the nodes in place to use integer node ids

        nx.relabel_nodes(self, self.graph['node_name_map'], copy=False)

        # nx.relabel_nodes(self, self.graph['node_name_map'], copy=False)

        for s, d, e in self.edges(data=True):

            if s > d:

                s, d = d, s

autocnet/graph/node.py

+0 −3
Original line number Diff line number Diff line
@@ -705,7 +705,6 @@ class NetworkNode(Node): 
        footprint_latlon = cam_type = None



        if exist_check:

            print('ERRORRRORORORORRR!!!')

            footprint_latlon, cam_type = self.footprint_from_database()



        # not in database, create footprint
@@ -715,13 +714,11 @@ class NetworkNode(Node): 
                t1 = time.time()

                footprint_latlon, cam_type = self.footprint_from_isis()

                t2 = time.time()

                print(f'time to get ISIS footprint: {t2 - t1}')

            else:

                # Get CSM footprint

                t1 = time.time()

                footprint_latlon, cam_type = self.footprint_from_csm()

                t2 = time.time()

                print(f'time to get CSM footprint: {t2 - t1}')

       

        return footprint_latlon, cam_type