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.

Sign up for GitHub

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

Generate SWIG prior factory #709

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Generate SWIG prior factory #709

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c72b9e
Generate prior factory
robbietuk Oct 9, 2020
c6fbe6f
[SWIG] sort-out factory for get_prior
KrisThielemans Oct 18, 2020
fd15a8b
Clean up comments [ci skip]
robbietuk Oct 20, 2020
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
15 changes: 15 additions & 0 deletions src/swig/stir.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@
#endif

%include "attribute.i"
%include "factory.i"

%init %{
#if defined(SWIGPYTHON)
Expand Down Expand Up @@ -1575,6 +1576,20 @@ namespace stir {
%shared_ptr(stir::FBP2DReconstruction);
%shared_ptr(stir::FBP3DRPReconstruction);

/* This currently fails, so is still commented out
%newobject *::get_objective_function;
%factory(
stir::GeneralisedObjectiveFunction<TargetT >& stir::IterativeReconstruction<TargetT >::get_objective_function,
%arg(stir::PoissonLogLikelihoodWithLinearModelForMeanAndProjData<TargetT >));
*/

// tell SWIG to convert the return of get_prior_ptr etc to the appropriate object
%newobject *::get_prior_ptr;
%factory(stir::GeneralisedPrior<TargetT> *stir::GeneralisedObjectiveFunction< TargetT >::get_prior_ptr,
stir::QuadraticPrior<elemT>,
stir::PLSPrior<elemT>,
stir::RelativeDifferencePrior<elemT>);

#undef TargetT
#undef elemT
#endif
Expand Down