Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More informative Solver.__repr__ #1928

Merged
merged 6 commits into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions python/tests/test_swig_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,3 +403,7 @@ def test_model_instance_settings_custom_x0(pysb_example_presimulation_module):
assert model2.getInitialStateSensitivities() == sx0
assert settings == amici.get_model_settings(model2)


def test_solver_repr_doesnt_raise():
print(str(amici.CVodeSolver()))
print(repr(amici.CVodeSolver()))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't the default __repr__ set by swig anyways (as for self.this anyway), so this wouldn't have raised even before these changes?

44 changes: 44 additions & 0 deletions swig/solver.i
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,50 @@ using namespace amici;
%ignore getRootInfo;
%ignore updateAndReinitStatesAndSensitivities;

// Solver.__repr__
%extend amici::CVodeSolver {
%pythoncode %{
def __repr__(self):
return "\n".join([
self.this.__repr__()[:-1],
" reporting_mode: "
f"{RDataReporting(self.getReturnDataReportingMode())!r}",
f" sens_meth: {SensitivityMethod(self.getSensitivityMethod())!r}",
f" sens_order: {SensitivityOrder(self.getSensitivityOrder())!r}",
f" sens_order: {SensitivityMethod(self.getSensitivityMethodPreequilibration())!r}",
f" maxsteps: {self.getMaxSteps()}",
f" maxtime: {self.getMaxTime()}s",
f" abs_tol: {self.getAbsoluteTolerance()}",
f" rel_tol: {self.getRelativeTolerance()}",
f" abs_tol_b: {self.getAbsoluteToleranceB()}",
f" rel_tol_b: {self.getRelativeToleranceB()}",
f" abs_tol_fsa: {self.getAbsoluteToleranceFSA()}",
f" rel_tol_fsa: {self.getRelativeToleranceFSA()}",
f" abs_tol_quad: {self.getAbsoluteToleranceQuadratures()}",
f" rel_tol_quad: {self.getRelativeToleranceQuadratures()}",
f" abs_tol_ss: {self.getAbsoluteToleranceSteadyState()}",
f" rel_tol_ss: {self.getRelativeToleranceSteadyState()}",
f" abs_tol_sss: {self.getAbsoluteToleranceSteadyStateSensi()}",
f" rel_tol_sss: {self.getRelativeToleranceSteadyStateSensi()}",
f" int_sens_meth: {InternalSensitivityMethod(self.getInternalSensitivityMethod())!r}",
f" int_type: {InterpolationType(self.getInterpolationType())!r}",
f" linsol: {LinearSolver(self.getLinearSolver())!r}",
f" lmm: {LinearMultistepMethod(self.getLinearMultistepMethod())!r}",
f" newton_damp_mode: {NewtonDampingFactorMode(self.getNewtonDampingFactorMode())!r}",
f" newton_damp_lb: {self.getNewtonDampingFactorLowerBound()}",
f" newton_maxsteps: {self.getNewtonMaxSteps()}",
f" newton_ss_check: {self.getNewtonStepSteadyStateCheck()}",
f" sens_ss_check: {self.getSensiSteadyStateCheck()}",
f" interpolation_type: {InterpolationType(self.getInterpolationType())!r}",
f" ism: {InternalSensitivityMethod(self.getInternalSensitivityMethod())!r}",
f" nlsol_iter: {NonlinearSolverIteration(self.getNonlinearSolverIteration())!r}",
f" stability_limit: {self.getStabilityLimitFlag()}",
f" state_ordering: {self.getStateOrdering()}",
">"
])
%}
};


%newobject amici::Solver::clone;
// Process symbols in header
Expand Down