Skip to content

Commit

Permalink
Correcting a bug in a vignette
Browse files Browse the repository at this point in the history
Merge branch 'master' into bw_selection_adaptive

# Conflicts:
#	DESCRIPTION
#	R/bandwidth_selection_cv_sf.R
#	R/bandwidth_selection_cv_tnkde_sf.R
#	R/bandwidth_selection_cvl_sf.R
#	R/border_correction_sf.R
#	R/temporal_nkde_sf.R
#	README.md
#	_pkgdown.yml
#	docs/404.html
#	docs/CONDUCT.html
#	docs/CONTRIBUTING.html
#	docs/articles/Isochrones.html
#	docs/articles/KNetworkFunctions.html
#	docs/articles/KNetworkFunctions_files/figure-html/unnamed-chunk-10-1.png
#	docs/articles/KNetworkFunctions_files/figure-html/unnamed-chunk-12-1.png
#	docs/articles/KNetworkFunctions_files/figure-html/unnamed-chunk-14-1.png
#	docs/articles/KNetworkFunctions_files/figure-html/unnamed-chunk-4-1.png
#	docs/articles/KNetworkFunctions_files/figure-html/unnamed-chunk-6-1.png
#	docs/articles/KNetworkFunctions_files/figure-html/unnamed-chunk-8-1.png
#	docs/articles/NKDE.html
#	docs/articles/NetworkBuilding.html
#	docs/articles/NetworkBuilding_files/figure-html/unnamed-chunk-4-1.png
#	docs/articles/SpatialWeightMatrices.html
#	docs/articles/TNKDE.html
#	docs/articles/images/animated_map.gif
#	docs/articles/index.html
#	docs/articles/web_vignettes/AdaptiveBW.html
#	docs/articles/web_vignettes/AdaptiveBW_files/figure-html/unnamed-chunk-8-1.png
#	docs/articles/web_vignettes/NKDEdetailed.html
#	docs/articles/web_vignettes/SpaceTimeDBscan.html
#	docs/articles/web_vignettes/images/animated_densities.gif
#	docs/authors.html
#	docs/index.html
#	docs/news/index.html
#	docs/pkgdown.yml
#	docs/reference/adaptive_bw.html
#	docs/reference/adaptive_bw.mc.html
#	docs/reference/adaptive_bw_1d.html
#	docs/reference/adaptive_bw_tnkde.html
#	docs/reference/adaptive_bw_tnkde.mc.html
#	docs/reference/adaptive_bw_tnkde_cpp.html
#	docs/reference/add_center_lines.html
#	docs/reference/add_vertices_lines.html
#	docs/reference/aggregate_points.html
#	docs/reference/bike_accidents.html
#	docs/reference/build_graph.html
#	docs/reference/build_graph_directed.html
#	docs/reference/build_grid.html
#	docs/reference/build_quadtree.html
#	docs/reference/bw_checks.html
#	docs/reference/bw_cv_likelihood_calc.html
#	docs/reference/bw_cv_likelihood_calc.mc.html
#	docs/reference/bw_cv_likelihood_calc_tkde.html
#	docs/reference/bw_cvl_calc.html
#	docs/reference/bw_cvl_calc.mc.html
#	docs/reference/bw_tnkde_corr_factor.html
#	docs/reference/bw_tnkde_cv_likelihood_calc.html
#	docs/reference/bw_tnkde_cv_likelihood_calc.mc.html
#	docs/reference/calc_gamma.html
#	docs/reference/calc_isochrones.html
#	docs/reference/check_geometries.html
#	docs/reference/clean_events.html
#	docs/reference/closest_points.html
#	docs/reference/continuousWorker.html
#	docs/reference/continuousWorker_sparse.html
#	docs/reference/continuousfunction.html
#	docs/reference/correction_factor.html
#	docs/reference/correction_factor_time.html
#	docs/reference/corrfactor_continuous.html
#	docs/reference/corrfactor_continuous_sparse.html
#	docs/reference/corrfactor_discontinuous.html
#	docs/reference/corrfactor_discontinuous_sparse.html
#	docs/reference/corrfactor_simple.html
#	docs/reference/cosine_kernel.html
#	docs/reference/cosine_kernel_cpp.html
#	docs/reference/cosine_kernelos.html
#	docs/reference/cross_gfunc_cpp.html
#	docs/reference/cross_kfunc_cpp.html
#	docs/reference/cross_kfunctions.html
#	docs/reference/cross_kfunctions.mc.html
#	docs/reference/cut_lines_at_distance.html
#	docs/reference/direct_lines.html
#	docs/reference/discontinuousWorker_int.html
#	docs/reference/discontinuousWorker_sparse.html
#	docs/reference/discontinuousfunction.html
#	docs/reference/dist_mat_dupl.html
#	docs/reference/epanechnikov_kernel.html
#	docs/reference/epanechnikov_kernel_cpp.html
#	docs/reference/epanechnikov_kernelos.html
#	docs/reference/esc_kernel_loo_nkde.html
#	docs/reference/esc_kernel_loo_tnkde.html
#	docs/reference/esd_kernel_loo_nkde.html
#	docs/reference/esd_kernel_loo_tnkde.html
#	docs/reference/ess_kernel.html
#	docs/reference/ess_kernel_loo_nkde.html
#	docs/reference/ess_kernel_loo_tnkde.html
#	docs/reference/figures/unnamed-chunk-8-1.png
#	docs/reference/g_nt_func_cpp.html
#	docs/reference/gaussian_kernel.html
#	docs/reference/gaussian_kernel_cpp.html
#	docs/reference/gaussian_kernel_scaled.html
#	docs/reference/gaussian_kernel_scaled_cpp.html
#	docs/reference/gaussian_kernel_scaledos.html
#	docs/reference/gaussian_kernelos.html
#	docs/reference/gfunc_cpp.html
#	docs/reference/gm_mean.html
#	docs/reference/graph_checking.html
#	docs/reference/heal_edges.html
#	docs/reference/index.html
#	docs/reference/is_projected.html
#	docs/reference/k_nt_func_cpp.html
#	docs/reference/k_nt_functions.html
#	docs/reference/k_nt_functions.mc.html
#	docs/reference/kfunc_cpp.html
#	docs/reference/kfunctions.html
#	docs/reference/kfunctions.mc.html
#	docs/reference/lines_center.html
#	docs/reference/lines_coordinates_as_list.html
#	docs/reference/lines_direction.html
#	docs/reference/lines_extremities.html
#	docs/reference/lines_points_along.html
#	docs/reference/list_coordinates_as_lines.html
#	docs/reference/lixelize_lines.html
#	docs/reference/lixelize_lines.mc.html
#	docs/reference/main_network_mtl.html
#	docs/reference/mtl_libraries.html
#	docs/reference/mtl_network.html
#	docs/reference/mtl_theatres.html
#	docs/reference/nearestPointOnLine.html
#	docs/reference/nearestPointOnSegment.html
#	docs/reference/nearest_lines.html
#	docs/reference/network_knn.html
#	docs/reference/network_knn.mc.html
#	docs/reference/network_knn_worker.html
#	docs/reference/network_listw.html
#	docs/reference/network_listw.mc.html
#	docs/reference/network_listw_worker.html
#	docs/reference/nkde.html
#	docs/reference/nkde.mc.html
#	docs/reference/nkde_get_loo_values.html
#	docs/reference/nkde_worker.html
#	docs/reference/nkde_worker_bw_sel.html
#	docs/reference/plot_graph.html
#	docs/reference/prepare_data.html
#	docs/reference/prepare_elements_netlistw.html
#	docs/reference/quartic_kernel.html
#	docs/reference/quartic_kernel_cpp.html
#	docs/reference/quartic_kernelos.html
#	docs/reference/randomize_distmatrix.html
#	docs/reference/randomize_distmatrix2.html
#	docs/reference/remove_loop_lines.html
#	docs/reference/remove_mirror_edges.html
#	docs/reference/reverse_lines.html
#	docs/reference/sanity_check_knn.html
#	docs/reference/select_dist_function.html
#	docs/reference/select_kernel.html
#	docs/reference/simple_lines.html
#	docs/reference/simple_nkde.html
#	docs/reference/simple_tnkde.html
#	docs/reference/simplify_network.html
#	docs/reference/small_mtl_network.html
#	docs/reference/snapPointsToLines2.html
#	docs/reference/spNetwork-package.html
#	docs/reference/sp_char_index.html
#	docs/reference/spatial_index-cash-new.html
#	docs/reference/spatial_index-cash-tree_request.html
#	docs/reference/spatial_index.html
#	docs/reference/spatial_request.html
#	docs/reference/split_border.html
#	docs/reference/split_by_grid.html
#	docs/reference/split_by_grid.mc.html
#	docs/reference/split_by_grid_abw.html
#	docs/reference/split_by_grid_abw.mc.html
#	docs/reference/split_graph_components.html
#	docs/reference/split_lines_at_vertex.html
#	docs/reference/st_bbox_by_feature.html
#	docs/reference/st_bbox_geom.html
#	docs/reference/surrounding_points.html
#	docs/reference/tkde.html
#	docs/reference/tnkde.html
#	docs/reference/tnkde.mc.html
#	docs/reference/tnkde_get_loo_values.html
#	docs/reference/tnkde_worker.html
#	docs/reference/tnkde_worker_bw_sel.html
#	docs/reference/tnkdecontinuousfunction.html
#	docs/reference/tnkdediscontinuousfunction.html
#	docs/reference/tnkdediscontinuousfunctionsparse.html
#	docs/reference/triangle_kernel.html
#	docs/reference/triangle_kernel_cpp.html
#	docs/reference/triangle_kernelos.html
#	docs/reference/tricube_kernel.html
#	docs/reference/tricube_kernel_cpp.html
#	docs/reference/tricube_kernelos.html
#	docs/reference/trim_lines_at.html
#	docs/reference/triweight_kernel.html
#	docs/reference/triweight_kernel_cpp.html
#	docs/reference/triweight_kernelos.html
#	docs/reference/uniform_kernel.html
#	docs/reference/uniform_kernel_cpp.html
#	docs/reference/uniform_kernelos.html
#	docs/reference/worker_adaptive_bw_tnkde.html
#	inst/extdata/results_vignette_kfunc.rda
#	inst/extdata/results_vignette_network_build.rda
#	inst/extdata/results_vignette_nkde.rda
#	inst/extdata/results_vignette_tnkde.rda
#	man/bw_cv_likelihood_calc.mc.Rd
#	man/bw_cvl_calc.mc.Rd
#	man/bws_tnkde_cv_likelihood_calc.Rd
#	man/bws_tnkde_cv_likelihood_calc.mc.Rd
#	man/figures/unnamed-chunk-8-1.png
#	tests/testthat/test_border_correction_sf.R
#	tests/testthat/test_bw_selection_tnkde_sf.R
#	vignettes/images/animated_map.gif
#	vignettes/web_vignettes/images/animated_densities.gif
  • Loading branch information
JeremyGelb committed Oct 31, 2023
1 parent dfcc8aa commit 2fb784d
Show file tree
Hide file tree
Showing 70 changed files with 10,976 additions and 39 deletions.
17 changes: 17 additions & 0 deletions .Rbuildignore.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
^.*\.Rproj$
^\.Rproj\.user$
^doc$
^Meta$
^KNetworkFunctions_cache$
^cran-comments\.md$
^README\.rmd$
^LICENSE\.txt$
^CONDUCT\.md$
^CONTRIBUTING\.md$
^\.github$
^_pkgdown\.yml$
^docs$
^man-roxygen$
^pkgdown$
^codecov\.yml$
^.*\vignettes\web_vignettes$
64 changes: 64 additions & 0 deletions DESCRIPTION.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
Package: spNetwork
Type: Package
Title: Spatial Analysis on Network
<<<<<<< HEAD
Version: 0.4.4
=======
Version: 0.4.3.8
>>>>>>> master
Authors@R: c(
person("Jeremy", "Gelb", email = "[email protected]",role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7114-2714")),
person("Philippe", "Apparicio", email="[email protected]", role=c("ctb"), comment = c(ORCID = "0000-0001-6466-9342")))
Description: Perform spatial analysis on network.
Implement several methods for spatial analysis on network: Network Kernel Density estimation,
building of spatial matrices based on network distance ('listw' objects from 'spdep' package), K functions estimation
for point pattern analysis on network, k nearest neighbours on network, reachable area calculation, and graph generation
References: Okabe et al (2019) <doi:10.1080/13658810802475491>;
Okabe et al (2012, ISBN:978-0470770818);Baddeley et al (2015, ISBN:9781482210200).
License: GPL-2
Encoding: UTF-8
LazyData: true
Imports:
spdep (>= 1.1.2),
igraph (>= 1.2.6),
cubature (>= 2.0.4.1),
future.apply (>= 1.4.0),
methods (>= 1.7.1),
ggplot2 (>= 3.3.0),
progressr (>= 0.4.0),
data.table (>= 1.12.8),
Rcpp (>= 1.0.4.6),
Rdpack (>= 2.1.1),
dbscan (>= 1.1-8),
sf (>= 1.0-3),
dplyr (>= 0.8.3),
abind (>= 1.4-5)
Depends:
R (>= 3.6)
Suggests:
future (>= 1.16.0),
testthat (>= 3.0.0),
kableExtra (>= 1.1.0),
RColorBrewer (>= 1.1-2),
classInt (>= 0.4-3),
reshape2 (>= 1.4.3),
rlang (>= 0.4.6),
rgl (>= 0.107.14),
tmap (>= 3.3-1),
smoothr (>= 0.2.2),
concaveman (>= 1.1.0),
covr (>= 3.5.1),
knitr,
rmarkdown
RoxygenNote: 7.2.3
VignetteBuilder:
knitr
URL: https://jeremygelb.github.io/spNetwork/
BugReports: https://github.com/JeremyGelb/spNetwork/issues
LinkingTo:
Rcpp,
RcppProgress,
RcppArmadillo,
BH
RdMacros: Rdpack
Language: en-CA
Loading

0 comments on commit 2fb784d

Please sign in to comment.