Skip to content

Commit dd33dfc

Browse files
Merge pull request #1432 from e-sensing/dev
Pre-release 1.5.4
2 parents 6f03514 + bb64e0f commit dd33dfc

File tree

107 files changed

+2938
-958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+2938
-958
lines changed

CRAN-SUBMISSION

Lines changed: 0 additions & 3 deletions
This file was deleted.

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: sits
22
Type: Package
3-
Version: 1.5.3-1
3+
Version: 1.5.4
44
Title: Satellite Image Time Series Analysis for Earth Observation Data Cubes
55
Authors@R: c(person('Rolf', 'Simoes', role = c('aut'), email = 'rolfsimoes@gmail.com'),
66
person('Gilberto', 'Camara', role = c('aut', 'cre', 'ths'), email = 'gilberto.camara.inpe@gmail.com'),
@@ -65,7 +65,7 @@ Imports:
6565
tibble (>= 3.3.0),
6666
tidyr (>= 1.3.0),
6767
tmap (>= 4.1),
68-
torch (>= 0.15.0),
68+
torch (>= 0.16.3),
6969
units,
7070
utils
7171
Suggests:
@@ -76,7 +76,6 @@ Suggests:
7676
covr,
7777
dendextend,
7878
dtwclust,
79-
DiagrammeR,
8079
digest,
8180
e1071,
8281
exactextractr,
@@ -97,6 +96,7 @@ Suggests:
9796
RColorBrewer,
9897
RcppArmadillo (>= 14.0.0),
9998
scales,
99+
snic,
100100
spdep,
101101
stars,
102102
stringr,
@@ -110,7 +110,7 @@ Config/testthat/start-first: cube, raster, regularize, data, ml
110110
LinkingTo:
111111
Rcpp,
112112
RcppArmadillo
113-
RoxygenNote: 7.3.2
113+
RoxygenNote: 7.3.3
114114
Collate:
115115
'api_accessors.R'
116116
'api_accuracy.R'

NAMESPACE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ S3method("sits_bands<-",default)
77
S3method("sits_bands<-",raster_cube)
88
S3method("sits_bands<-",sits)
99
S3method("sits_labels<-",class_cube)
10+
S3method("sits_labels<-",class_vector_cube)
1011
S3method("sits_labels<-",default)
1112
S3method("sits_labels<-",probs_cube)
13+
S3method("sits_labels<-",probs_vector_cube)
1214
S3method("sits_labels<-",sits)
1315
S3method(.accuracy_get_validation,csv)
1416
S3method(.accuracy_get_validation,data.frame)
@@ -21,6 +23,9 @@ S3method(.check_samples,default)
2123
S3method(.check_samples,sits)
2224
S3method(.cube_adjust_crs,default)
2325
S3method(.cube_adjust_crs,grd_cube)
26+
S3method(.cube_area_freq,class_cube)
27+
S3method(.cube_area_freq,class_vector_cube)
28+
S3method(.cube_area_freq,default)
2429
S3method(.cube_as_sf,default)
2530
S3method(.cube_as_sf,raster_cube)
2631
S3method(.cube_bands,default)
@@ -294,6 +299,7 @@ S3method(.tile_paths,default)
294299
S3method(.tile_paths,raster_cube)
295300
S3method(.tile_period,default)
296301
S3method(.tile_period,raster_cube)
302+
S3method(.tile_read_block,class_cube)
297303
S3method(.tile_read_block,default)
298304
S3method(.tile_read_block,derived_cube)
299305
S3method(.tile_read_block,eo_cube)
@@ -340,6 +346,7 @@ S3method(plot,sar_cube)
340346
S3method(plot,sits)
341347
S3method(plot,sits_accuracy)
342348
S3method(plot,sits_cluster)
349+
S3method(plot,sits_model)
343350
S3method(plot,som_clean_samples)
344351
S3method(plot,som_evaluate_cluster)
345352
S3method(plot,som_map)
@@ -390,6 +397,8 @@ S3method(sits_clean,class_cube)
390397
S3method(sits_clean,default)
391398
S3method(sits_clean,derived_cube)
392399
S3method(sits_clean,raster_cube)
400+
S3method(sits_colors_qgis,class_cube)
401+
S3method(sits_colors_qgis,class_vector_cube)
393402
S3method(sits_combine_predictions,average)
394403
S3method(sits_combine_predictions,default)
395404
S3method(sits_combine_predictions,uncertainty)
@@ -503,6 +512,9 @@ S3method(summary,variance_cube)
503512
export("sits_bands<-")
504513
export("sits_labels<-")
505514
export(impute_linear)
515+
export(impute_mean)
516+
export(impute_mean_window)
517+
export(impute_median)
506518
export(sits_accuracy)
507519
export(sits_accuracy_summary)
508520
export(sits_add_base_cube)
@@ -575,6 +587,7 @@ export(sits_sgolay)
575587
export(sits_show_prediction)
576588
export(sits_slic)
577589
export(sits_smooth)
590+
export(sits_snic)
578591
export(sits_som_clean_samples)
579592
export(sits_som_evaluate_cluster)
580593
export(sits_som_map)

NEWS.md

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
# SITS Release History
22

3-
# What's new in SITS version 1.5.3
3+
# What's new in SITS version 1.5
4+
5+
### New features in SITS version 1.5.4
6+
* Fix bug in `sits_summary()` in obtaining the variance summary with multiple tiles
7+
* Add new plot type in `sits_accuracy()` function (`"confusion_matrix"`)
8+
* Add new `type` parameter in `sits_accuracy()` function for selecting plot type
9+
* Improve `plot.som_evaluate_cluster` function to include a `legend` parameter
10+
* Add new `sits_snic` segmentation function based on the [snic](https://cran.r-project.org/package=snic) package
11+
* Add `pkgdown` [documentation website](https://e-sensing.github.io/sits/) for the `sits` package
12+
* Add new imputation functions: `impute_mean()`, `impute_median()`, and `impute_mean_window()`
13+
* Improve validation messages in the `sits_accuracy()` function
14+
* Add `sits_labels<-` support for `probs_vector_cube` and `probs_class_cube`
15+
* Extend the `sits_colors_qgis()` function to export `sits` color palettes to QGIS for vector cubes
16+
* Fix area calculations in `sits_summary()`
17+
* Add `res` parameter to the `sits_mosaic()` function to allow generating mosaics at different resolutions
18+
19+
### Hotfix version 1.5.3-1
20+
* Replace `arma::is_finite` with `std::isfinite`
421

522
### Hotfix version 1.5.3-1
623
* Improve documentation for `sits_labels`
@@ -32,8 +49,7 @@
3249
* Include label parameter on `sits_select()`
3350
* General bug fixes
3451

35-
# What's new in SITS version 1.5.2
36-
52+
### New features in SITS version 1.5.2
3753
* Include `exclusion_mask` parameter in `sits_classify()` and `sits_smooth()`
3854
* Support classification data cubes with NA values
3955
* Support for multiple tiling system in `sits_regularize()`, including MGRS and Brazil Data Cube grids
@@ -51,8 +67,7 @@
5167
* Support for interactive visualization with SOM samples
5268
* General bug fixes
5369

54-
# What's new in SITS version 1.5.1
55-
70+
### New features in SITS version 1.5.1
5671
* Support for ESA World Cover map
5772
* Support for Digital Earth Australia products
5873
* Support for Digital Earth Africa geomedian products
@@ -120,7 +135,6 @@
120135
* Corrected errors in labelling of classified cubes
121136
* Created a factory of functions for segmentation
122137

123-
124138
### New features in SITS version 1.4.0
125139
* New function for image segmentation based on `supercells` package
126140
* New version of `sits_get_data()` to extract average values of time series based on segments
@@ -144,7 +158,7 @@
144158
* Organize and clean internal APIs
145159
* General bug fixes
146160

147-
# What's new in SITS version 1.2.0
161+
# What's new in SITS version 1.2
148162

149163
### Hotfix version 1.2.0-4
150164
* Fix `.raster_file_blocksize.terra()` bug (issue #918)
@@ -172,7 +186,7 @@
172186
* Support for operations on CLOUD band in `sits_apply()`
173187
* Bug fixes and internal re-engineering for better code maintenance
174188

175-
# What's new in SITS version 1.1.0
189+
# What's new in SITS version 1.1
176190

177191
### Hotfix version 1.1.0-8
178192
* Fix support to BDC cubes in `sits_regularize()` (issue #848)
@@ -212,14 +226,14 @@
212226
* Change Microsoft Planetary Computer source name to `"MPC"`
213227
* Fix several bugs and improve performance
214228

215-
# What's new in SITS version 1.0.0
216-
* Available on CRAN.
229+
# What's new in SITS version 1.0
217230

218231
### New features in SITS version 1.0.0
232+
* Available on CRAN.
219233
* Hotfix to improve `sits_whittaker()` function to process cube.
220234
* Update documentation to match CRAN standards
221235

222-
# What's new in SITS version 0.17.0
236+
# What's new in SITS version 0.17
223237

224238
### New features in SITS version 0.17.0
225239
* Introduced new classifier model `sits_lighttae()`
@@ -245,7 +259,7 @@ confidence
245259
* Improve several internal functions performances
246260
* Fix several bugs
247261

248-
# What's new in SITS version 0.16.3
262+
# What's new in SITS version 0.16
249263

250264
### New features in SITS version 0.16.3
251265
* reimplemented all deep learning functions using `torch` package and remove `keras` dependence
@@ -259,16 +273,12 @@ confidence
259273
* Update `plot()` parameters on raster cubes
260274
* Support multi-tile for classified cube in `sits_view()`
261275

262-
# What's new in SITS version 0.16.2
263-
264276
### New features in SITS version 0.16.2
265277
* Improve `sits_get_data()` to accept tibbles
266278
* Remove multiples progress bar from `sits_cube()`
267279
* Improve `sits_regularize()` to process in parallel by tiles, bands, and dates
268280
* Improve `sits_regularize()` to check malformed files
269281

270-
# What's new in SITS version 0.16.1
271-
272282
### New features in SITS version 0.16.1
273283
* Update `AWS_NO_SIGN_REQUEST` environment variable
274284
* Solved bug in `.gc_get_valid_interval()` function.
@@ -277,8 +287,6 @@ confidence
277287
* `sits_cube` function for `local cubes` has a new parameter called `multicores`.
278288
* Print `F1 score` in `sits_kfold_validate` with more than 2 labels.
279289

280-
# What's new in SITS version 0.16.0
281-
282290
### New features in SITS version 0.16.0-1
283291
* hotfix `sits_cube()` function to tolerate malformed paths from STAC service;
284292

@@ -290,8 +298,7 @@ confidence
290298
* Improve `sits_regularize()` by taking least cloud cover by default method to compose images
291299
* Bug fixes;
292300

293-
294-
# What's new in SITS version 0.15.1
301+
# What's new in SITS version 0.15
295302

296303
### New features in SITS version 0.15.1-1
297304
* Fix bug in `sits_regularize` that generated images with artifacts
@@ -319,8 +326,6 @@ confidence
319326
* `sits_regularize()` is producing *Float64* images as output
320327
* Full support for Microsoft Planetary Computing
321328

322-
# What's new in SITS version 0.15.0
323-
324329
### New features in SITS version 0.15.0-4
325330
* Change `gdalcubes_chunk_size` in "config.yml" to improve `sits_regularize()`.
326331

@@ -365,7 +370,7 @@ confidence
365370
* Remove `S2_10-1` BDC collection from config
366371
* Other bug fixes
367372

368-
# What's new in SITS version 0.14.1
373+
# What's new in SITS version 0.14
369374

370375
### New features in SITS version 0.14.1-1
371376

@@ -387,9 +392,6 @@ confidence
387392
* Fix partial merge configuration file
388393
* Change bbox to roi in sits
389394

390-
391-
# What's new in SITS version 0.14.0
392-
393395
### New features in SITS version 0.14.0-2
394396

395397
* fix `sits_bbox()` function
@@ -411,7 +413,7 @@ confidence
411413
* Add parameters `origin` and `collection` to `sits_cube.local_cube()` function
412414
* Fix LOCAL source examples and tests
413415

414-
# What's new in SITS version 0.13.1
416+
# What's new in SITS version 0.13
415417

416418
### New features in SITS version 0.13.1
417419

@@ -421,28 +423,20 @@ confidence
421423
* fix deprecated warnings in keras package
422424
* bug fixes
423425

424-
# What's new in SITS version 0.13.0-3
425-
426426
### New features in SITS version 0.13.0-3
427427

428428
* Update documentation in Machine Learning methods
429429
* Hotfix bug in neuron labelling
430430

431-
# What's new in SITS version 0.13.0-2
432-
433431
### New features in SITS version 0.13.0-2
434432

435433
* Bug fixes in BDC MODIS cube
436434

437-
# What's new in SITS version 0.13.0-1
438-
439435
### New features in SITS version 0.13.0-1
440436

441437
* Bug fixes in check STAC bands
442438
* Change Landsat-8 (LC8_30-1) product metadata for BDC source
443439

444-
# What's new in SITS version 0.13
445-
446440
### New features in SITS version 0.13.0
447441

448442
* Create API for source cube

R/RcppExports.R

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,46 @@ C_glcm_correlation <- function(x, angles, nrows, ncols, n_grey, window_size) {
6565
.Call(`_sits_C_glcm_correlation`, x, angles, nrows, ncols, n_grey, window_size)
6666
}
6767

68+
C_interp_mean_window_vec <- function(data, k, weighting) {
69+
.Call(`_sits_C_interp_mean_window_vec`, data, k, weighting)
70+
}
71+
72+
C_interp_mean_window_mat <- function(data, k, weighting) {
73+
.Call(`_sits_C_interp_mean_window_mat`, data, k, weighting)
74+
}
75+
76+
linear_interp <- function(mtx) {
77+
.Call(`_sits_linear_interp`, mtx)
78+
}
79+
80+
linear_interp_vec <- function(vec) {
81+
.Call(`_sits_linear_interp_vec`, vec)
82+
}
83+
84+
C_mask_na <- function(x) {
85+
.Call(`_sits_C_mask_na`, x)
86+
}
87+
88+
C_fill_na <- function(x, fill) {
89+
.Call(`_sits_C_fill_na`, x, fill)
90+
}
91+
92+
C_interp_mean_vec <- function(data) {
93+
.Call(`_sits_C_interp_mean_vec`, data)
94+
}
95+
96+
C_interp_mean_mat <- function(data) {
97+
.Call(`_sits_C_interp_mean_mat`, data)
98+
}
99+
100+
C_interp_median_vec <- function(data) {
101+
.Call(`_sits_C_interp_median_vec`, data)
102+
}
103+
104+
C_interp_median_mat <- function(data) {
105+
.Call(`_sits_C_interp_median_mat`, data)
106+
}
107+
68108
C_kernel_median <- function(x, ncols, nrows, band, window_size) {
69109
.Call(`_sits_C_kernel_median`, x, ncols, nrows, band, window_size)
70110
}
@@ -125,22 +165,6 @@ C_label_max_prob <- function(x) {
125165
.Call(`_sits_C_label_max_prob`, x)
126166
}
127167

128-
linear_interp <- function(mtx) {
129-
.Call(`_sits_linear_interp`, mtx)
130-
}
131-
132-
linear_interp_vec <- function(vec) {
133-
.Call(`_sits_linear_interp_vec`, vec)
134-
}
135-
136-
C_mask_na <- function(x) {
137-
.Call(`_sits_C_mask_na`, x)
138-
}
139-
140-
C_fill_na <- function(x, fill) {
141-
.Call(`_sits_C_fill_na`, x, fill)
142-
}
143-
144168
batch_calc <- function(n_pixels, max_lines_per_batch) {
145169
.Call(`_sits_batch_calc`, n_pixels, max_lines_per_batch)
146170
}

0 commit comments

Comments
 (0)