pre cran submission things

Author: ischlo

.Rbuildignore

@@ -9,3 +9,6 @@
 ^pkgdown$
 ^vignettes/*_files$
 ^cran-comments\.md$
+^doc$
+^Meta$
+^revdep$

.gitignore

@@ -6,5 +6,8 @@
 .httr-oauth
 .DS_Store
 inst/doc
-
+dev/
 docs
+/doc/
+/Meta/
+revdep/

DESCRIPTION

@@ -1,10 +1,9 @@
 Package: cppSim
-Title: Fast and memory efficient spatial interaction models
+Title: Fast and Memory Efficient Spatial Interaction Models
 Version: 0.2
 Authors@R: 
     person("Ivann", "Schlosser", , "ivann.schlosser.19@ucl.ac.uk", role = c("aut", "cre"),
            comment = c(ORCID = "0009-0004-4099-3198"))
-Author: Ivann Schlosser [auth,cre],
 Maintainer: Ivann Schlosser <ivann.schlosser.19@ucl.ac.uk>
 Description: This package builds on top of the RcppArmadillo linear
     algebra functionalities to do fast spatial interaction models in the
@@ -19,14 +18,14 @@ URL: https://ischlo.github.io/cppSim/, https://github.com/ischlo/cppSim
 Depends:
     R (>= 2.10)
 Imports:
-    cli,
     Rcpp
 Suggests: 
     data.table,
     foreach,
     knitr,
     rlist,
     rmarkdown,
+    cli,
     sf,
     testthat (>= 3.0.0)
 LinkingTo: 

R/setup.R

@@ -1,8 +1,8 @@
-.onLoad <- function(libname, pkgname) {
+.onAttach <- function(libname, pkgname) {
   found <- cpp_found_openmp()
   if (!found) {
-    cli::cli_alert_info("Cound not find OpenMP.")
+    packageStartupMessage("Cound not find OpenMP.")
   } else {
-    cli::cli_alert_info("OpenMP detected, parallel computations will be performed.")
+    packageStartupMessage("OpenMP detected, parallel computations will be performed.")
   }
 }

README.Rmd

@@ -93,7 +93,7 @@ On the R side, it uses `Rcpp` [@eddelbuettel2011] and `RcppArmadillo` [@eddelbue
 
 ## Performance
 
-Compared to the equivalent functions implemented in pure R, it runs about x10 faster for a $\sim 1000\times 1000$ OD matrix, the speed up is increasignly more significant as matrices get bigger.
+Compared to the equivalent functions implemented in pure R, it runs about x10 faster for a $\sim 1000\times 1000$ OD matrix, the speed up is increasingly more significant as matrices get bigger.
 
 ```{r performance,eval=TRUE,include=TRUE,echo = FALSE}
 

README.md

@@ -108,7 +108,7 @@ On the R side, it uses `Rcpp` (Eddelbuettel and François 2011) and
 
 Compared to the equivalent functions implemented in pure R, it runs
 about x10 faster for a $\sim 1000\times 1000$ OD matrix, the speed up is
-increasignly more significant as matrices get bigger.
+increasingly more significant as matrices get bigger.
 
     #> [1] ""
 

references.bib

@@ -8,7 +8,7 @@
 #include <strings.h>
 #include "support.h"
 
-#define ARMA_USE_OPENMP true
+// #define ARMA_USE_OPENMP true
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -129,7 +129,8 @@ Rcpp::List run_simulation_cpp(const arma::mat &distance, const arma::mat &flows,
   double beta_new = beta_orig + .05;
   Rcpp::List res1, res2, res3;
   double eps = 1.0;
-  int i = 0;
+  // int i = 0;
+  //
   double step = 0.03;
 
   // #ifdef _OPENMP
@@ -161,7 +162,7 @@ Rcpp::List run_simulation_cpp(const arma::mat &distance, const arma::mat &flows,
 
     beta_orig = beta_new;
 
-    i++;
+    // i++;
 
   } while (eps > step);
 

src/gravity_model_functions.cpp

@@ -1,5 +1,5 @@
 
-test_that("doubly constrained tested", {
+test_that("doubly constrained tested",{
 
   ## error datas
   error_dist <- cbind(cppSim::distance_test,1:ncol(cppSim::distance_test))
@@ -28,7 +28,7 @@ test_that("doubly constrained tested", {
   })
 
   testthat::expect_error({
-    cppSim::run_model(flows= error_flow_neg
+    cppSim::run_model(flows = error_flow_neg
                       ,distance = cppSim::distance_test
     )
   })
@@ -45,8 +45,6 @@ test_that("doubly constrained tested", {
 
 })
 
-
-
 test_that("singly constrained tested", {
 
   ## error datas
@@ -73,7 +71,7 @@ test_that("singly constrained tested", {
 
   testthat::expect_error({
     cppSim::run_model_single(flows = orig_flow
-                      ,distance = error_dist_neg#cppSim::distance_test
+                      ,distance = error_dist_neg #cppSim::distance_test
     )
   })