Commit 6495298a authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'master' into import_majority_filter

parents c5a3200c 23cd8ab3
Pipeline #3079 failed with stages
in 3 minutes and 25 seconds
......@@ -375,8 +375,8 @@ class Tie_Point_Grid(object):
bar.print_progress((i + 1) / len(GDF) * 100)
results[i, :] = self._get_spatial_shifts(coreg_kwargs)
# merge results with GDF
records = GeoDataFrame(np.array(results, np.object),
# merge results with GDF
records = GeoDataFrame(results,
columns=['POINT_ID', 'X_WIN_SIZE', 'Y_WIN_SIZE', 'X_SHIFT_PX', 'Y_SHIFT_PX', 'X_SHIFT_M',
'Y_SHIFT_M', 'ABS_SHIFT', 'ANGLE', 'SSIM_BEFORE', 'SSIM_AFTER',
'SSIM_IMPROVED', 'RELIABILITY', 'LAST_ERR'])
......
......@@ -12,8 +12,8 @@ from arosics.Tie_Point_Grid import Tie_Point_Grid
__author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.8.5'
__versionalias__ = '2018-04-25_01'
__version__ = '0.8.6'
__versionalias__ = '2018-07-20_01'
__all__ = ['COREG',
'COREG_LOCAL',
'DESHIFTER',
......
......@@ -63,9 +63,9 @@ def run_local_coreg(args):
min_reliability=args.min_reliability,
rs_max_outlier=args.rs_max_outlier,
rs_tolerance=args.rs_tolerance,
# align_grids = args.align_grids,
# match_gsd = args.match_gsd,
# out_gsd = args.out_gsd,
# align_grids=args.align_grids,
# match_gsd=args.match_gsd,
# out_gsd=args.out_gsd,
resamp_alg_calc=args.rsp_alg_deshift,
resamp_alg_deshift=args.rsp_alg_calc,
data_corners_ref=args.cor0,
......
......@@ -28,7 +28,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn
setup(
name='arosics',
version='0.8.5',
version='0.8.6',
description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......
......@@ -2,7 +2,7 @@
context_dir="./context"
dockerfile="arosics_ci.docker"
tag="arosics_ci:0.6.10"
tag="arosics_ci:0.8.6"
gitlab_runner="arosics_gitlab_CI_runner"
echo "#### Build runner docker image"
......
FROM gms_base_centos:pinned_v0.1
FROM gms_base_centos:latest
# copy some needed stuff to /root
COPY *.yml /root/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment