version 2.0.1

cran · Feb 15, 2024 · 0ce5182 · 0ce5182
1 parent 0c0a182
commit 0ce5182
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 43 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: FuzzyPovertyR
 Title: Estimation of Fuzzy Poverty Measures
-Version: 2.0.0
+Version: 2.0.1
 Authors@R: c(
     person("Federico", "Crescenzi", , "federico.crescenzi@unitus.it", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-0701-4398")),
@@ -19,11 +19,11 @@ Suggests: knitr, rmarkdown, kableExtra, spelling
 VignetteBuilder: knitr
 Language: en-US
 NeedsCompilation: no
-Packaged: 2024-02-12 15:39:21 UTC; federico
+Packaged: 2024-02-13 16:39:20 UTC; federico
 Author: Federico Crescenzi [aut, cre] (<https://orcid.org/0000-0002-0701-4398>),
   Lorenzo Mori [aut] (<https://orcid.org/0000-0003-4152-9712>),
   Gianni Betti [ctb] (<https://orcid.org/0000-0002-0414-7806>)
 Maintainer: Federico Crescenzi <federico.crescenzi@unitus.it>
 Depends: R (>= 3.5.0)
 Repository: CRAN
-Date/Publication: 2024-02-12 16:00:02 UTC
+Date/Publication: 2024-02-14 09:52:41 UTC
diff --git a/MD5 b/MD5
@@ -1,4 +1,4 @@
-58639a24159a833dbb638307feab0350 *DESCRIPTION
+95307bc00a5457ab8b644e8d28ea4ad0 *DESCRIPTION
 dde7823530dfe169a81f694ec68e99ad *LICENSE
 6c94f70ceb322ebeb5ebfa029b496b30 *NAMESPACE
 242c73eaf1e24a2c6dac7290bea90df1 *R/FuzzyPovertyR-package.R
@@ -28,28 +28,28 @@ a9ab7cf099254c44f4d2ce1afd6d73b5 *R/fs_modified_sum.R
 deb2c5cdcf6af3a08840307e15e38ede *R/fs_mu.R
 271d27d22b70f23b922b607495a80429 *R/fs_objective.R
 10d1219418cd1f8b49681166baab1f42 *R/fs_order.R
-1165a9d77996bd70a59cd8f89342fd28 *R/fs_plot.R
+f92743dd526b11b0b4bbb25e3698e933 *R/fs_plot.R
 95f5d94ad06b7fc17d02b6d8797a5ec9 *R/fs_summary.R
 49d8caa166d38128633b95c679e22920 *R/fs_transform.R
 07980308f05cfb79c74c7932d919008c *R/fs_var.R
 702788b1ab5dccd36be5581b9e4baa37 *R/fs_wb.R
 68bce5497fc5ae33e8c108db768f098d *R/fs_weight.R
 39d0a4886c5e6ebc06a67bbc80828cf7 *R/globals.R
-3752ca9a8ce4479041474a8de29016d4 *R/plot_method.R
+8c6948750a67261e84d92c538192ad69 *R/plot_method.R
 d864fbf9d9c7d883064139ec0721c6ab *R/summary_method.R
 bae705811338cfea482d4086ca608978 *R/weighted_quantile.R
 0e77d44aab6d0fe696a1687fd31652d0 *build/vignette.rds
 7a0c8828fdf3986924a85a3b772ad26c *data/eusilc.RData
 e5ccf8521ff4b0ceb7012cc76f7d8e7b *inst/doc/FuzzyPovertyR.R
 b661fc4ad3859b067dfbaa5ea65e15a3 *inst/doc/FuzzyPovertyR.Rmd
-af5f453240c99fbe045eee797def1c2e *inst/doc/FuzzyPovertyR.html
-a533a7c35d03fd45fd487c8829b28ab8 *man/FN.Rd
+6b995127edfc3012c235aa43dfc19ce3 *inst/doc/FuzzyPovertyR.html
+7ad892fd9d4cca469b28aee18462b97f *man/FN.Rd
 1da733110d498da215d39f5131f6e2f7 *man/FuzzyPoverty.Rd
 83f4c12a73ab2e9d46693cd758acfcc9 *man/FuzzyPovertyR-package.Rd
 2535fc5349032414a7cc0412beb1ae01 *man/FuzzySupplementary.Rd
 50d26ab89bf5e2df4a2aa4c3dae9aaa3 *man/Fuzzy_conv.Rd
 1e34f2c91feb7f08f6b72eb77f5d1b36 *man/HCR.Rd
-5244fef898058bd7db30b207df90ffe8 *man/MemberhsipGradesMatrix.Rd
+1fe86342f944404afa1262ccf02779d4 *man/MemberhsipGradesMatrix.Rd
 97a04b4efc98844c8a307a0e6c0a621b *man/belhadj2015.Rd
 a1c4ef238042482fe51c7a20332026cd *man/bootP.Rd
 3463da26d71dcf373947842047238b15 *man/eq_predicate.Rd
@@ -61,7 +61,7 @@ e446be2896ac361605065c7e08cfdbbd *man/fm_TFR.Rd
 195a2e1ee547b9b31066ef084380c4a2 *man/fm_belhadj2011.Rd
 bfec9aad74bff4bb51c269d0c720c72c *man/fm_belhadj2015.Rd
 da3c77484e85bb54ad38118f463921a1 *man/fm_cerioli.Rd
-68e21eb9ccb950002f4c4e48d79c7da5 *man/fm_construct.Rd
+c8131a0f7c26a4808469228a60542e1d *man/fm_construct.Rd
 c668eb0382b0bf8996c6cff44a9d9f13 *man/fm_equate.Rd
 743d74fbdb8776676ba66131550e5ac1 *man/fm_mu.Rd
 5c91162a4024d7af404531b8ee0302eb *man/fm_mu2.Rd
@@ -77,19 +77,19 @@ aa12ab3ad18d1e2d87d2abf2f290c3cd *man/fs_equate.Rd
 310534330f1eaaecf15f8cd0766c167a *man/fs_objective.Rd
 497920d79e9512844c9579ad66da08d8 *man/fs_order.Rd
 b21a0bbbfec72a3c8ac899368acbc6b9 *man/fs_transform.Rd
-555319bf0a106438adc39b87ca50dfe9 *man/fs_var.Rd
+d2ca691e783e41d8621ab46de3e77ce0 *man/fs_var.Rd
 ebb9dd2a5571872370af6f355d8a8986 *man/fs_weight.Rd
 b81485ef511423c408c195ddc291ee73 *man/fuzzyScaleItem.Rd
 0de916acd4a6c067fbdfb6bbe9c921ba *man/modifiedSum.Rd
 4fbfa95fc8a098c297a5c41b7872c564 *man/plot.FuzzyMonetary.Rd
 b0423a99ba9898f27076b0daf8851c52 *man/plot.FuzzySupplementary.Rd
 5c4c50409b9f86c56181af06541cd960 *man/summary.FuzzyMonetary.Rd
 a821d26f5bb85f59eb28094108b9498e *man/summary.FuzzySupplementary.Rd
-afbbb175c806df9813582d69813a7472 *man/ub1.Rd
-3f575ab895cbd6349829949a368fb624 *man/ub2.Rd
+3bc97e0475916fe7ae5e5456d8528840 *man/ub1.Rd
+95fd97d58cc347439f42a7d71107f38f *man/ub2.Rd
 b346f0f38dca19b7bf18327f48405877 *man/wb.jh.Rd
 0f11ba89367bbc8b616c0db70f3e2f66 *man/weighted_quantile.Rd
-0f148a7e6a027db08408ab202b33b4a9 *man/z_fun.Rd
+edf9e7e5c31620328d0fcc1a84b43299 *man/z_fun.Rd
 0622a97a2aaa3c342f09636052c2d7f5 *tests/spelling.R
 b661fc4ad3859b067dfbaa5ea65e15a3 *vignettes/FuzzyPovertyR.Rmd
 2efc05dad1d9c3bdc6837ec8186f41d4 *vignettes/bib.bib
diff --git a/R/fs_plot.R b/R/fs_plot.R
@@ -68,9 +68,9 @@ plot.FuzzySupplementary <- function(x,...){
 
     plot.data %>%
       ggplot2::ggplot(ggplot2::aes(x = s, y = mu)) +
-      ggplot2::geom_line() +
       ggplot2::facet_wrap(~Dimension) +
       ggplot2::geom_area(alpha = .1) +
+      ggplot2::geom_line() +
       ggplot2::scale_y_continuous(expression(mu)) +
       ggplot2::theme_minimal() +
       ggplot2::theme(axis.title.y = element_text(angle = 0, vjust = 0.5),
@@ -84,7 +84,9 @@ plot.FuzzySupplementary <- function(x,...){
       tidyr::pivot_longer(!c(Size, Breakdown), names_to = "Dimension", values_to = "Variance") %>%
       ggplot2::ggplot(ggplot2::aes(x = reorder(Breakdown, Size) , y = Variance, group = 1)) +
       ggplot2::facet_wrap(~Dimension) +
-      ggplot2::geom_line() + ggplot2::geom_point() + ggplot2::geom_area(alpha = .1) +
+      ggplot2::geom_area(alpha = .1) +
+      ggplot2::geom_line() +
+      ggplot2::geom_point() +
       # geom_bar(stat = "identity", alpha = .7, color = "black") +
       ggplot2::scale_x_discrete("Breakdown (sorted by ascending sample size)") +
       ggplot2::theme_minimal()

diff --git a/R/plot_method.R b/R/plot_method.R
@@ -17,41 +17,41 @@ plot.FuzzyMonetary <- function(x,...){
       x.plot.data %>% dplyr::select(-weight) %>%
         tidyr::pivot_longer(cols = c(mu, Lorenz, WECDF), names_to = "curve", values_to = "value") %>%
         ggplot2::ggplot(ggplot2::aes(x = predicate, y = value, linetype = curve)) +
-        ggplot2::geom_line() +
-        ggplot2::scale_linetype_manual(values = c("Lorenz" = "dashed", "mu" = "solid", "WECDF" = "dotted")) +
         ggplot2::geom_area(position = "identity", alpha = .1) +
+        ggplot2::scale_linetype_manual(values = c("Lorenz" = "dashed", "mu" = "solid", "WECDF" = "dotted")) +
+        ggplot2::geom_line() +
         ggplot2::scale_x_continuous("Predicate", labels = function(x) format(x, scientific = FALSE), n.breaks = 6) +
         ggplot2::scale_y_continuous(expression(mu)) +
         ggplot2::theme_minimal() +
         ggplot2::theme(axis.title.y = element_text(angle = 0, vjust = 0.5),
                        legend.position = "bottom")
 
-    } else if (x$fm == "Verma and Betti") {
+    } else if (x$fm == "verma1999") {
       FL.curve = fm_FL(x$results$predicate, x$results$weight)
       x.plot.data = data.frame(x$results, Lorenz = FL.curve$Lorenz)
       x.plot.data %>%
         ggplot2::ggplot(ggplot2::aes(x = predicate, y = Lorenz)) +
-        ggplot2::geom_line() +
         ggplot2::geom_area(position = "identity", alpha = .1) +
+        ggplot2::geom_line() +
         ggplot2::scale_x_continuous("Predicate", labels = function(x) format(x, scientific = FALSE), n.breaks = 6) +
         ggplot2::scale_y_continuous(expression(mu)) +
         ggplot2::theme_minimal() +
         ggplot2::theme(axis.title.y = element_text(angle = 0, vjust = 0.5),
                        legend.position = "bottom")
 
-    } else if (x$fm == "Totally fuzzy and Relative") {
+    } else if (x$fm == "TFR") {
       FL.curve = fm_FL(x$results$predicate, x$results$weight)
       x.plot.data = data.frame(x$results, "WECDF" = FL.curve$WECDF)
       x.plot.data %>%
         ggplot2::ggplot(ggplot2::aes(x = predicate, y = WECDF)) +
-        ggplot2::geom_line() +
         ggplot2::geom_area(position = "identity", alpha = .1) +
+        ggplot2::geom_line() +
         ggplot2::scale_x_continuous("Predicate", labels = function(x) format(x, scientific = FALSE), n.breaks = 6) +
         ggplot2::scale_y_continuous(expression(mu)) +
         ggplot2::theme_minimal() +
         ggplot2::theme(axis.title.y = element_text(angle = 0, vjust = 0.5),
                        legend.position = "bottom")
-    } else if (x$fm == "Belhadj (2015)") {
+    } else if (x$fm == "belhadj2015") {
       par.df = data.frame(Parameters = names(x$parameters[-4]),
                           value = unlist(x$parameters[-4]),
                           y = c(0))
@@ -67,13 +67,14 @@ plot.FuzzyMonetary <- function(x,...){
         ggplot2::theme(axis.title.y = element_text(angle = 0, vjust = 0.5),
               legend.position = "bottom")
 
-    } else if (x$fm == "chakravarty" | x$fm == "Cerioli and Zani" | x$fm == "belhadj (2011)"){
+    } else if (x$fm == "chakravarty" | x$fm == "cerioli" | x$fm == "belhadj2011"){
       par.df = data.frame(Parameters = names(x$parameters),
                           value = unlist(x$parameters),
                           y = c(0))
       ggplot2::ggplot(x$results, aes(x = predicate, y = mu)) +
-        ggplot2::geom_line() + geom_area(alpha = .1) +
-        ggplot2::scale_x_continuous("Predicate") +
+        geom_area(alpha = .1) +
+        ggplot2::geom_line() +
+        ggplot2::scale_x_continuous("Predicate", labels = function(x) format(x, scientific = FALSE), n.breaks = 6) +
         ggplot2::scale_y_continuous(expression(mu)) +
         ggplot2::geom_vline(aes(xintercept = value, colour = Parameters), data = par.df, linetype = "dashed") +
         ggplot2::theme_minimal() +
@@ -108,8 +109,8 @@ plot.FuzzyMonetary <- function(x,...){
           mu = 0
         ) %>%
         ggplot2::ggplot( aes(x = predicate, y = mu)) +
-        ggplot2::geom_line(linewidth = .8) +
         ggplot2::geom_area(alpha = .1) +
+        ggplot2::geom_line(linewidth = .8) +
         ggplot2::scale_x_continuous("Predicate", labels = function(x) format(x, scientific = FALSE), n.breaks = 6) +
         ggplot2::scale_y_continuous(expression(mu)) +
         ggplot2::geom_vline(aes(xintercept = value, colour = Parameters), data = par.df, linetype = "dashed") +

diff --git a/inst/doc/FuzzyPovertyR.html b/inst/doc/FuzzyPovertyR.html
diff --git a/man/FN.Rd b/man/FN.Rd
diff --git a/man/MemberhsipGradesMatrix.Rd b/man/MemberhsipGradesMatrix.Rd
diff --git a/man/fm_construct.Rd b/man/fm_construct.Rd
diff --git a/man/fs_var.Rd b/man/fs_var.Rd
diff --git a/man/ub1.Rd b/man/ub1.Rd
diff --git a/man/ub2.Rd b/man/ub2.Rd
diff --git a/man/z_fun.Rd b/man/z_fun.Rd