Skip to content

Commit

Permalink
Merge pull request #988 from e-sensing/dev
Browse files Browse the repository at this point in the history
Pre-release 1.4.1
  • Loading branch information
OldLipe authored Jun 13, 2023
2 parents 4c0e5ba + 706c253 commit 6eac9ed
Show file tree
Hide file tree
Showing 212 changed files with 9,273 additions and 9,045 deletions.
3 changes: 2 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
^\.swp
^codemeta.json
LICENSE

.lintr
^\.github$
^codecov\.yml$
.rcookies
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ R/tags
*.swp
RtmpJFrMnd.log
.rcookies
.lintr
50 changes: 34 additions & 16 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: sits
Type: Package
Version: 1.4.0
Version: 1.4.1
Title: Satellite Image Time Series Analysis for Earth Observation Data Cubes
Authors@R: c(person('Rolf', 'Simoes', role = c('aut'), email = '[email protected]'),
person('Gilberto', 'Camara', role = c('aut', 'cre'), email = '[email protected]'),
Expand Down Expand Up @@ -36,14 +36,13 @@ Description: An end-to-end toolkit for land use and land cover classification
Minimum recommended requirements: 16 GB RAM and 4 CPU dual-core.
Encoding: UTF-8
Language: en-US
Depends: R (>= 4.0.0)
Depends: R (>= 4.1.0)
URL: https://github.com/e-sensing/sits/, https://e-sensing.github.io/sitsbook/
BugReports: https://github.com/e-sensing/sits/issues
License: GPL-2
ByteCompile: true
LazyData: true
Imports:
magrittr,
yaml,
dplyr (>= 1.0.0),
gdalUtilities,
Expand All @@ -53,7 +52,7 @@ Imports:
parallel (>= 4.0.5),
purrr (>= 0.3.0),
Rcpp,
rstac (>= 0.9.2-2),
rstac (>= 0.9.2-3),
sf (>= 1.0-12),
slider (>= 0.2.0),
stats,
Expand Down Expand Up @@ -83,6 +82,7 @@ Suggests:
luz (>= 0.3.0),
methods,
mgcv,
nnet,
openxlsx,
randomForest,
randomForestExplainer,
Expand All @@ -103,32 +103,55 @@ LinkingTo:
RcppArmadillo
RoxygenNote: 7.2.3
Collate:
'api_accessors.R'
'api_accuracy.R'
'api_apply.R'
'api_band.R'
'api_bbox.R'
'api_block.R'
'api_check.R'
'api_chunks.R'
'api_classify.R'
'api_cluster.R'
'api_colors.R'
'api_combine_predictions.R'
'api_comp.R'
'api_conf.R'
'api_csv.R'
'api_cube.R'
'api_data.R'
'api_debug.R'
'api_download.R'
'api_expressions.R'
'api_factory.R'
'api_file_info.R'
'api_file.R'
'api_gdal.R'
'api_gdalcubes.R'
'api_model.R'
'api_imputation.R'
'api_jobs.R'
'api_label_class.R'
'api_mixture_model.R'
'api_ml_model.R'
'api_mosaic.R'
'api_parallel.R'
'api_period.R'
'api_plot_time_series.R'
'api_plot_raster.R'
'api_point.R'
'api_predictors.R'
'api_raster.R'
'api_raster_sub_image.R'
'api_raster_terra.R'
'api_reclassify.R'
'api_roi.R'
'api_samples.R'
'api_segments.R'
'api_sf.R'
'api_shp.R'
'api_signal.R'
'api_smooth.R'
'api_smote.R'
'api_som.R'
'api_source.R'
'api_source_aws.R'
Expand All @@ -141,43 +164,40 @@ Collate:
'api_source_stac.R'
'api_source_usgs.R'
'api_space_time_operations.R'
'api_supercells.R'
'api_stac.R'
'api_stats.R'
'api_summary.R'
'api_tibble.R'
'api_tile.R'
'api_timeline.R'
'api_torch.R'
'api_torch_psetae.R'
'api_ts.R'
'api_tuning.R'
'api_uncertainty.R'
'api_utils.R'
'api_variance.R'
'api_view.R'
'RcppExports.R'
'data.R'
'pipe.R'
'sits-package.R'
'sits_apply.R'
'sits_accuracy.R'
'sits_active_learning.R'
'sits_bands.R'
'sits_bbox.R'
'sits_chunks.R'
'sits_classification.R'
'sits_classify_ts.R'
'sits_classify_cube.R'
'sits_classify.R'
'sits_colors.R'
'sits_combine_predictions.R'
'sits_config.R'
'sits_csv.R'
'sits_cube.R'
'sits_cube_copy.R'
'sits_cluster.R'
'sits_debug.R'
'sits_factory.R'
'sits_filters.R'
'sits_geo_dist.R'
'sits_get_data.R'
'sits_imputation.R'
'sits_labels.R'
'sits_label_classification.R'
'sits_lighttae.R'
Expand All @@ -187,13 +207,10 @@ Collate:
'sits_mlp.R'
'sits_mosaic.R'
'sits_model_export.R'
'sits_parallel.R'
'sits_patterns.R'
'sits_plot.R'
'sits_predictors.R'
'sits_reclassify.R'
'sits_raster_data.R'
'sits_raster_sub_image.R'
'sits_regularize.R'
'sits_resnet.R'
'sits_sample_functions.R'
Expand All @@ -205,6 +222,7 @@ Collate:
'sits_summary.R'
'sits_tae.R'
'sits_tempcnn.R'
'sits_temporal_segmentation.R'
'sits_timeline.R'
'sits_train.R'
'sits_tuning.R'
Expand Down
14 changes: 8 additions & 6 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ S3method(.cube_timeline,raster_cube)
S3method(.cube_timeline_acquisition,raster_cube)
S3method(.cube_token_generator,default)
S3method(.cube_token_generator,mpc_cube)
S3method(.data_get_ts,class_cube)
S3method(.data_get_ts,raster_cube)
S3method(.mosaic_split_band_date,derived_cube)
S3method(.mosaic_split_band_date,raster_cube)
S3method(.raster_check_package,terra)
Expand Down Expand Up @@ -72,8 +74,6 @@ S3method(.raster_xres,terra)
S3method(.raster_ymax,terra)
S3method(.raster_ymin,terra)
S3method(.raster_yres,terra)
S3method(.sits_get_ts,class_cube)
S3method(.sits_get_ts,raster_cube)
S3method(.slice_dfr,logical)
S3method(.slice_dfr,numeric)
S3method(.source_collection_access_test,mpc_cube)
Expand All @@ -91,6 +91,7 @@ S3method(.source_item_get_hrefs,usgs_cube)
S3method(.source_items_bands_select,stac_cube)
S3method(.source_items_cube,stac_cube)
S3method(.source_items_fid,stac_cube)
S3method(.source_items_new,"aws_cube_landsat-c2-l2")
S3method(.source_items_new,"mpc_cube_landsat-c2-l2")
S3method(.source_items_new,"mpc_cube_sentinel-2-l2a")
S3method(.source_items_new,aws_cube)
Expand All @@ -99,6 +100,7 @@ S3method(.source_items_new,deafrica_cube)
S3method(.source_items_new,hls_cube)
S3method(.source_items_new,sdc_cube)
S3method(.source_items_new,usgs_cube)
S3method(.source_items_tile,"aws_cube_landsat-c2-l2")
S3method(.source_items_tile,"mpc_cube_landsat-c2-l2")
S3method(.source_items_tile,"mpc_cube_sentinel-2-l2a")
S3method(.source_items_tile,aws_cube)
Expand Down Expand Up @@ -152,8 +154,10 @@ S3method(plot,predicted)
S3method(plot,probs_cube)
S3method(plot,raster_cube)
S3method(plot,rfor_model)
S3method(plot,segments)
S3method(plot,sits)
S3method(plot,sits_accuracy)
S3method(plot,sits_cluster)
S3method(plot,som_evaluate_cluster)
S3method(plot,som_map)
S3method(plot,torch_model)
Expand Down Expand Up @@ -228,7 +232,6 @@ S3method(summary,sits)
S3method(summary,sits_accuracy)
S3method(summary,sits_area_accuracy)
S3method(summary,variance_cube)
export("%>%")
export("sits_bands<-")
export("sits_labels<-")
export(sits_accuracy)
Expand All @@ -241,7 +244,6 @@ export(sits_classify)
export(sits_cluster_clean)
export(sits_cluster_dendro)
export(sits_cluster_frequency)
export(sits_color_value)
export(sits_colors)
export(sits_colors_reset)
export(sits_colors_set)
Expand All @@ -258,7 +260,7 @@ export(sits_formula_linear)
export(sits_formula_logref)
export(sits_geo_dist)
export(sits_get_data)
export(sits_impute_linear)
export(sits_join_segments)
export(sits_kfold_validate)
export(sits_label_classification)
export(sits_labels)
Expand All @@ -284,6 +286,7 @@ export(sits_rfor)
export(sits_run_examples)
export(sits_run_tests)
export(sits_sample)
export(sits_segment)
export(sits_select)
export(sits_sgolay)
export(sits_show_prediction)
Expand Down Expand Up @@ -314,7 +317,6 @@ importFrom(Rcpp,sourceCpp)
importFrom(dplyr,.data)
importFrom(lubridate,"%m+%")
importFrom(lubridate,"%within%")
importFrom(magrittr,"%>%")
importFrom(utils,download.file)
importFrom(utils,read.csv)
useDynLib(sits, .registration = TRUE)
10 changes: 8 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# SITS Release History

# What's new in SITS version 1.4.0
# What's new in SITS version 1.4

### New features in SITS version 1.4.1
* Updated access to collections in Brazil Data Cube, HLS, and AWS
* Corrected errors in labelling of classified cubes
* Created a factory of functions for segmentation


### New features in SITS version 1.4.0
* New function for image segementation based on `supercells` package
Expand All @@ -11,7 +17,7 @@
* General big fixes


# What's new in SITS version 1.3.0
# What's new in SITS version 1.3

### New features in SITS version 1.3.0
* Remove NOTES and WARNINGS pointed out by CRAN
Expand Down
Loading

0 comments on commit 6eac9ed

Please sign in to comment.