chgs during call

.Rbuildignore

@@ -1,10 +1,9 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-new_flow_control.R
 test.R
 build.R
 .gitignore
-  ui_flow_control.R
+ui_flow_control*.R
 heaping_breakpoints.R
 R/test2.R
 R/test_data_NOT_part_of_final_package.R

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: ODAPbackend
 Type: Package
 Title: Standardize, Evaluate, and Adjust Demographic Data
-Version: 00.03.008
-Date: 2025-10-15
+Version: 00.03.009
+Date: 2025-10-16
 Authors@R: c(
    person("Tim", "Riffe", role = c("aut", "cre"), 
           email = "tim.riffe@gmail.com", comment = c(ORCID = "0000-0002-2673-4622")),
@@ -12,7 +12,7 @@ License: file LICENSE
 LazyLoad: yes
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 Depends:
     R (>= 4.1),
     ggplot2
@@ -23,6 +23,10 @@ Suggests:
 Imports:
     DemoTools (>= 01.13.85),
     stringr,
+    codetools,
+    wpp2024,
+    forcats,
+    ungroup,
     dplyr,
     scales,
     readxl,

NAMESPACE

@@ -3,23 +3,34 @@
 export(capture_args)
 export(check_coherent)
 export(check_data)
+export(check_data_generic)
+export(check_data_graduate_time)
+export(check_data_heaping)
+export(check_data_lifetable)
+export(check_data_opag)
 export(check_groupid)
+export(check_has_numeric)
 export(check_heaping_general)
 export(check_heaping_user)
 export(check_interpolate)
 export(check_lower)
 export(check_missing_cols)
+export(check_missing_cols_generic)
+export(check_missing_cols_opag)
 export(check_nas)
+export(check_nlx_if_present)
 export(check_numeric)
+export(check_numeric_opag)
 export(check_redundant)
 export(check_rows)
 export(check_sequential)
 export(check_sex)
-export(check_smooth)
+export(check_sex_opag)
 export(create_groupid)
 export(extension_check)
 export(graduate_auto)
 export(graduate_auto_5)
+export(graduate_time)
 export(interp_linear)
 export(interpolate)
 export(lt_check)
@@ -28,7 +39,6 @@ export(lt_flexible_chunk)
 export(lt_plot)
 export(lt_summary)
 export(lt_summary_chunk)
-export(movepop)
 export(odap_opag)
 export(plot_compare_rates)
 export(plot_histogram)
@@ -40,7 +50,6 @@ export(plot_smooth_compare)
 export(pyramid)
 export(read_data)
 export(smooth1d)
-export(smooth1d_chunk)
 export(smooth_flexible)
 export(smooth_flexible_chunk)
 importFrom(DemoTools,OPAG)
@@ -55,6 +64,7 @@ importFrom(DemoTools,graduate)
 importFrom(DemoTools,graduate_mono)
 importFrom(DemoTools,graduate_uniform)
 importFrom(DemoTools,groupAges)
+importFrom(DemoTools,int2age)
 importFrom(DemoTools,is_abridged)
 importFrom(DemoTools,is_age_coherent)
 importFrom(DemoTools,is_age_redundant)
@@ -81,6 +91,7 @@ importFrom(cowplot,plot_grid)
 importFrom(dplyr,.data)
 importFrom(dplyr,across)
 importFrom(dplyr,arrange)
+importFrom(dplyr,as_tibble)
 importFrom(dplyr,bind_rows)
 importFrom(dplyr,case_match)
 importFrom(dplyr,case_when)
@@ -101,13 +112,15 @@ importFrom(dplyr,last)
 importFrom(dplyr,left_join)
 importFrom(dplyr,mutate)
 importFrom(dplyr,n)
+importFrom(dplyr,pick)
 importFrom(dplyr,pull)
 importFrom(dplyr,reframe)
 importFrom(dplyr,rename)
 importFrom(dplyr,select)
 importFrom(dplyr,summarise)
 importFrom(dplyr,summarize)
 importFrom(dplyr,ungroup)
+importFrom(forcats,as_factor)
 importFrom(furrr,future_map_dfr)
 importFrom(future,multisession)
 importFrom(future,plan)
@@ -126,9 +139,11 @@ importFrom(ggplot2,ggplot)
 importFrom(ggplot2,ggtitle)
 importFrom(ggplot2,guide_legend)
 importFrom(ggplot2,labs)
+importFrom(ggplot2,scale_color_brewer)
 importFrom(ggplot2,scale_color_discrete)
 importFrom(ggplot2,scale_color_manual)
 importFrom(ggplot2,scale_fill_brewer)
+importFrom(ggplot2,scale_linetype_manual)
 importFrom(ggplot2,scale_x_continuous)
 importFrom(ggplot2,scale_x_log10)
 importFrom(ggplot2,scale_y_continuous)
@@ -140,6 +155,7 @@ importFrom(ggplot2,theme_minimal)
 importFrom(grDevices,gray)
 importFrom(magrittr,"%>%")
 importFrom(mgcv,gam)
+importFrom(mgcv,s)
 importFrom(parallelly,availableCores)
 importFrom(purrr,map)
 importFrom(purrr,map2)
@@ -159,10 +175,12 @@ importFrom(scales,comma)
 importFrom(scales,label_log)
 importFrom(scales,pretty_breaks)
 importFrom(signal,interp1)
+importFrom(stats,gaussian)
 importFrom(stats,loess)
 importFrom(stats,loess.control)
 importFrom(stats,na.omit)
 importFrom(stats,predict)
+importFrom(stats,qlogis)
 importFrom(stats,smooth.spline)
 importFrom(stats,splinefun)
 importFrom(stats,supsmu)
@@ -171,6 +189,7 @@ importFrom(stringr,str_detect)
 importFrom(stringr,str_flatten)
 importFrom(tibble,as_tibble)
 importFrom(tibble,lst)
+importFrom(tibble,rownames_to_column)
 importFrom(tibble,tibble)
 importFrom(tidyr,pivot_longer)
 importFrom(tidyr,pivot_wider)
@@ -180,6 +199,7 @@ importFrom(tidyselect,all_of)
 importFrom(tidyselect,any_of)
 importFrom(tidyselect,everything)
 importFrom(tidyselect,matches)
+importFrom(ungroup,pclm)
 importFrom(utils,data)
 importFrom(utils,globalVariables)
 importFrom(utils,installed.packages)

R/basepop.R

@@ -0,0 +1,39 @@
+
+
+# TODO:
+# make wrapper following the same input-output format as smooth_flexible(),
+# modified to the needs of basepop.
+
+# We either have 5-year-in - 5-year out, single-year-in - single-year-out,
+# or abridged-in - abridged out.
+
+# for the case of 5-year-in 5-year out, one can either graduate to single, 
+# run basepop_single(), then group to 5-year, or one can graduate to single (pclm),
+# abridge ages, then run basepop_five(). Let's do this second one; example seen
+# in DemoTools documentation of basepop_five()
+
+# age regrouping should be handled elsewhere.
+# TR recommends first graduating and then running basepop, 
+# not the other way around
+
+# Two main DemoTools functions to use are basepop_five() and basepop_single().
+
+#remotes::install_github("timriffe/DemoTools")
+
+# The trick here is in showing how a user might actually practically give their
+# own inputs rather than relying on the default wpp.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+