Commit 8a5be05b authored by Niklas Bohn's avatar Niklas Bohn
Browse files

Merge branch 'bugfix/Issue#85' into 'master'

Bugfix/issue#85

See merge request !85
parents 055db05f c2295ca6
...@@ -14,6 +14,7 @@ Bugfixes: ...@@ -14,6 +14,7 @@ Bugfixes:
* Fixed bug in empirical line function, which caused one single remaining unprocessed segmentation label. * Fixed bug in empirical line function, which caused one single remaining unprocessed segmentation label.
* Replaced deprecated gdal imports to fix "DeprecationWarning: gdal.py was placed in a namespace, it is now available as osgeo.gdal". * Replaced deprecated gdal imports to fix "DeprecationWarning: gdal.py was placed in a namespace, it is now available as osgeo.gdal".
* Updated cerberus schema for SicorValidator to avoid missing path warning in case of LUT file. * Updated cerberus schema for SicorValidator to avoid missing path warning in case of LUT file.
* Updated download link and file size of S2 novelty detector and unpinned scikit-learn version.
0.16.0 (2021-02-23) 0.16.0 (2021-02-23)
......
...@@ -41,7 +41,7 @@ other_requirements = { # dict of "[needed import]: [proposed command for instal ...@@ -41,7 +41,7 @@ other_requirements = { # dict of "[needed import]: [proposed command for instal
"numba": "conda install -c conda-forge numba", "numba": "conda install -c conda-forge numba",
"pyfftw": "conda install -c conda-forge pyfftw", "pyfftw": "conda install -c conda-forge pyfftw",
"pygrib": "conda install -c conda-forge pygrib", "pygrib": "conda install -c conda-forge pygrib",
"sklearn": "conda install -c conda-forge scikit-learn<=0.24.0" "sklearn": "conda install -c conda-forge scikit-learn"
} }
with open("README.rst") as readme_file: with open("README.rst") as readme_file:
......
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
"persistence_file_size": 51152124, "persistence_file_size": 51152124,
"processing_tiles": 4, "processing_tiles": 4,
"novelty_detector": "noclear_novelty_detector_channel2_difference9_0_index10_1_channel12_index1_8.retrain.pkl", "novelty_detector": "noclear_novelty_detector_channel2_difference9_0_index10_1_channel12_index1_8.retrain.pkl",
"novelty_detector_size": 495575, "novelty_detector_size": 655671,
"majority_mask_filter":[ "majority_mask_filter":[
{"block_replace": true,"block_replace_params": [[60,2]],"majority_width": 0}, {"block_replace": true,"block_replace_params": [[60,2]],"majority_width": 0},
{"block_replace": true,"block_replace_params": [[50,3]],"majority_width": 0}, {"block_replace": true,"block_replace_params": [[50,3]],"majority_width": 0},
......
...@@ -790,7 +790,7 @@ def ac_gms(s2img, options, logger=None, script=True): ...@@ -790,7 +790,7 @@ def ac_gms(s2img, options, logger=None, script=True):
else: else:
logger.info("Novelty detector is neither available at user-provided path nor in default tables path.") logger.info("Novelty detector is neither available at user-provided path nor in default tables path.")
logger.info("Download novelty detector from google drive and store at default tables path.") logger.info("Download novelty detector from google drive and store at default tables path.")
url = 'https://drive.google.com/uc?export=download&id=1k0m5fJCBiJbVAoPQPfN0iqn3LnI3UVvu' url = 'https://drive.google.com/uc?export=download&id=1T9H3skt8uDUujCF4hSFV3ghalFnT_xd7'
gdown.download(url, default_nov_det_path, quiet=False) gdown.download(url, default_nov_det_path, quiet=False)
# check if novelty detector was properly downloaded # check if novelty detector was properly downloaded
try: try:
...@@ -801,8 +801,8 @@ def ac_gms(s2img, options, logger=None, script=True): ...@@ -801,8 +801,8 @@ def ac_gms(s2img, options, logger=None, script=True):
raise AssertionError("Novelty detector was not properly downloaded. Please restart AC and try again.") raise AssertionError("Novelty detector was not properly downloaded. Please restart AC and try again.")
except FileNotFoundError: except FileNotFoundError:
options["processing"]["status"] = 1 options["processing"]["status"] = 1
raise FileNotFoundError("Novelty detector could not be properly downloaded, the path provided is incorrect. " raise FileNotFoundError("Novelty detector could not be properly downloaded, the path provided is "
"Please restart AC and try again.") "incorrect. Please restart AC and try again.")
options["cld_mask"]["novelty_detector"] = default_nov_det_path options["cld_mask"]["novelty_detector"] = default_nov_det_path
......
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