Commit affe8965 authored by Lauren Adoram-Kershner's avatar Lauren Adoram-Kershner
Browse files

test updates

parent a97c0e20

autocnet/graph/network.py

+2 −3
Original line number Diff line number Diff line
@@ -1548,8 +1548,7 @@ WHERE 
        """

        # Ingest isis control net as a df and do some massaging

        data = cnet.from_isis(path)

        data['jigsawFullRejected'] = data['pointJigsawRejected'] | data['measureJigsawRejected']

        data_to_update = data[['id', 'serialnumber', 'jigsawFullRejected', 'sampleResidual', 'lineResidual', 'samplesigma', 'linesigma', 'adjustedCovar', 'apriorisample', 'aprioriline']]

        data_to_update = data[['id', 'serialnumber', 'measureJigsawRejected', 'sampleResidual', 'lineResidual', 'samplesigma', 'linesigma', 'adjustedCovar', 'apriorisample', 'aprioriline']]

        data_to_update['adjustedCovar'] = data_to_update['adjustedCovar'].apply(lambda row : list(row))

        data_to_update['id'] = data_to_update['id'].apply(lambda row : int(row))
@@ -1558,7 +1557,7 @@ WHERE 


        sql = """

        UPDATE measures AS f

        SET "measureJigsawRejected" = t."jigsawFullRejected", sampler = t."sampleResidual", liner = t."lineResidual", samplesigma = t."samplesigma", linesigma = t."linesigma", apriorisample = t."apriorisample", aprioriline = t."aprioriline"

        SET "measureJigsawRejected" = t."measureJigsawRejected", sampler = t."sampleResidual", liner = t."lineResidual", samplesigma = t."samplesigma", linesigma = t."linesigma", apriorisample = t."apriorisample", aprioriline = t."aprioriline"

        FROM temp_measures AS t

        WHERE f.serialnumber = t.serialnumber AND f.pointid = t.id;

autocnet/graph/tests/test_network_graph.py

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ def cnet(): 
            'serialnumber' : ['BRUH'],

            'measureJigsawRejected': [False],

            'sampleResidual' : [0.1],

            'pointIngore' : [False],

            'pointIgnore' : [False],

            'pointJigsawRejected': [False],

            'lineResidual' : [0.1],

            'linesigma' : [0],
@@ -40,7 +40,7 @@ def test_creation(): 
    ncg = NetworkCandidateGraph()





@pytest.mark.parametrize("image_data, expected_npoints", [({'id':1, 'serial': 'BRUH'}, 1)])

@pytest.mark.parametrize("image_data, expected_npoints", [({'id':1, 'serialnumber': 'BRUH'}, 1)])

def test_place_points_from_cnet(session, cnet, image_data, expected_npoints):

    model.Images.create(session, **image_data)

    ncg = NetworkCandidateGraph.from_database()

autocnet/io/db/tests/test_model.py

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ def test_measures_exists(tables): 
@patch('plio.io.io_controlnetwork.from_isis', return_value = pd.DataFrame.from_dict({'id': [1],

                                                                                     'serialnumber': ['ISISSERIAL'],

                                                                                     'pointJigsawRejected': [False],

                                                                                     'jigsawRejected': [False],

                                                                                     'measureJigsawRejected': [False],

                                                                                     'sampleResidual': [0.1],

                                                                                     'lineResidual': [0.1],

                                                                                     'samplesigma': [0],