Commit bde50a2b authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by Jesse Mapel
Browse files

minor bug fixes/debug stuff (#359) 

* minor bug fixes

* back to before
parent 610a6e91

autocnet/graph/network.py

+4 −4
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ class NetworkCandidateGraph(CandidateGraph): 
                     mem_per_cpu=config['cluster']['processing_memory'],

                     time=walltime,

                     partition=config['cluster']['queue'],

                     output=config['cluster']['cluster_log_dir']+'/slurm-%A_%a.out')

                     output=config['cluster']['cluster_log_dir']+f'/autocnet.{function}-%j')

        submitter.submit(array='1-{}'.format(job_counter))

        return job_counter
@@ -1627,15 +1627,15 @@ WHERE points.active = True AND measures.active=TRUE AND measures.jigreject=FALSE 
            tables = engine.table_names()



        for t in tables:

            session.execute(f'TRUNCATE TABLE {t} CASCADE')

          if t != 'spatial_ref_sys':

            try:

                session.execute(f'ALTER SEQUENCE {t}_id_seq RESTART WITH 1')

            except:

            except Exception as e:

                warnings.warn(f'Failed to truncate table {t}, {t} not modified')

                session.rollback()

        session.commit()

        session.close()





    def place_points_from_cnet(self, cnet):

        semi_major, semi_minor = config["spatial"]["semimajor_rad"], config["spatial"]["semiminor_rad"]

        ecef = pyproj.Proj(proj='geocent', a=semi_major, b=semi_minor)

autocnet/io/db/model.py

+2 −1
Original line number Diff line number Diff line
@@ -390,10 +390,11 @@ if Session: 


    # Trigger that watches for points that should be active/inactive

    # based on the point count.

    if not engine.dialect.has_table(engine, "points"):

        event.listen(Base.metadata, 'before_create', valid_point_function)

        event.listen(Measures.__table__, 'after_create', valid_point_trigger)

        event.listen(Base.metadata, 'before_create', update_point_function)

        event.listen(Images.__table__, 'after_create', update_point_trigger)

        event.listen(Points.__table__, 'after_create', update_point_trigger)

        event.listen(Base.metadata, 'before_create', valid_geom_function)

        event.listen(Images.__table__, 'after_create', valid_geom_trigger)

autocnet/io/db/triggers.py

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ BEGIN 
    NEW.geom = ST_Force_2D(ST_Transform(NEW.adjusted, {}));

    RETURN NEW;

  EXCEPTION WHEN OTHERS THEN

    raise notice 'FAILED TO PROJECT POINT';

    NEW.geom = Null;

    RETURN NEW;

END;

autocnet/spatial/overlap.py

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ def cluster_place_points_in_overlaps(size_threshold=0.0007, 
                 mem_per_cpu=config['cluster']['processing_memory'],

                 time=walltime,

                 partition=config['cluster']['queue'],

                 output=config['cluster']['cluster_log_dir']+'/slurm-%A_%a.out')

                 output=config['cluster']['cluster_log_dir']+'/autocnet.place_points-%j')

    submitter.submit(array='1-{}'.format(job_counter))

    return job_counter