diff --git a/CHANGES.rst b/CHANGES.rst index 651b24fd..d5fc734f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -52,6 +52,7 @@ TODOs * model/core: Accept units on all quantities. * core: Move calculations as class-methods to provide for overriding certain parts of the algorithm. * core: execute part of the calculation-graph based on the the data given/asked. +.. todolist:: Changelog diff --git a/docs/code.rst b/docs/code.rst index 6c791aa3..f79e835b 100644 --- a/docs/code.rst +++ b/docs/code.rst @@ -336,6 +336,13 @@ Schema type: - object - array + grid_wots: + description: | + A dataframe with 2-level columns (item, gear) + - `p_avail_stable`: reduced by safety-margin, but not by ASM + - `p_avail`: reduced by both SM & ASM + - `p_resist`: road loads power + - `p_req`: road loads & cycle power pmr: title: Power to Unladen-Mass description: Power/unladen-Mass ratio (W/kg). diff --git a/wltp/datamodel.py b/wltp/datamodel.py index 26740da7..b0bd3bb2 100644 --- a/wltp/datamodel.py +++ b/wltp/datamodel.py @@ -394,6 +394,13 @@ def _get_model_schema(additional_properties=False): type: - object - array + grid_wots: + description: |2 + A dataframe with 2-level columns (item, gear) + - `p_avail_stable`: reduced by safety-margin, but not by ASM + - `p_avail`: reduced by both SM & ASM + - `p_resist`: road loads power + - `p_req`: road loads & cycle power pmr: title: Power to Unladen-Mass description: Power/unladen-Mass ratio (W/kg). @@ -918,9 +925,15 @@ def yield_load_curve_errors(mdl): def yield_n_min_errors(mdl): - # TODO: accept ARRAY `n_min_drive` # TODO: min(Nwot) <= n_min_drive_set - # NOTE: cannot check `t_end_cold` is in stop-gap, wltc-class decision not made yet. + """ + .. TODO:: + Support ARRAY for `n_min_drive_up/dn`. + .. TODO:: + cannot Checking of `t_end_cold` is in stop-gap during datamodel-validation; + wltc-class decision not made yet. + + """ d = wio.pstep_factory.get() # g = wio.pstep_factory.get().gears