Revert "Merge branch 'DEV' into DEV_website"

This reverts commit 5a4bee6, reversing
changes made to f5d9543.

DESCRIPTION

@@ -28,7 +28,6 @@ Imports:
     cli,
     collapse (>= 2.0.9),
     data.table,
-    vctrs (>= 0.6.4),
     wbpip (>= 0.1.0.9012)
 Depends: 
     R (>= 2.10)

NAMESPACE

@@ -1,89 +1,11 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(format,pipster_gd)
-S3method(format,pipster_md)
-S3method(get_gini,default)
-S3method(get_gini,pipster_gd)
-S3method(get_gini,pipster_md)
-S3method(get_mld,default)
-S3method(get_mld,pipster_gd)
-S3method(get_mld,pipster_md)
-S3method(get_polarization,default)
-S3method(get_polarization,pipster_gd)
-S3method(get_polarization,pipster_md)
-S3method(get_pov_gap,default)
-S3method(get_pov_gap,pipster_gd)
-S3method(get_pov_gap,pipster_md)
-S3method(get_pov_headcount,default)
-S3method(get_pov_headcount,pipster_gd)
-S3method(get_pov_headcount,pipster_md)
-S3method(get_pov_severity,default)
-S3method(get_pov_severity,pipster_gd)
-S3method(get_pov_severity,pipster_md)
-S3method(get_quantile,default)
-S3method(get_quantile,pipster_gd)
-S3method(get_quantile,pipster_md)
-S3method(get_quantile_welfare_share,default)
-S3method(get_quantile_welfare_share,pipster_gd)
-S3method(get_quantile_welfare_share,pipster_md)
-S3method(get_watts,default)
-S3method(get_watts,pipster_gd)
-S3method(get_watts,pipster_md)
-S3method(get_welfare_share_at,default)
-S3method(get_welfare_share_at,pipster_gd)
-S3method(get_welfare_share_at,pipster_md)
-S3method(vec_arith,pipster_gd)
-S3method(vec_arith,pipster_md)
-S3method(vec_arith.numeric,pipster_gd)
-S3method(vec_arith.numeric,pipster_md)
-S3method(vec_arith.pipster_gd,default)
-S3method(vec_arith.pipster_gd,numeric)
-S3method(vec_arith.pipster_gd,pipster_gd)
-S3method(vec_arith.pipster_md,default)
-S3method(vec_arith.pipster_md,numeric)
-S3method(vec_arith.pipster_md,pipster_md)
-S3method(vec_cast,double.pipster_gd)
-S3method(vec_cast,double.pipster_md)
-S3method(vec_cast,pipster_gd.double)
-S3method(vec_cast,pipster_gd.pipster_gd)
-S3method(vec_cast,pipster_md.double)
-S3method(vec_cast,pipster_md.pipster_md)
-S3method(vec_math,pipster_gd)
-S3method(vec_math,pipster_md)
-S3method(vec_ptype2,double.pipster_gd)
-S3method(vec_ptype2,double.pipster_md)
-S3method(vec_ptype2,integer.pipster_gd)
-S3method(vec_ptype2,integer.pipster_md)
-S3method(vec_ptype2,pipster_gd.double)
-S3method(vec_ptype2,pipster_gd.integer)
-S3method(vec_ptype2,pipster_gd.pipster_gd)
-S3method(vec_ptype2,pipster_md.double)
-S3method(vec_ptype2,pipster_md.integer)
-S3method(vec_ptype2,pipster_md.pipster_md)
-S3method(vec_ptype_abbr,pipster_gd)
-S3method(vec_ptype_abbr,pipster_md)
 export(as_pip)
-export(as_pipster_gd)
-export(as_pipster_md)
-export(create_pipster_object)
-export(get_gini)
-export(get_mld)
-export(get_polarization)
-export(get_pov_gap)
-export(get_pov_headcount)
-export(get_pov_severity)
-export(get_quantile)
-export(get_quantile_welfare_share)
-export(get_watts)
-export(get_welfare_share_at)
 export(identify_pip_type)
-export(is_pipster_gd)
-export(is_pipster_md)
 export(pipgd_gini)
 export(pipgd_lorenz_curve)
 export(pipgd_mld)
 export(pipgd_params)
-export(pipgd_polarization)
 export(pipgd_pov_gap)
 export(pipgd_pov_headcount)
 export(pipgd_pov_severity)
@@ -103,7 +25,4 @@ export(pipmd_quantile)
 export(pipmd_quantile_welfare_share)
 export(pipmd_watts)
 export(pipmd_welfare_share_at)
-export(pipster_gd)
-export(pipster_md)
 import(collapse)
-import(vctrs)

R/check_params.R

@@ -22,12 +22,13 @@ check_pipgd_params <- function(lp) {
 
   ## welfare -----------
 
+
   ## welfare and params -----------
   if ( all(c("params", "welfare") %in% nlp)) {
     if (!is.null(lp$params) &&
-        (!is.null(lp$welfare)  || !is.null(lp$weight))) {
+        (!is.null(lp$welfare)  || !is.null(lp$population))) {
       cli::cli_abort("You must specify either {.field params} or
-                {.field welfare} and {.field weight}")
+                {.field welfare} and {.field population}")
     }
   }