|
25 | 25 | AMICI_SUCCESS, |
26 | 26 | Constraint, |
27 | 27 | ExpData, |
28 | | - ExpDataView, |
29 | 28 | ModelModule, |
30 | 29 | ParameterScaling, |
31 | 30 | ReturnDataView, |
32 | 31 | SensitivityMethod, |
33 | 32 | SensitivityOrder, |
34 | 33 | 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, |
41 | 34 | parameter_scaling_from_int_vector, |
42 | 35 | run_simulation, |
43 | 36 | run_simulations, |
@@ -466,63 +459,6 @@ def test_steadystate_simulation(model_steadystate_module): |
466 | 459 | assert rdata[0].status == AMICI_SUCCESS |
467 | 460 | assert rdata[0].id == edata[0].id |
468 | 461 |
|
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 | | - |
526 | 462 | solver.set_relative_tolerance(1e-12) |
527 | 463 | solver.set_absolute_tolerance(1e-12) |
528 | 464 | check_derivatives( |
@@ -630,25 +566,6 @@ def test_likelihoods(model_test_likelihoods): |
630 | 566 | assert np.all(np.isfinite(rdata["sllh"])) |
631 | 567 | assert np.any(rdata["sllh"]) |
632 | 568 |
|
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 | | - |
652 | 569 | # check gradient |
653 | 570 | for sensi_method in [ |
654 | 571 | SensitivityMethod.forward, |
|
0 commit comments