Skip to content

Commit e3205de

Browse files
authored
Merge pull request #1125 from e-sensing/dev
Pre-realease 1.5.0
2 parents 2dbdb82 + 5f53f47 commit e3205de

16 files changed

+1622
-128
lines changed

DESCRIPTION

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Description: An end-to-end toolkit for land use and land cover classification
2727
random forests, extreme gradient boosting, multi-layer perceptrons,
2828
temporal convolutional neural networks proposed by Pelletier et al (2019) <doi:10.3390/rs11050523>,
2929
residual networks by Fawaz et al (2019) <doi:10.1007/s10618-019-00619-1>, and temporal attention encoders
30-
by Garnot and Landrieu (2020) <arXiv:2007.00586>.
30+
by Garnot and Landrieu (2020) <doi:10.48550/arXiv.2007.00586>.
3131
Performs efficient classification of big Earth observation data cubes and includes
3232
functions for post-classification smoothing based on Bayesian inference, and
3333
methods for uncertainty assessment. Enables best
@@ -138,6 +138,7 @@ Collate:
138138
'api_gdal.R'
139139
'api_gdalcubes.R'
140140
'api_jobs.R'
141+
'api_kohonen.R'
141142
'api_label_class.R'
142143
'api_merge.R'
143144
'api_mixture_model.R'

NAMESPACE

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ S3method(.data_get_ts,raster_cube)
9393
S3method(.gc_arrange_images,raster_cube)
9494
S3method(.mosaic_split_band_date,derived_cube)
9595
S3method(.mosaic_split_band_date,raster_cube)
96+
S3method(.opensearch_cdse_extract_tile,RTC)
97+
S3method(.opensearch_cdse_extract_tile,S2MSI2A)
98+
S3method(.opensearch_cdse_search,RTC)
99+
S3method(.opensearch_cdse_search,S2MSI2A)
96100
S3method(.raster_check_package,terra)
97101
S3method(.raster_col,terra)
98102
S3method(.raster_crop,terra)
@@ -414,7 +418,6 @@ S3method(summary,sits_accuracy)
414418
S3method(summary,sits_area_accuracy)
415419
export("sits_bands<-")
416420
export("sits_labels<-")
417-
export(.mpc_clean_token_cache)
418421
export(impute_linear)
419422
export(sits_accuracy)
420423
export(sits_accuracy_summary)

R/RcppExports.R

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,32 @@ C_kernel_modal <- function(x, ncols, nrows, band, window_size) {
3737
.Call(`_sits_C_kernel_modal`, x, ncols, nrows, band, window_size)
3838
}
3939

40-
dtw <- function() {
41-
.Call(`_sits_dtw`)
40+
kohonen_dtw <- function() {
41+
.Call(`_sits_kohonen_dtw`)
42+
}
43+
44+
kohonen_euclidean <- function() {
45+
.Call(`_sits_kohonen_euclidean`)
46+
}
47+
48+
kohonen_object_distances <- function(data, numVars, numNAs, distanceFunction, weights) {
49+
.Call(`_sits_kohonen_object_distances`, data, numVars, numNAs, distanceFunction, weights)
50+
}
51+
52+
RcppMap <- function(data, numVars, numNAs, codes, weights, distanceFunction) {
53+
.Call(`_sits_RcppMap`, data, numVars, numNAs, codes, weights, distanceFunction)
54+
}
55+
56+
RcppSupersom <- function(data, codes, numVars, weights, distanceFunction, numNAs, neighbourhoodDistances, alphas, radii, numEpochs) {
57+
.Call(`_sits_RcppSupersom`, data, codes, numVars, weights, distanceFunction, numNAs, neighbourhoodDistances, alphas, radii, numEpochs)
58+
}
59+
60+
RcppBatchSupersom <- function(data, codes, numVars, weights, distanceFunction, numNAs, neighbourhoodDistances, radii, numEpochs) {
61+
.Call(`_sits_RcppBatchSupersom`, data, codes, numVars, weights, distanceFunction, numNAs, neighbourhoodDistances, radii, numEpochs)
62+
}
63+
64+
RcppParallelBatchSupersom <- function(data, codes, numVars, weights, distanceFunction, numNAs, neighbourhoodDistances, radii, numEpochs, numCores) {
65+
.Call(`_sits_RcppParallelBatchSupersom`, data, codes, numVars, weights, distanceFunction, numNAs, neighbourhoodDistances, radii, numEpochs, numCores)
4266
}
4367

4468
C_label_max_prob <- function(x) {
@@ -141,14 +165,6 @@ C_temp_iqr <- function(mtx) {
141165
.Call(`_sits_C_temp_iqr`, mtx)
142166
}
143167

144-
rlang_env_unlock <- function(env) {
145-
invisible(.Call(`_sits_rlang_env_unlock`, env))
146-
}
147-
148-
rlang_env_lock <- function(env) {
149-
invisible(.Call(`_sits_rlang_env_lock`, env))
150-
}
151-
152168
C_max_sampling <- function(x, nrows, ncols, window_size) {
153169
.Call(`_sits_C_max_sampling`, x, nrows, ncols, window_size)
154170
}

0 commit comments

Comments
 (0)