Commit 2d914560 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Removed spechomo classifiers from gms_preprocessing/database as they are now...


Removed spechomo classifiers from gms_preprocessing/database as they are now included in external spechomo library. Removed parameter 'path_SRFs' from options file because SRFs are now provided by external pyrsr library. Removed 'RR' as possible spechomo_method. Updated HISTORY.rst and version info.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 7f2e07c5
......@@ -2,6 +2,14 @@
History
=======
0.18.2 (2020-04-02)
-------------------
* Removed spechomo classifiers from gms_preprocessing/database as they are now included in external spechomo library.
* Removed parameter 'path_SRFs' from options file because SRFs are now provided by external pyrsr library.
* Removed 'RR' as possible spechomo_method.
0.18.1 (2020-03-31)
-------------------
......
......@@ -259,13 +259,12 @@ class JobConfig(object):
self.path_tempdir = self.absP(self.DB_config_table['path_tempdir'])
self.path_custom_sicor_options = gp('path_custom_sicor_options')
self.path_dem_proc_srtm_90m = self.absP(self.DB_config_table['path_dem_proc_srtm_90m'])
self.path_spechomo_classif = gp('path_spechomo_classif')
# internal (included in gms_preprocessing repository)
self.path_spechomo_classif = self.joinP(path_gmslib, 'database', 'spechomo_classifier')
self.path_earthSunDist = self.joinP(path_gmslib, 'database', 'earth_sun_distance',
'Earth_Sun_distances_per_day_edited.csv')
self.path_SNR_models = self.joinP(path_gmslib, 'database', 'snr')
self.path_SRFs = self.joinP(path_gmslib, 'database', 'srf')
self.path_cloud_classif = self.joinP(path_gmslib, 'database', 'cloud_classifier')
self.path_solar_irr = self.joinP(path_gmslib, 'database', 'solar_irradiance',
'SUNp1fontenla__350-2500nm_@0.1nm_converted.txt')
......@@ -582,7 +581,7 @@ class JobConfig(object):
data_list = []
with psycopg2.connect(self.conn_database) as conn:
with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cur:
cur.execute("""
cur.execute(r"""
WITH jobs_unnested AS (
SELECT id, unnest(sceneids) AS sceneid FROM jobs
)
......
......@@ -58,14 +58,13 @@
"path_job_logs": "", /*output path to store job log files*/
"path_spatIdxSrv": "",
"path_SNR_models": "",
"path_SRFs": "",
"path_dem_proc_srtm_90m": "",
"path_earthSunDist": "", /*input path of the earth sun distance model*/
"path_solar_irr": "", /*input path of the solar irradiance model*/
"path_earthSunDist": "", /*input path of a CUSTOM earth sun distance model*/
"path_solar_irr": "", /*input path of a CUSTOM solar irradiance model*/
"path_cloud_classif": "",
"path_custom_sicor_options": "",
"path_ECMWF_db": "",
"path_spechomo_classif": ""
"path_spechomo_classif": "" /*path of CUSTOM classifiers to be used in spectral homogenization*/
},
"processors": {
......@@ -152,7 +151,6 @@
"spechomo_method": "LR", /*Method used for spectral homogenization.
LI: Linear interpolation;
LR: Linear regression;
RR: Ridge regression;
QR: Quadratic regression
RFR: Random forest regression with 50 trees
(no spectral sub-clustering available)*/
......
......@@ -66,14 +66,13 @@ gms_schema_input = dict(
path_job_logs=dict(type='string', required=False),
path_spatIdxSrv=dict(type='string', required=False),
path_SNR_models=dict(type='string', required=False),
path_SRFs=dict(type='string', required=False),
path_dem_proc_srtm_90m=dict(type='string', required=False),
path_earthSunDist=dict(type='string', required=False),
path_solar_irr=dict(type='string', required=False),
path_cloud_classif=dict(type='string', required=False),
path_custom_sicor_options=dict(type='string', required=False, nullable=True),
path_ECMWF_db=dict(type='string', required=False),
path_spechomo_classif=dict(type='string', required=False),
path_spechomo_classif=dict(type='string', required=False, nullable=True),
)),
processors=dict(
type='dict', required=False,
......@@ -152,7 +151,7 @@ gms_schema_input = dict(
run_processor=dict(type='boolean', required=False),
write_output=dict(type='boolean', required=False),
delete_output=dict(type='boolean', required=False),
spechomo_method=dict(type='string', required=False, allowed=['LI', 'LR', 'RR', 'QR', 'RFR']),
spechomo_method=dict(type='string', required=False, allowed=['LI', 'LR', 'QR', 'RFR']),
spechomo_n_clusters=dict(type='integer', required=False, allowed=[1, 5, 10, 15, 20, 30, 40, 50]),
spechomo_classif_alg=dict(type='string', required=False, allowed=['MinDist', 'kNN', 'SAM', 'SID']),
spechomo_kNN_n_neighbors=dict(type='integer', required=False, min=0),
......@@ -234,7 +233,6 @@ parameter_mapping = dict(
path_job_logs=('paths', 'path_job_logs'),
path_spatIdxSrv=('paths', 'path_spatIdxSrv'),
path_SNR_models=('paths', 'path_SNR_models'),
path_SRFs=('paths', 'path_SRFs'),
path_dem_proc_srtm_90m=('paths', 'path_dem_proc_srtm_90m'),
path_earthSunDist=('paths', 'path_earthSunDist'),
path_solar_irr=('paths', 'path_solar_irr'),
......
......@@ -102,5 +102,4 @@ def imap_unordered(func, args, CPUs=None, flatten_output=False):
def is_mainprocess():
# type: () -> bool
"""Return True if the current process is the main process and False if it is a multiprocessing child process."""
print(current_process().name)
return current_process().name == 'MainProcess'
......@@ -24,5 +24,5 @@
# You should have received a copy of the GNU Lesser General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.18.1'
__versionalias__ = '20200331.03'
__version__ = '0.18.2'
__versionalias__ = '20200402.01'
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