From b86a1d2360cb02efdf295b6ae085c119c3d7fc5c Mon Sep 17 00:00:00 2001
From: SPeillet <peillet.seb@protonmail.com>
Date: Wed, 17 Jul 2019 10:02:56 +0200
Subject: [PATCH] BUG: fix prefix for hclassif and sort file list for VRT
creation
---
launchChain.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/launchChain.py b/launchChain.py
index 7b7ddc7..5ce86b7 100644
--- a/launchChain.py
+++ b/launchChain.py
@@ -771,7 +771,7 @@ def main(argv):
val_out_check = mfld + '/' + os.path.basename(kfold_test_samples[i]).replace('.shp',
'_' + '_'.join(cfieldlist) + '_check.shp')
val_out_tmp_list = Hclassify(val_list, sfn, mfn, var_list,
- mfld,'_h_classif')
+ mfld,'_hclassif')
for cfield in cfieldlist:
val_out = mfld + '/' + os.path.basename(kfold_test_samples[i]).replace('.shp',
'_' + cfield +'.shp')
@@ -937,7 +937,7 @@ def main(argv):
val_list = [val_fld + '/VAL_samples.shp']
val_out = final_fld + '/VAL_samples_' + '_'.join(cfieldlist) + '.shp'
val_out_check = final_fld + '/VAL_samples_' + '_'.join(cfieldlist) + '_check.shp'
- val_out_tmp_list = Hclassify(val_list,stat_file,h_model_fld,var_list,final_fld,'_h_classif')
+ val_out_tmp_list = Hclassify(val_list,stat_file,h_model_fld,var_list,final_fld,'_hclassif')
keepFields(val_out_tmp_list[0],val_out,['Segment_ID']+cfieldlist+['p'+c for c in cfieldlist]+['confidence'])
shpd.DeleteDataSource(val_out_tmp_list[0])
for cfield in cfieldlist:
@@ -950,6 +950,7 @@ def main(argv):
# Classification and map production steps
shp_list = glob.glob(test_fld + '/segmentation_*.shp')
+ shp_list.sort()
if ch_mode > 0 or (ch_mode < 0 and len(shp_list) > 0):
if not os.path.exists(final_fld + '/MAPS'):
os.mkdir(final_fld + '/MAPS')
@@ -969,7 +970,7 @@ def main(argv):
keepFields(cshp,map_out,['Segment_ID']+class_field+['confidence'])
shpd.DeleteDataSource(cshp)
map_list.append(map_out)
-
+ map_list.sort()
if rasout == 'VRT':
for cfield in cfieldlist :
if not os.path.exists(final_fld + '/MAPS/RASTER_' + cfield):
--
GitLab