Skip to content

Commit bf21a26

Browse files
authored
Remove amici.pandas.* (#3064)
Remove rarely used / obsolete functionality. Closes #3063.
1 parent 63f2e78 commit bf21a26

File tree

3 files changed

+0
-225
lines changed

3 files changed

+0
-225
lines changed

doc/examples/getting_started_extended/GettingStartedExtended.ipynb

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
" ParameterScaling,\n",
3737
" SensitivityMethod,\n",
3838
" SensitivityOrder,\n",
39-
" get_data_observables_as_data_frame,\n",
40-
" get_edata_from_data_frame,\n",
41-
" get_residuals_as_data_frame,\n",
42-
" get_simulation_observables_as_data_frame,\n",
43-
" get_simulation_states_as_data_frame,\n",
4439
" run_simulation,\n",
4540
")"
4641
]
@@ -1349,76 +1344,6 @@
13491344
"source": [
13501345
"plot_sensitivities(\"y\", eps)"
13511346
]
1352-
},
1353-
{
1354-
"cell_type": "markdown",
1355-
"metadata": {},
1356-
"source": [
1357-
"## Export as DataFrame\n",
1358-
"\n",
1359-
"Experimental data and simulation results can both be exported as pandas Dataframe to allow for an easier inspection of numeric values"
1360-
]
1361-
},
1362-
{
1363-
"cell_type": "code",
1364-
"execution_count": null,
1365-
"metadata": {},
1366-
"outputs": [],
1367-
"source": [
1368-
"# run the simulation\n",
1369-
"rdata = run_simulation(model, solver, edata)"
1370-
]
1371-
},
1372-
{
1373-
"cell_type": "code",
1374-
"execution_count": null,
1375-
"metadata": {},
1376-
"outputs": [],
1377-
"source": [
1378-
"# look at the ExpData as DataFrame\n",
1379-
"df = get_data_observables_as_data_frame(model, [edata])\n",
1380-
"df"
1381-
]
1382-
},
1383-
{
1384-
"cell_type": "code",
1385-
"execution_count": null,
1386-
"metadata": {},
1387-
"outputs": [],
1388-
"source": [
1389-
"# from the exported dataframe, we can actually reconstruct a copy of the ExpData instance\n",
1390-
"reconstructed_edata = get_edata_from_data_frame(model, df)"
1391-
]
1392-
},
1393-
{
1394-
"cell_type": "code",
1395-
"execution_count": null,
1396-
"metadata": {},
1397-
"outputs": [],
1398-
"source": [
1399-
"# look at the States in rdata as DataFrame\n",
1400-
"get_residuals_as_data_frame(model, [edata], [rdata])"
1401-
]
1402-
},
1403-
{
1404-
"cell_type": "code",
1405-
"execution_count": null,
1406-
"metadata": {},
1407-
"outputs": [],
1408-
"source": [
1409-
"# look at the Observables in rdata as DataFrame\n",
1410-
"get_simulation_observables_as_data_frame(model, [edata], [rdata])"
1411-
]
1412-
},
1413-
{
1414-
"cell_type": "code",
1415-
"execution_count": null,
1416-
"metadata": {},
1417-
"outputs": [],
1418-
"source": [
1419-
"# look at the States in rdata as DataFrame\n",
1420-
"get_simulation_states_as_data_frame(model, [edata], [rdata])"
1421-
]
14221347
}
14231348
],
14241349
"metadata": {

python/tests/test_pandas.py

Lines changed: 0 additions & 67 deletions
This file was deleted.

python/tests/test_sbml_import.py

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,12 @@
2525
AMICI_SUCCESS,
2626
Constraint,
2727
ExpData,
28-
ExpDataView,
2928
ModelModule,
3029
ParameterScaling,
3130
ReturnDataView,
3231
SensitivityMethod,
3332
SensitivityOrder,
3433
SteadyStateSensitivityMode,
35-
get_data_observables_as_data_frame,
36-
get_edata_from_data_frame,
37-
get_expressions_as_dataframe,
38-
get_residuals_as_data_frame,
39-
get_simulation_observables_as_data_frame,
40-
get_simulation_states_as_data_frame,
4134
parameter_scaling_from_int_vector,
4235
run_simulation,
4336
run_simulations,
@@ -466,63 +459,6 @@ def test_steadystate_simulation(model_steadystate_module):
466459
assert rdata[0].status == AMICI_SUCCESS
467460
assert rdata[0].id == edata[0].id
468461

469-
# check roundtripping of DataFrame conversion
470-
df_edata = get_data_observables_as_data_frame(model, edata)
471-
edata_reconstructed = get_edata_from_data_frame(model, df_edata)
472-
473-
assert_allclose(
474-
ExpDataView(edata[0])["observed_data"],
475-
ExpDataView(edata_reconstructed[0])["observed_data"],
476-
rtol=1.0e-5,
477-
atol=1.0e-8,
478-
)
479-
480-
assert_allclose(
481-
ExpDataView(edata[0])["observed_data_std_dev"],
482-
ExpDataView(edata_reconstructed[0])["observed_data_std_dev"],
483-
rtol=1.0e-5,
484-
atol=1.0e-8,
485-
)
486-
487-
if len(edata[0].fixed_parameters):
488-
assert list(edata[0].fixed_parameters) == list(
489-
edata_reconstructed[0].fixed_parameters
490-
)
491-
492-
else:
493-
assert list(model.get_fixed_parameters()) == list(
494-
edata_reconstructed[0].fixed_parameters
495-
)
496-
497-
assert list(edata[0].fixed_parameters_pre_equilibration) == list(
498-
edata_reconstructed[0].fixed_parameters_pre_equilibration
499-
)
500-
501-
df_state = get_simulation_states_as_data_frame(model, edata, rdata)
502-
assert_allclose(
503-
rdata[0]["x"],
504-
df_state[list(model.get_state_ids())].values,
505-
rtol=1.0e-5,
506-
atol=1.0e-8,
507-
)
508-
509-
df_obs = get_simulation_observables_as_data_frame(model, edata, rdata)
510-
assert_allclose(
511-
rdata[0]["y"],
512-
df_obs[list(model.get_observable_ids())].values,
513-
rtol=1.0e-5,
514-
atol=1.0e-8,
515-
)
516-
get_residuals_as_data_frame(model, edata, rdata)
517-
518-
df_expr = get_expressions_as_dataframe(model, edata, rdata)
519-
assert_allclose(
520-
rdata[0]["w"],
521-
df_expr[list(model.get_expression_ids())].values,
522-
rtol=1.0e-5,
523-
atol=1.0e-8,
524-
)
525-
526462
solver.set_relative_tolerance(1e-12)
527463
solver.set_absolute_tolerance(1e-12)
528464
check_derivatives(
@@ -630,25 +566,6 @@ def test_likelihoods(model_test_likelihoods):
630566
assert np.all(np.isfinite(rdata["sllh"]))
631567
assert np.any(rdata["sllh"])
632568

633-
rdata_df = get_simulation_observables_as_data_frame(
634-
model, edata, rdata, by_id=True
635-
)
636-
edata_df = get_data_observables_as_data_frame(model, edata, by_id=True)
637-
638-
# check correct likelihood value
639-
llh_exp = -sum(
640-
[
641-
normal_nllh(edata_df["o1"], rdata_df["o1"], sigmas[0]),
642-
log_normal_nllh(edata_df["o2"], rdata_df["o2"], sigmas[1]),
643-
log10_normal_nllh(edata_df["o3"], rdata_df["o3"], sigmas[2]),
644-
laplace_nllh(edata_df["o4"], rdata_df["o4"], sigmas[3]),
645-
log_laplace_nllh(edata_df["o5"], rdata_df["o5"], sigmas[4]),
646-
log10_laplace_nllh(edata_df["o6"], rdata_df["o6"], sigmas[5]),
647-
custom_nllh(edata_df["o7"], rdata_df["o7"], sigmas[6]),
648-
]
649-
)
650-
assert np.isclose(rdata["llh"], llh_exp)
651-
652569
# check gradient
653570
for sensi_method in [
654571
SensitivityMethod.forward,

0 commit comments

Comments
 (0)