Commit d9138073 authored by Adam Paquette's avatar Adam Paquette
Browse files

cleaned up code, and moved test

parent 582a8127

autocnet/graph/network.py

+0 −3
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ import warnings 


import dill as pickle

import networkx as nx

import numpy as np

import pandas as pd



from autocnet.control.control import CorrespondenceNetwork

from autocnet.fileio import io_hdf
@@ -17,7 +15,6 @@ from autocnet.graph.edge import Edge 
from autocnet.graph.node import Node

from autocnet.matcher.matcher import FlannMatcher

from autocnet.vis.graph_view import plot_graph

from autocnet.cg import cg





class CandidateGraph(nx.Graph):

autocnet/graph/tests/test_edge.py

+27 −0
Original line number Diff line number Diff line 
import unittest

import ogr



from unittest.mock import Mock



from autocnet.fileio import io_gdal

import pandas as pd



from .. import edge
@@ -45,3 +47,28 @@ class TestEdge(unittest.TestCase): 
    def test_compute_fundamental_matrix(self):

        with self.assertRaises(AttributeError):

            self.edge.compute_fundamental_matrix()



    def test_edge_overlap(self):

        e = edge.Edge()

        e.weight = {}

        source = Mock(spec = node.Node)

        destination = Mock(spec = node.Node)

        e.destination = destination

        e.source = source

        geodata_s = Mock(spec = io_gdal.GeoDataset)

        geodata_d = Mock(spec = io_gdal.GeoDataset)

        source.geodata = geodata_s

        destination.geodata = geodata_d



        wkt1 = "POLYGON ((0 40, 40 40, 40 0, 0 0, 0 40))"

        wkt2 = "POLYGON ((20 60, 60 60, 60 20, 20 20, 20 60))"



        poly1 = ogr.CreateGeometryFromWkt(wkt1)

        poly2 = ogr.CreateGeometryFromWkt(wkt2)



        source.geodata.footprint = poly1

        destination.geodata.footprint = poly2



        e.overlap()

        self.assertEqual(e.weight['overlap_area'], 400)

        self.assertEqual(e.weight['overlap_percn'], 14.285714285714285)

functional_tests/test_two_image.py

+0 −30
Original line number Diff line number Diff line 
import os

import ogr



import unittest

from unittest.mock import Mock



from autocnet.fileio import io_gdal

from autocnet.graph import edge

from autocnet.graph import node

from autocnet.examples import get_path

from autocnet.fileio.io_controlnetwork import to_isis

from autocnet.fileio.io_controlnetwork import write_filelist
@@ -110,28 +105,3 @@ class TestTwoImageMatching(unittest.TestCase): 
            os.remove('TestTwoImageMatching.net')

            os.remove('fromlist.lis')

        except: pass
 


    def test_edge_overlap(self):

        e = edge.Edge()

        e.weight = {}

        source = Mock(spec = node.Node)

        destination = Mock(spec = node.Node)

        e.destination = destination

        e.source = source

        geodata_s = Mock(spec = io_gdal.GeoDataset)

        geodata_d = Mock(spec = io_gdal.GeoDataset)

        source.geodata = geodata_s

        destination.geodata = geodata_d



        wkt1 = "POLYGON ((0 40, 40 40, 40 0, 0 0, 0 40))"

        wkt2 = "POLYGON ((20 60, 60 60, 60 20, 20 20, 20 60))"



        poly1 = ogr.CreateGeometryFromWkt(wkt1)

        poly2 = ogr.CreateGeometryFromWkt(wkt2)



        source.geodata.footprint = poly1

        destination.geodata.footprint = poly2



        e.overlap()

        self.assertEqual(e.weight['overlap_area'], 400)

        self.assertEqual(e.weight['overlap_percn'], 14.285714285714285)