dymium-org · asiripanich · Aug 16, 2020 · Sep 3, 2020 · Sep 18, 2020 · Sep 18, 2020
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,4 +1,4 @@
-Package: dymiumCore
+Package: dymium.core
 Version: 0.1.9.9000
 Title: A Toolkit for Building a Dynamic Microsimulation Model for Integrated Urban Modelling
 Description: A modular microsimulation modelling framework for integrated urban modelling.
@@ -18,7 +18,6 @@ Imports:
     R6 (>= 2.3.0),
     data.table (>= 1.13.0),
     checkmate (>= 1.9.4),
-    matchingR (>= 1.3.0),
     magrittr,
     purrr (>= 0.3.0),
     lgr (>= 0.3.3),
@@ -31,8 +30,9 @@ Imports:
     rlang (>= 0.4.0),
     tryCatchLog (>= 1.1.0)
 Suggests:
+    matchingR (>= 1.3.0),
     furrr (>= 0.1.0),
-    testthat (>= 2.1.0),
+    testthat (>= 3.0.0),
     fastmatch (>= 1.1.0),
     mlogit (>= 1.1.0),
     caret (>= 6.0.0),
@@ -52,8 +52,11 @@ Suggests:
     scales (>= 1.1.0),
     prettydoc,
     visNetwork (>= 2.0.0),
-    dfidx
-Roxygen: list(markdown = TRUE, r6 = FALSE)
+    dfidx,
+    parsnip,
+    ranger,
+    glmnet
+Roxygen: list(markdown = TRUE, r6 = TRUE)
 RoxygenNote: 7.1.1
 StagedInstall: no
 VignetteBuilder: knitr
@@ -62,10 +65,6 @@ Collate:
     'Entity.R'
     'Agent.R'
     'Asset.R'
-    'Building.R'
-    'BuildingCommercial.R'
-    'BuildingIndustrial.R'
-    'BuildingResidential.R'
     'ContainerGeneric.R'
     'Container.R'
     'DataBackend.R'
@@ -103,18 +102,16 @@ Collate:
     'data.R'
     'dymiumCore-package.R'
     'makeModel.R'
-    'module.R'
     'mutate-entity.R'
     'population-register.R'
-    'scenario.R'
-    'sim.R'
     'simulate_choice.R'
     'transition-fnc.R'
-    'usethis.R'
     'utils-class.R'
     'utils-event.R'
     'utils-pipe.R'
     'utils-pipeline.R'
     'utils.R'
     'validate.R'
     'zzz.R'
+Config/testthat/parallel: true
+Config/testthat/edition: 3
diff --git a/NAMESPACE b/NAMESPACE
@@ -18,6 +18,7 @@ S3method(predict,ModelMultinomialLogit)
 S3method(simulate_choice,Model)
 S3method(simulate_choice,WrappedModel)
 S3method(simulate_choice,data.frame)
+S3method(simulate_choice,dymium.choice_table)
 S3method(simulate_choice,glm)
 S3method(simulate_choice,list)
 S3method(simulate_choice,train)
@@ -27,10 +28,6 @@ export("%>%")
 export(.get_sim_time)
 export(Agent)
 export(Asset)
-export(Building)
-export(BuildingCommercial)
-export(BuildingIndustrial)
-export(BuildingResidential)
 export(Container)
 export(ContainerGeneric)
 export(DataBackend)
@@ -72,19 +69,15 @@ export(assert_target)
 export(assert_transition_supported_model)
 export(check_entity)
 export(check_entity_ids)
-export(check_module)
-export(check_module_version)
 export(check_required_models)
 export(check_subset2)
 export(check_target)
 export(check_transition_supported_model)
 export(combine_histories)
-export(create_scenario)
 export(create_toy_population)
 export(create_toy_world)
 export(dm_get_model)
 export(dm_save)
-export(download_module)
 export(dsample)
 export(element_wise_expand_lists)
 export(expect_entity)
@@ -94,14 +87,9 @@ export(expect_subset2)
 export(expect_target)
 export(expect_transition_supported_model)
 export(extract_data)
-export(get_active_scenario)
-export(get_all_module_files)
 export(get_history)
 export(get_log)
 export(get_models)
-export(get_module_files)
-export(get_module_versions)
-export(get_modules)
 export(get_sim_time)
 export(get_supported_models)
 export(get_transition)
@@ -121,8 +109,6 @@ export(pop_register)
 export(register)
 export(remove_entity)
 export(sample_choice)
-export(set_active_scenario)
-export(sim)
 export(simulate_choice)
 export(test_entity)
 export(test_entity_ids)
@@ -132,9 +118,6 @@ export(test_target)
 export(test_transition_supported_model)
 export(transition)
 export(unnest_dt)
-export(use_event)
-export(use_module)
-export(use_module_readme)
 export(validate_linkages)
 export(which_max_n)
 export(which_min_n)
@@ -161,8 +144,6 @@ importFrom(magrittr,"%>%")
 importFrom(magrittr,freduce)
 importFrom(magrittr,functions)
 importFrom(magrittr,set_colnames)
-importFrom(matchingR,galeShapley.collegeAdmissions)
-importFrom(matchingR,galeShapley.marriageMarket)
 importFrom(purrr,flatten_int)
 importFrom(purrr,map)
 importFrom(purrr,map2)

diff --git a/NEWS.md b/NEWS.md
@@ -3,13 +3,16 @@
 ## New features
 
 - `ModelMultinomialLogit` and `ModelBinaryChoice` now have S3 `predict` and `summary` methods. Note that `ModelMultinomialLogit` requires `newdata` to be in the same format that is required by `mlogit`.
+- `Population$household_type()` now returns the number of members in household and remove individuals not belong to any household.
+- When calling `World$add()` and `name` is missing, it will see if the object has a `name` field, if it is a `Target` or a `Model`.
 
 ## Changes
 
 - closed #57
 - add a `name` argument to `Model`'s constructor function and expose it as an R6 active field. 
 - `World$add()` can now be used to add a named `Model` without providing the `name` argument.
 - `World$add()` gained a `replace` argument with `TRUE` as its default value. 
+- `Generic` now has an active `name` field which will equal to `NULL` if no name is given.
 
 ## Bug fixes
 

diff --git a/R/Building.R b/R/Building.R
diff --git a/R/BuildingCommercial.R b/R/BuildingCommercial.R
diff --git a/R/BuildingIndustrial.R b/R/BuildingIndustrial.R
diff --git a/R/BuildingResidential.R b/R/BuildingResidential.R
diff --git a/R/Container.R b/R/Container.R
@@ -5,7 +5,7 @@
 #'
 #'
 #' @usage NULL
-#' @format [R6::R6Class] object inheriting from [dymiumCore::ContainerGeneric]
+#' @format [R6::R6Class] object inheriting from [ContainerGeneric]
 #' @include ContainerGeneric.R
 #'
 #' @section Construction:
@@ -25,8 +25,8 @@
 #'
 #' * `add(x, name)`\cr
 #'  ([R6::R6Class]|Supported Transition Models)\cr
-#'  Add an [R6::R6Class] object or a object of the classes in [dymiumCore::SupportedTransitionModels] to self$Cont.
-#'  Name must be given when `x` is an object of the classes in [dymiumCore::SupportedTransitionModels].
+#'  Add an [R6::R6Class] object or a object of the classes in [SupportedTransitionModels] to self$Cont.
+#'  Name must be given when `x` is an object of the classes in [SupportedTransitionModels].
 #'
 #' * `check_pos(x)`\cr
 #' (`integer(1)`) -> (`logical(1)`)\cr
@@ -52,7 +52,7 @@
 #'  generator or string or integer.
 #'
 #' * `unpack(target)`\cr
-#'  ([dymiumCore::Container])\cr
+#'  ([Container])\cr
 #'  Add all the references inside self$Cont to the `target` container. This is
 #'  useful when you have containers within a container so that all references can
 #'  be access via the top container. eg: A World container that contains a Population
@@ -66,7 +66,7 @@
 #' @export
 Container <- R6Class(
   classname = "Container",
-  inherit = dymiumCore::ContainerGeneric,
+  inherit = ContainerGeneric,
   public = list(
 
     add = function(x, name) {