Skip to content

Commit

Permalink
frem: Handle missing_data_token that is not -99 for post processing
Browse files Browse the repository at this point in the history
  • Loading branch information
rikardn committed Aug 21, 2024
1 parent 0324b97 commit 4772f76
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
16 changes: 16 additions & 0 deletions development/release_notes/release_notes_PsN_next_version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
*********************************************
Changes and bug fixes from PsN 5.4.0 to x.x.x
*********************************************


___General___


___vpc___


___frem___

* Handle missing_data_token properly when it is not -99

___scm___
2 changes: 1 addition & 1 deletion lib/tool/frem.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ sub BUILD

# Check if any covariate column has all same value
# In that case warn and remove column
my $code = "from pharmpy.tools.frem.tool import setup; print(setup(" . PsN::path_literal($model->full_name) . ',' . PsN::python_array($self->covariates) . "))";
my $code = "from pharmpy.tools.frem.tool import setup; print(setup(" . PsN::path_literal($model->full_name) . ',' . PsN::python_array($self->covariates) . ',"' . $self->missing_data_token . '"' . "))";
my $filtered_covariates = PsN::call_pharmpy_wrapper($code);
$filtered_covariates = PsN::from_python_array($filtered_covariates);
my @filtered_categorical;
Expand Down
2 changes: 1 addition & 1 deletion pharmpy
Submodule pharmpy updated 97 files
+1 −1 .bumpversion.cfg
+1 −0 .coveragerc
+29 −0 .github/actions/publish-documentation/action.yml
+4 −4 .github/workflows/integration.yml
+7 −0 .github/workflows/main.yml
+30 −0 .github/workflows/publish-docs.yml
+1 −2 AUTHORS.rst
+44 −0 CHANGELOG.rst
+2 −2 docs/amd_pk.rst
+1 −1 docs/conf.py
+1 −31 docs/license.rst
+1 −1 docs/modelsearch.rst
+2 −2 docs/requirements.txt
+14 −14 lint-requirements.txt
+6 −6 pretest-requirements.txt
+35 −35 requirements.txt
+1 −1 setup.py
+31 −2 src/pharmpy/__init__.py
+6 −1 src/pharmpy/basic/expr.py
+2 −2 src/pharmpy/internals/fn/type.py
+7 −1 src/pharmpy/internals/fs/symlink.py
+1 −1 src/pharmpy/internals/set/subsets.py
+11 −0 src/pharmpy/internals/typing.py
+0 −37 src/pharmpy/model/data.py
+58 −19 src/pharmpy/model/datainfo.py
+9 −5 src/pharmpy/model/distributions/symbolic.py
+9 −9 src/pharmpy/model/execution_steps.py
+2 −1 src/pharmpy/model/external/fcon/model.py
+4 −2 src/pharmpy/model/external/nlmixr/model_block.py
+32 −23 src/pharmpy/model/external/nlmixr/sanity_checks.py
+6 −4 src/pharmpy/model/external/nonmem/advan.py
+22 −10 src/pharmpy/model/external/nonmem/dataset.py
+41 −15 src/pharmpy/model/external/nonmem/model.py
+1 −1 src/pharmpy/model/external/nonmem/nmtran_parser.py
+15 −4 src/pharmpy/model/external/nonmem/parsing.py
+2 −2 src/pharmpy/model/external/nonmem/records/abbreviated_record.py
+27 −26 src/pharmpy/model/external/nonmem/records/code_record.py
+11 −3 src/pharmpy/model/external/nonmem/records/option_record.py
+3 −1 src/pharmpy/model/external/nonmem/records/sizes_record.py
+1 −0 src/pharmpy/model/external/nonmem/records/table_record.py
+75 −51 src/pharmpy/model/external/nonmem/update.py
+6 −1 src/pharmpy/model/external/rxode/model.py
+12 −14 src/pharmpy/model/model.py
+11 −10 src/pharmpy/model/parameters.py
+7 −4 src/pharmpy/model/random_variables.py
+34 −25 src/pharmpy/model/statements.py
+2 −0 src/pharmpy/modeling/__init__.py
+2 −2 src/pharmpy/modeling/allometry.py
+7 −4 src/pharmpy/modeling/basic_models.py
+35 −3 src/pharmpy/modeling/common.py
+8 −6 src/pharmpy/modeling/compartments.py
+4 −23 src/pharmpy/modeling/data.py
+8 −3 src/pharmpy/modeling/estimation.py
+3 −1 src/pharmpy/modeling/help_functions.py
+1 −1 src/pharmpy/modeling/lrt.py
+2 −2 src/pharmpy/modeling/odes.py
+1 −1 src/pharmpy/modeling/random_variables.py
+5 −3 src/pharmpy/modeling/tmdd.py
+8 −3 src/pharmpy/modeling/units.py
+3 −2 src/pharmpy/modeling/write_csv.py
+9 −1 src/pharmpy/reporting/reporting.py
+5 −1 src/pharmpy/tools/amd/run.py
+2 −2 src/pharmpy/tools/external/nlmixr/run.py
+5 −3 src/pharmpy/tools/frem/results.py
+6 −4 src/pharmpy/tools/frem/tool.py
+14 −1 src/pharmpy/tools/iivsearch/algorithms.py
+1 −1 src/pharmpy/tools/iivsearch/tool.py
+16 −6 src/pharmpy/tools/linearize/delinearize.py
+12 −20 src/pharmpy/tools/linearize/tool.py
+3 −0 src/pharmpy/tools/mfl/parse.py
+1 −1 src/pharmpy/tools/mfl/statement/feature/direct_effect.py
+1 −1 src/pharmpy/tools/mfl/statement/feature/effect_comp.py
+2 −0 src/pharmpy/tools/modelfit/tool.py
+14 −0 src/pharmpy/tools/psn_helpers.py
+40 −30 src/pharmpy/tools/run.py
+3 −3 test-requirements.txt
+2 −0 tests/basic/test_expr.py
+3 −3 tests/config/test_config.py
+11 −4 tests/integration/test_iivsearch.py
+41 −1 tests/model/test_datainfo.py
+10 −0 tests/model/test_estimation.py
+19 −14 tests/model/test_model.py
+11 −0 tests/model/test_parameter.py
+20 −0 tests/model/test_random_variables.py
+183 −7 tests/model/test_statements.py
+6 −0 tests/modeling/test_common.py
+1 −1 tests/modeling/test_data_funcs.py
+9 −0 tests/modeling/test_odes.py
+8 −0 tests/modeling/test_parameter_variability.py
+1 −1 tests/nonmem/records/test_abbreviated.py
+35 −21 tests/nonmem/records/test_code.py
+20 −0 tests/nonmem/test_nonmem_model.py
+5 −0 tests/testdata/nonmem/models/minimal_missing.csv
+11 −0 tests/testdata/nonmem/models/minimal_missing.mod
+27 −35 tests/tools/test_run.py
+1 −1 tests/workflows/test_hashing.py
+8 −2 tox.ini

0 comments on commit 4772f76

Please sign in to comment.