Skip to content

Commit e7e5528

Browse files
authored
Merge pull request #799 from e-sensing/dev
Pre-release 1.1.0
2 parents 955f1ed + e5134d7 commit e7e5528

File tree

130 files changed

+4602
-1316
lines changed

Some content is hidden

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

130 files changed

+4602
-1316
lines changed

DESCRIPTION

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: sits
22
Type: Package
3-
Version: 1.0.1
3+
Version: 1.1.0
44
Title: Satellite Image Time Series Analysis for Earth Observation Data Cubes
55
Authors@R: c(person('Rolf', 'Simoes', role = c('aut'), email = '[email protected]'),
66
person('Gilberto', 'Camara', role = c('aut', 'cre'), email = '[email protected]'),
@@ -68,6 +68,7 @@ Suggests:
6868
dendextend,
6969
dtwclust,
7070
dtwSat (>= 0.2.7),
71+
DiagrammeR,
7172
digest,
7273
e1071,
7374
FNN,
@@ -83,11 +84,12 @@ Suggests:
8384
mgcv,
8485
openxlsx,
8586
randomForest,
87+
randomForestExplainer,
8688
RcppArmadillo (>= 0.11),
8789
scales,
8890
stars (>= 0.5),
8991
testthat (>= 3.1.3),
90-
torchopt(>= 0.1.1),
92+
torchopt(>= 0.1.2),
9193
xgboost,
9294
zoo
9395
Config/testthat/edition: 3
@@ -132,6 +134,7 @@ Collate:
132134
'sits_lighttae.R'
133135
'sits_machine_learning.R'
134136
'sits_merge.R'
137+
'sits_mixture_model.R'
135138
'sits_mlp.R'
136139
'sits_parallel.R'
137140
'sits_patterns.R'
@@ -156,7 +159,8 @@ Collate:
156159
'sits_source_api_bdc.R'
157160
'sits_source_api_deafrica.R'
158161
'sits_source_api_local.R'
159-
'sits_source_api_mspc.R'
162+
'sits_source_api_mpc.R'
163+
'sits_source_api_sdc.R'
160164
'sits_source_api_stac.R'
161165
'sits_source_api_usgs.R'
162166
'sits_space_time_operations.R'

NAMESPACE

+19-8
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ S3method("sits_labels<-",sits)
55
S3method(.cube_is_regular,default)
66
S3method(.cube_is_regular,raster_cube)
77
S3method(.cube_token_generator,default)
8-
S3method(.cube_token_generator,mspc_cube)
8+
S3method(.cube_token_generator,mpc_cube)
99
S3method(.raster_check_package,terra)
1010
S3method(.raster_col,terra)
1111
S3method(.raster_crop,terra)
12+
S3method(.raster_crop_metadata,terra)
1213
S3method(.raster_crs,terra)
1314
S3method(.raster_data_type,terra)
1415
S3method(.raster_extract,terra)
@@ -41,48 +42,56 @@ S3method(.sits_rename_bands,sits)
4142
S3method(.sits_roi_bbox,ll)
4243
S3method(.sits_roi_bbox,sf)
4344
S3method(.sits_roi_bbox,xy)
44-
S3method(.source_collection_access_test,mspc_cube)
45+
S3method(.source_collection_access_test,mpc_cube)
4546
S3method(.source_collection_access_test,stac_cube)
4647
S3method(.source_collection_access_test,usgs_cube)
4748
S3method(.source_cube,stac_cube)
4849
S3method(.source_item_get_bands,stac_cube)
50+
S3method(.source_item_get_cloud_cover,sdc_cube)
4951
S3method(.source_item_get_cloud_cover,stac_cube)
5052
S3method(.source_item_get_date,stac_cube)
5153
S3method(.source_item_get_hrefs,bdc_cube)
54+
S3method(.source_item_get_hrefs,sdc_cube)
5255
S3method(.source_item_get_hrefs,stac_cube)
5356
S3method(.source_item_get_hrefs,usgs_cube)
5457
S3method(.source_items_bands_select,stac_cube)
5558
S3method(.source_items_cube,stac_cube)
5659
S3method(.source_items_fid,stac_cube)
57-
S3method(.source_items_new,"mspc_cube_landsat-8-c2-l2")
58-
S3method(.source_items_new,"mspc_cube_sentinel-2-l2a")
60+
S3method(.source_items_new,"mpc_cube_landsat-c2-l2")
61+
S3method(.source_items_new,"mpc_cube_sentinel-2-l2a")
5962
S3method(.source_items_new,aws_cube)
6063
S3method(.source_items_new,bdc_cube)
6164
S3method(.source_items_new,deafrica_cube)
65+
S3method(.source_items_new,sdc_cube)
6266
S3method(.source_items_new,usgs_cube)
63-
S3method(.source_items_tile,"mspc_cube_landsat-8-c2-l2")
64-
S3method(.source_items_tile,"mspc_cube_sentinel-2-l2a")
67+
S3method(.source_items_tile,"mpc_cube_landsat-c2-l2")
68+
S3method(.source_items_tile,"mpc_cube_sentinel-2-l2a")
6569
S3method(.source_items_tile,aws_cube)
6670
S3method(.source_items_tile,bdc_cube)
6771
S3method(.source_items_tile,deafrica_cube)
72+
S3method(.source_items_tile,sdc_cube)
6873
S3method(.source_items_tile,usgs_cube)
6974
S3method(plot,classified_image)
7075
S3method(plot,geo_distances)
7176
S3method(plot,patterns)
7277
S3method(plot,predicted)
7378
S3method(plot,probs_cube)
7479
S3method(plot,raster_cube)
80+
S3method(plot,rfor_model)
7581
S3method(plot,sits)
7682
S3method(plot,som_evaluate_cluster)
7783
S3method(plot,som_map)
7884
S3method(plot,torch_model)
7985
S3method(plot,uncertainty_cube)
86+
S3method(plot,xgb_model)
8087
S3method(print,sits_area_assessment)
8188
S3method(print,sits_assessment)
8289
S3method(sits_accuracy,classified_image)
8390
S3method(sits_accuracy,sits)
8491
S3method(sits_apply,raster_cube)
8592
S3method(sits_apply,sits)
93+
S3method(sits_as_sf,raster_cube)
94+
S3method(sits_as_sf,sits)
8695
S3method(sits_bands,patterns)
8796
S3method(sits_bands,sits)
8897
S3method(sits_bands,sits_cube)
@@ -137,7 +146,6 @@ export(.sits_parse_roi_cube)
137146
export(.sits_roi_sf_to_geojson)
138147
export(sits_accuracy)
139148
export(sits_accuracy_summary)
140-
export(sits_active_tests)
141149
export(sits_apply)
142150
export(sits_as_sf)
143151
export(sits_bands)
@@ -146,7 +154,7 @@ export(sits_classify)
146154
export(sits_cluster_clean)
147155
export(sits_cluster_dendro)
148156
export(sits_cluster_frequency)
149-
export(sits_confidence_samples)
157+
export(sits_confidence_sampling)
150158
export(sits_config)
151159
export(sits_config_show)
152160
export(sits_cube)
@@ -163,13 +171,15 @@ export(sits_labels_summary)
163171
export(sits_lighttae)
164172
export(sits_list_collections)
165173
export(sits_merge)
174+
export(sits_mixture_model)
166175
export(sits_mlp)
167176
export(sits_patterns)
168177
export(sits_reduce_imbalance)
169178
export(sits_regularize)
170179
export(sits_resnet)
171180
export(sits_rfor)
172181
export(sits_run_examples)
182+
export(sits_run_tests)
173183
export(sits_sample)
174184
export(sits_select)
175185
export(sits_sgolay)
@@ -202,4 +212,5 @@ importFrom(dplyr,.data)
202212
importFrom(lubridate,"%m+%")
203213
importFrom(lubridate,"%within%")
204214
importFrom(magrittr,"%>%")
215+
importFrom(utils,read.csv)
205216
useDynLib(sits, .registration = TRUE)

NEWS.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
# SITS Release History
22

3+
# What's new in SITS version 1.1.0
4+
5+
### New features in SITS version 1.1.0
6+
* Introduced support to kernel functions in `sits_apply`
7+
* Introduced new function `sits_mixture_model` for spectral mixture analysis
8+
* Support for the Swiss Data Cube ([swissdatacube.org](https://www.swissdatacube.org/))
9+
* Support for mosaic visualization in `sits_view`
10+
* Introduced new function `sits_as_sf` to convert sits objects to sf
11+
* Export images as [COG](https://www.cogeo.org/) in `sits_regularize`
12+
* Add `roi` parameter in `sits_regularize` function
13+
* Add `crs` parameter in `sits_get_data`
14+
* Change Microsoft Planetary Computer source name to `"MPC"`
15+
* Fix several bugs and improve performance
16+
317
# What's new in SITS version 1.0.0
418
* Available on CRAN.
519

620
### New features in SITS version 1.0.0
721
* Hotfix to improve `sits_whittaker()` function to process cube.
822
* Update documentation to match CRAN standards
923

24+
# What's new in SITS version 0.17.0
25+
1026
### New features in SITS version 0.17.0
1127
* Introduced new classifier model `sits_lighttae()`
1228
(Lightweight Temporal Self-Attention)

R/RcppExports.R

+20
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ entropy_probs <- function(mtx, n) {
1717
.Call(`_sits_entropy_probs`, mtx, n)
1818
}
1919

20+
kernel_fun <- function(data, band, img_nrow, img_ncol, window_size, fun) {
21+
.Call(`_sits_kernel_fun`, data, band, img_nrow, img_ncol, window_size, fun)
22+
}
23+
2024
least_probs <- function(mtx, n) {
2125
.Call(`_sits_least_probs`, mtx, n)
2226
}
@@ -33,6 +37,10 @@ margin_probs <- function(mtx, n) {
3337
.Call(`_sits_margin_probs`, mtx, n)
3438
}
3539

40+
nnls_solver <- function(x, A, iterate = 400L, tolerance = 0.000001) {
41+
.Call(`_sits_nnls_solver`, x, A, iterate, tolerance)
42+
}
43+
3644
normalize_data <- function(data, min, max) {
3745
.Call(`_sits_normalize_data`, data, min, max)
3846
}
@@ -41,6 +49,18 @@ ratio_probs <- function(mtx, n) {
4149
.Call(`_sits_ratio_probs`, mtx, n)
4250
}
4351

52+
max_sampling <- function(data, band, img_nrow, img_ncol, window_size) {
53+
.Call(`_sits_max_sampling`, data, band, img_nrow, img_ncol, window_size)
54+
}
55+
56+
smooth_sg <- function(data, f_res, p, n) {
57+
.Call(`_sits_smooth_sg`, data, f_res, p, n)
58+
}
59+
60+
smooth_sg_mtx <- function(data, f_res, p, n) {
61+
.Call(`_sits_smooth_sg_mtx`, data, f_res, p, n)
62+
}
63+
4464
smooth_whit <- function(data, lambda, length) {
4565
.Call(`_sits_smooth_whit`, data, lambda, length)
4666
}

R/sits_accuracy.R

+3-3
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,13 @@ sits_accuracy_summary <- function(x,
448448
)
449449

450450
overall_text <- c(
451-
paste(overall["Accuracy"]), accuracy_ci, "",
451+
paste(overall["Accuracy"]), accuracy_ci,
452452
paste(overall["Kappa"])
453453
)
454454

455-
overall_names <- c("Accuracy", "95% CI", "", "Kappa")
455+
overall_names <- c("Accuracy", "95% CI", "Kappa")
456456

457-
cat("\nOverall Statistics\n")
457+
cat("Overall Statistics")
458458
overall_names <- ifelse(overall_names == "",
459459
"",
460460
paste(overall_names, ":")

0 commit comments

Comments
 (0)