From 711ef244beda028c8feeb1c9a2019ec11773ef6c Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 27 Jan 2014 18:12:39 +0100
Subject: [PATCH] New python fitting API exposed
---
App/inc/TestFittingModule2.h | 3 +-
App/src/TestFittingModule2.cpp | 60 +++++-
Core/PythonAPI/inc/PythonCoreExposer.h | 2 +
Core/PythonAPI/inc/__call_policies.pypp.hpp | 7 +-
Core/PythonAPI/src/AxisBin.pypp.cpp | 70 +++---
Core/PythonAPI/src/AxisDouble.pypp.cpp | 66 +++---
Core/PythonAPI/src/Beam.pypp.cpp | 24 +--
Core/PythonAPI/src/Crystal.pypp.cpp | 68 +++---
Core/PythonAPI/src/Detector.pypp.cpp | 28 +--
.../src/FTDistribution2DCauchy.pypp.cpp | 32 +--
.../src/FormFactorAnisoPyramid.pypp.cpp | 116 +++++-----
Core/PythonAPI/src/FormFactorBox.pypp.cpp | 88 ++++----
Core/PythonAPI/src/FormFactorCone.pypp.cpp | 104 ++++-----
Core/PythonAPI/src/FormFactorCone6.pypp.cpp | 104 ++++-----
Core/PythonAPI/src/FormFactorCrystal.pypp.cpp | 88 ++++----
.../src/FormFactorCuboctahedron.pypp.cpp | 116 +++++-----
.../PythonAPI/src/FormFactorCylinder.pypp.cpp | 96 ++++-----
.../FormFactorDecoratorDebyeWaller.pypp.cpp | 84 ++++----
.../FormFactorEllipsoidalCylinder.pypp.cpp | 104 ++++-----
.../src/FormFactorFullSphere.pypp.cpp | 92 ++++----
.../src/FormFactorFullSpheroid.pypp.cpp | 88 ++++----
Core/PythonAPI/src/FormFactorGauss.pypp.cpp | 88 ++++----
.../src/FormFactorHemiEllipsoid.pypp.cpp | 96 ++++-----
Core/PythonAPI/src/FormFactorLorentz.pypp.cpp | 88 ++++----
.../src/FormFactorParallelepiped.pypp.cpp | 88 ++++----
Core/PythonAPI/src/FormFactorPrism3.pypp.cpp | 100 ++++-----
Core/PythonAPI/src/FormFactorPrism6.pypp.cpp | 96 ++++-----
Core/PythonAPI/src/FormFactorPyramid.pypp.cpp | 108 +++++-----
Core/PythonAPI/src/FormFactorRipple1.pypp.cpp | 96 ++++-----
Core/PythonAPI/src/FormFactorRipple2.pypp.cpp | 100 ++++-----
Core/PythonAPI/src/FormFactorSphere.pypp.cpp | 84 ++++----
.../FormFactorSphereGaussianRadius.pypp.cpp | 88 ++++----
.../FormFactorSphereUniformRadius.pypp.cpp | 88 ++++----
.../PythonAPI/src/FormFactorSpheroid.pypp.cpp | 92 ++++----
.../src/HomogeneousMaterial.pypp.cpp | 16 +-
Core/PythonAPI/src/IAxis.pypp.cpp | 16 +-
.../src/IClusteredParticles.pypp.cpp | 60 +++---
Core/PythonAPI/src/ICompositeSample.pypp.cpp | 56 ++---
Core/PythonAPI/src/IDecoration.pypp.cpp | 76 +++----
.../src/IDetectorResolution.pypp.cpp | 24 +--
Core/PythonAPI/src/IFTDistribution2D.pypp.cpp | 24 +--
Core/PythonAPI/src/IFormFactor.pypp.cpp | 76 +++----
Core/PythonAPI/src/IFormFactorBorn.pypp.cpp | 80 +++----
.../src/IFormFactorDecorator.pypp.cpp | 76 +++----
.../src/IInterferenceFunction.pypp.cpp | 48 ++---
Core/PythonAPI/src/IMaterial.pypp.cpp | 16 +-
Core/PythonAPI/src/IObservable.pypp.cpp | 8 +-
Core/PythonAPI/src/IObserver.pypp.cpp | 4 +-
Core/PythonAPI/src/IParameterized.pypp.cpp | 24 +--
.../src/IResolutionFunction2D.pypp.cpp | 24 +--
Core/PythonAPI/src/ISample.pypp.cpp | 44 ++--
Core/PythonAPI/src/ISampleBuilder.pypp.cpp | 28 +--
Core/PythonAPI/src/Instrument.pypp.cpp | 30 +--
Core/PythonAPI/src/IntensityData.pypp.cpp | 24 +--
...InterferenceFunction1DParaCrystal.pypp.cpp | 56 ++---
.../InterferenceFunction2DLattice.pypp.cpp | 56 ++---
...InterferenceFunction2DParaCrystal.pypp.cpp | 56 ++---
.../src/InterferenceFunctionNone.pypp.cpp | 56 ++---
Core/PythonAPI/src/LatticeBasis.pypp.cpp | 80 +++----
Core/PythonAPI/src/Layer.pypp.cpp | 96 ++++-----
Core/PythonAPI/src/LayerInterface.pypp.cpp | 60 +++---
Core/PythonAPI/src/LayerRoughness.pypp.cpp | 48 ++---
Core/PythonAPI/src/MesoCrystal.pypp.cpp | 76 +++----
Core/PythonAPI/src/MultiLayer.pypp.cpp | 80 +++----
Core/PythonAPI/src/ParameterPool.pypp.cpp | 6 +-
Core/PythonAPI/src/Particle.pypp.cpp | 92 ++++----
Core/PythonAPI/src/ParticleCoreShell.pypp.cpp | 76 +++----
.../PythonAPI/src/ParticleDecoration.pypp.cpp | 114 +++++-----
Core/PythonAPI/src/ParticleInfo.pypp.cpp | 60 +++---
.../src/PositionParticleInfo.pypp.cpp | 60 +++---
Core/PythonAPI/src/PythonListConverter.cpp | 1 +
Core/PythonAPI/src/PythonModule.cpp | 160 +++++++-------
.../src/ResolutionFunction2DSimple.pypp.cpp | 32 +--
.../src/SimpleSelectionRule.pypp.cpp | 8 +-
Core/PythonAPI/src/Simulation.pypp.cpp | 32 +--
.../src/StochasticDoubleGate.pypp.cpp | 24 +--
.../src/StochasticDoubleGaussian.pypp.cpp | 24 +--
.../src/StochasticParameter_t.pypp.cpp | 12 +-
.../src/StochasticSampledParameter.pypp.cpp | 40 ++--
.../inc/FitStrategyAdjustParameters.h | 118 ++++++++--
.../src/FitStrategyAdjustParameters.cpp | 2 +
.../inc/FitStrategyAdjustMinimizer.pypp.h | 11 +
.../inc/FitStrategyAdjustParameters.pypp.h | 11 +
Fit/PythonAPI/inc/FitStrategyDefault.pypp.h | 11 +
.../inc/FitStrategyFixParameters.pypp.h | 11 +
.../inc/FitStrategyReleaseParameters.pypp.h | 11 +
Fit/PythonAPI/inc/IFitStrategy.pypp.h | 11 +
Fit/PythonAPI/inc/PythonFitExposer.h | 2 +
Fit/PythonAPI/inc/PythonFitList.h | 3 +
Fit/PythonAPI/inc/vector_string_t.pypp.h | 11 +
Fit/PythonAPI/src/AttLimits.pypp.cpp | 52 ++---
Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp | 52 ++---
Fit/PythonAPI/src/FitObject.pypp.cpp | 2 +-
Fit/PythonAPI/src/FitParameter.pypp.cpp | 76 +++----
.../src/FitStrategyAdjustMinimizer.pypp.cpp | 65 ++++++
.../src/FitStrategyAdjustParameters.pypp.cpp | 180 ++++++++++++++++
Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp | 90 ++++++++
.../src/FitStrategyFixParameters.pypp.cpp | 203 ++++++++++++++++++
.../src/FitStrategyReleaseParameters.pypp.cpp | 203 ++++++++++++++++++
Fit/PythonAPI/src/FitSuite.pypp.cpp | 24 +--
Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp | 34 +--
Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp | 8 +-
Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp | 40 ++--
Fit/PythonAPI/src/IFitStrategy.pypp.cpp | 73 +++++++
Fit/PythonAPI/src/IMinimizer.pypp.cpp | 84 ++++----
Fit/PythonAPI/src/ISquaredFunction.pypp.cpp | 4 +-
.../src/OutputDataNormalizer.pypp.cpp | 12 +-
.../src/OutputDataSimpleNormalizer.pypp.cpp | 12 +-
Fit/PythonAPI/src/PythonModule.cpp | 42 ++--
.../src/SquaredFunctionDefault.pypp.cpp | 12 +-
.../src/SquaredFunctionGaussianError.pypp.cpp | 12 +-
.../SquaredFunctionMeanSquaredError.pypp.cpp | 12 +-
.../SquaredFunctionSystematicError.pypp.cpp | 12 +-
Fit/PythonAPI/src/vector_string_t.pypp.cpp | 27 +++
dev-tools/python-bindings/MakePyFit.py | 6 +
115 files changed, 3716 insertions(+), 2634 deletions(-)
create mode 100644 Fit/PythonAPI/inc/FitStrategyAdjustMinimizer.pypp.h
create mode 100644 Fit/PythonAPI/inc/FitStrategyAdjustParameters.pypp.h
create mode 100644 Fit/PythonAPI/inc/FitStrategyDefault.pypp.h
create mode 100644 Fit/PythonAPI/inc/FitStrategyFixParameters.pypp.h
create mode 100644 Fit/PythonAPI/inc/FitStrategyReleaseParameters.pypp.h
create mode 100644 Fit/PythonAPI/inc/IFitStrategy.pypp.h
create mode 100644 Fit/PythonAPI/inc/vector_string_t.pypp.h
create mode 100644 Fit/PythonAPI/src/FitStrategyAdjustMinimizer.pypp.cpp
create mode 100644 Fit/PythonAPI/src/FitStrategyAdjustParameters.pypp.cpp
create mode 100644 Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp
create mode 100644 Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp
create mode 100644 Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp
create mode 100644 Fit/PythonAPI/src/IFitStrategy.pypp.cpp
create mode 100644 Fit/PythonAPI/src/vector_string_t.pypp.cpp
diff --git a/App/inc/TestFittingModule2.h b/App/inc/TestFittingModule2.h
index 2ac0b2c67af..729d1d6cf5c 100644
--- a/App/inc/TestFittingModule2.h
+++ b/App/inc/TestFittingModule2.h
@@ -63,7 +63,8 @@ public:
void fit_example_chimodule();
//! fit example with strategies
- void fit_example_strategies();
+ void fit_example_strategy_data();
+ void fit_example_strategy_parameters();
//! fit example with data masking
void fit_example_mask();
diff --git a/App/src/TestFittingModule2.cpp b/App/src/TestFittingModule2.cpp
index f5e80c3de90..bd82d433c54 100644
--- a/App/src/TestFittingModule2.cpp
+++ b/App/src/TestFittingModule2.cpp
@@ -20,6 +20,7 @@
#include "FitSuite.h"
#include "FitSuiteObserverFactory.h"
#include "FitStrategyAdjustData.h"
+#include "FitStrategyAdjustParameters.h"
#include "FormFactors.h"
#include "Simulation.h"
#include "IIntensityFunction.h"
@@ -43,6 +44,8 @@
#include "TPaveText.h"
#include "TH2D.h"
+#include <boost/assign/list_of.hpp>
+
TestFittingModule2::TestFittingModule2()
: mp_real_data(0)
@@ -79,10 +82,11 @@ void TestFittingModule2::execute()
//fit_example_basics();
// fit example with normalizer
- fit_example_chimodule();
+ //fit_example_chimodule();
// fit example with strategies
- //fit_example_strategies();
+ //fit_example_strategy_data();
+ fit_example_strategy_parameters();
// fit example with data masking
//fit_example_mask();
@@ -156,7 +160,7 @@ void TestFittingModule2::fit_example_chimodule()
//! Fit example with strategies.
-void TestFittingModule2::fit_example_strategies()
+void TestFittingModule2::fit_example_strategy_data()
{
initializeSimulation();
initializeRealData();
@@ -191,6 +195,56 @@ void TestFittingModule2::fit_example_strategies()
m_fitSuite->runFit();
}
+
+//! Fix example with adjust parameters strategies
+void TestFittingModule2::fit_example_strategy_parameters()
+{
+ initializeSimulation();
+ initializeRealData();
+
+ m_fitSuite->addFitParameter("*SampleBuilder/m_cylinder_height",
+ 12*Units::nanometer, 1*Units::nanometer,
+ AttLimits::lowerLimited(0.01) );
+ m_fitSuite->addFitParameter("*SampleBuilder/m_cylinder_radius",
+ 2*Units::nanometer, 1*Units::nanometer,
+ AttLimits::lowerLimited(0.01) );
+ m_fitSuite->addFitParameter("*SampleBuilder/m_prism3_half_side",
+ 12*Units::nanometer, 1*Units::nanometer,
+ AttLimits::lowerLimited(0.01) );
+ m_fitSuite->addFitParameter("*SampleBuilder/m_prism3_height",
+ 2*Units::nanometer, 1*Units::nanometer,
+ AttLimits::lowerLimited(0.01) );
+ m_fitSuite->addFitParameter("*SampleBuilder/m_cylinder_ratio",
+ 0.2, 0.1,
+ AttLimits::fixed());
+
+ // Applying fit strategy
+ FitStrategyReleaseParameters strategy;
+ std::vector<std::string> pars = boost::assign::list_of("*SampleBuilder/m_cylinder_height")("*SampleBuilder/m_cylinder_radius");
+ strategy.setReleased(pars);
+ m_fitSuite->addFitStrategy(strategy);
+ pars = boost::assign::list_of("*SampleBuilder/m_prism3_half_side")("*SampleBuilder/m_prism3_height");
+ strategy.setReleased(pars);
+ m_fitSuite->addFitStrategy(strategy);
+
+// FitStrategyFixParameters strategy2;
+// pars = boost::assign::list_of("*SampleBuilder/m_cylinder_ratio");
+// strategy2.setFixed(pars);
+// m_fitSuite->addFitStrategy(strategy2);
+
+ pars = boost::assign::list_of("*SampleBuilder/m_cylinder_height")("*SampleBuilder/m_cylinder_radius")("*SampleBuilder/m_prism3_half_side")("*SampleBuilder/m_prism3_height");
+ strategy.setReleased(pars);
+ m_fitSuite->addFitStrategy(strategy);
+
+ m_fitSuite->addSimulationAndRealData(*mp_simulation, *mp_real_data);
+
+ m_fitSuite->setMinimizer(
+ MinimizerFactory::createMinimizer("Minuit2", "Migrad") );
+
+ m_fitSuite->runFit();
+}
+
+
//! Fit example with data masking.
void TestFittingModule2::fit_example_mask()
diff --git a/Core/PythonAPI/inc/PythonCoreExposer.h b/Core/PythonAPI/inc/PythonCoreExposer.h
index 8ef60de08b9..042d729209e 100644
--- a/Core/PythonAPI/inc/PythonCoreExposer.h
+++ b/Core/PythonAPI/inc/PythonCoreExposer.h
@@ -41,6 +41,7 @@ namespace pyplusplus {
typedef OutputData<double > IntensityData;
typedef std::vector<int > vector_integer_t;
typedef std::vector<unsigned long int > vector_longinteger_t;
+ //typedef std::vector<std::string > vector_string_t;
//typedef boost::shared_ptr<class ISampleBuilder > SampleBuilder_t;
}
}
@@ -64,6 +65,7 @@ namespace pyplusplus {
inline size_t pyplusplus_boost_vector_longinteger() { return sizeof(pyplusplus::aliases::vector_longinteger_t); }
inline size_t pyplusplus_boost_intensity_data() { return sizeof(pyplusplus::aliases::IntensityData); }
//inline size_t pyplusplus_boost_sample_builder() { return sizeof(pyplusplus::aliases::SampleBuilder_t); }
+ //inline size_t pyplusplus_boost_vector_string() { return sizeof(pyplusplus::aliases::vector_string_t); }
}
#endif // PYTHONCOREEXPOSER_H
diff --git a/Core/PythonAPI/inc/__call_policies.pypp.hpp b/Core/PythonAPI/inc/__call_policies.pypp.hpp
index b31e20b5413..e5f8bb6a1bf 100644
--- a/Core/PythonAPI/inc/__call_policies.pypp.hpp
+++ b/Core/PythonAPI/inc/__call_policies.pypp.hpp
@@ -73,7 +73,7 @@ struct make_addressof_holder{
return bpl::detail::none();
}
else{
- size_t addressof_p = size_t( p );
+ boost::uint32_t addressof_p = reinterpret_cast< boost::uint32_t >( p );
bpl::object p_address( addressof_p );
return bpl::incref( p_address.ptr() );
}
@@ -152,11 +152,6 @@ struct as_tuple_impl{
MemoryManager::deallocate_array( arr );
return bpl::incref( bpl::tuple( list_ ).ptr() );
}
-
- static PyTypeObject const *get_pytype(){
- return &PyTuple_Type;
- }
-
};
}
diff --git a/Core/PythonAPI/src/AxisBin.pypp.cpp b/Core/PythonAPI/src/AxisBin.pypp.cpp
index 669c312a4c8..d7803664b4f 100644
--- a/Core/PythonAPI/src/AxisBin.pypp.cpp
+++ b/Core/PythonAPI/src/AxisBin.pypp.cpp
@@ -30,7 +30,7 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
}
- AxisBin_wrapper(::std::string name, ::size_t nbr_bins, double start, double end )
+ AxisBin_wrapper(::std::string name, ::std::size_t nbr_bins, double start, double end )
: AxisBin( name, nbr_bins, start, end )
, bp::wrapper< AxisBin >(){
// constructor
@@ -40,11 +40,11 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
virtual ::AxisBin * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->AxisBin::clone( );
- }
}
+
::AxisBin * default_clone( ) const {
return AxisBin::clone( );
}
@@ -52,47 +52,47 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
virtual ::AxisBin * createDoubleBinSize( ) const {
if( bp::override func_createDoubleBinSize = this->get_override( "createDoubleBinSize" ) )
return func_createDoubleBinSize( );
- else{
+ else
return this->AxisBin::createDoubleBinSize( );
- }
}
+
::AxisBin * default_createDoubleBinSize( ) const {
return AxisBin::createDoubleBinSize( );
}
- virtual ::size_t findClosestIndex( double value ) const {
+ virtual ::std::size_t findClosestIndex( double value ) const {
if( bp::override func_findClosestIndex = this->get_override( "findClosestIndex" ) )
return func_findClosestIndex( value );
- else{
+ else
return this->AxisBin::findClosestIndex( value );
- }
}
- ::size_t default_findClosestIndex( double value ) const {
+
+ ::std::size_t default_findClosestIndex( double value ) const {
return AxisBin::findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::size_t index ) const {
+ virtual ::Bin1D getBin( ::std::size_t index ) const {
if( bp::override func_getBin = this->get_override( "getBin" ) )
return func_getBin( index );
- else{
+ else
return this->AxisBin::getBin( index );
- }
}
- ::Bin1D default_getBin( ::size_t index ) const {
+
+ ::Bin1D default_getBin( ::std::size_t index ) const {
return AxisBin::getBin( index );
}
virtual double getMax( ) const {
if( bp::override func_getMax = this->get_override( "getMax" ) )
return func_getMax( );
- else{
+ else
return this->AxisBin::getMax( );
- }
}
+
double default_getMax( ) const {
return AxisBin::getMax( );
}
@@ -100,36 +100,36 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
virtual double getMin( ) const {
if( bp::override func_getMin = this->get_override( "getMin" ) )
return func_getMin( );
- else{
+ else
return this->AxisBin::getMin( );
- }
}
+
double default_getMin( ) const {
return AxisBin::getMin( );
}
- virtual ::size_t getSize( ) const {
+ virtual ::std::size_t getSize( ) const {
if( bp::override func_getSize = this->get_override( "getSize" ) )
return func_getSize( );
- else{
+ else
return this->AxisBin::getSize( );
- }
}
- ::size_t default_getSize( ) const {
+
+ ::std::size_t default_getSize( ) const {
return AxisBin::getSize( );
}
- virtual double operator[]( ::size_t index ) const {
+ virtual double operator[]( ::std::size_t index ) const {
if( bp::override func___getitem__ = this->get_override( "__getitem__" ) )
return func___getitem__( index );
- else{
+ else
return this->AxisBin::operator[]( index );
- }
}
- double default___getitem__( ::size_t index ) const {
+
+ double default___getitem__( ::std::size_t index ) const {
return AxisBin::operator[]( index );
}
@@ -141,7 +141,7 @@ void register_AxisBin_class(){
typedef bp::class_< AxisBin_wrapper, bp::bases< IAxis > > AxisBin_exposer_t;
AxisBin_exposer_t AxisBin_exposer = AxisBin_exposer_t( "AxisBin", bp::init< std::string >(( bp::arg("name") )) );
bp::scope AxisBin_scope( AxisBin_exposer );
- AxisBin_exposer.def( bp::init< std::string, size_t, double, double >(( bp::arg("name"), bp::arg("nbr_bins"), bp::arg("start"), bp::arg("end") )) );
+ AxisBin_exposer.def( bp::init< std::string, std::size_t, double, double >(( bp::arg("name"), bp::arg("nbr_bins"), bp::arg("start"), bp::arg("end") )) );
{ //::AxisBin::clone
typedef ::AxisBin * ( ::AxisBin::*clone_function_type )( ) const;
@@ -168,8 +168,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::findClosestIndex
- typedef ::size_t ( ::AxisBin::*findClosestIndex_function_type )( double ) const;
- typedef ::size_t ( AxisBin_wrapper::*default_findClosestIndex_function_type )( double ) const;
+ typedef ::std::size_t ( ::AxisBin::*findClosestIndex_function_type )( double ) const;
+ typedef ::std::size_t ( AxisBin_wrapper::*default_findClosestIndex_function_type )( double ) const;
AxisBin_exposer.def(
"findClosestIndex"
@@ -180,8 +180,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::getBin
- typedef ::Bin1D ( ::AxisBin::*getBin_function_type )( ::size_t ) const;
- typedef ::Bin1D ( AxisBin_wrapper::*default_getBin_function_type )( ::size_t ) const;
+ typedef ::Bin1D ( ::AxisBin::*getBin_function_type )( ::std::size_t ) const;
+ typedef ::Bin1D ( AxisBin_wrapper::*default_getBin_function_type )( ::std::size_t ) const;
AxisBin_exposer.def(
"getBin"
@@ -214,8 +214,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::getSize
- typedef ::size_t ( ::AxisBin::*getSize_function_type )( ) const;
- typedef ::size_t ( AxisBin_wrapper::*default_getSize_function_type )( ) const;
+ typedef ::std::size_t ( ::AxisBin::*getSize_function_type )( ) const;
+ typedef ::std::size_t ( AxisBin_wrapper::*default_getSize_function_type )( ) const;
AxisBin_exposer.def(
"getSize"
@@ -234,7 +234,7 @@ void register_AxisBin_class(){
}
{ //::AxisBin::initBins
- typedef void ( ::AxisBin::*initBins_function_type )( ::size_t,double,double ) ;
+ typedef void ( ::AxisBin::*initBins_function_type )( ::std::size_t,double,double ) ;
AxisBin_exposer.def(
"initBins"
@@ -244,8 +244,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::operator[]
- typedef double ( ::AxisBin::*__getitem___function_type )( ::size_t ) const;
- typedef double ( AxisBin_wrapper::*default___getitem___function_type )( ::size_t ) const;
+ typedef double ( ::AxisBin::*__getitem___function_type )( ::std::size_t ) const;
+ typedef double ( AxisBin_wrapper::*default___getitem___function_type )( ::std::size_t ) const;
AxisBin_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/AxisDouble.pypp.cpp b/Core/PythonAPI/src/AxisDouble.pypp.cpp
index b8f339934ce..300be999fae 100644
--- a/Core/PythonAPI/src/AxisDouble.pypp.cpp
+++ b/Core/PythonAPI/src/AxisDouble.pypp.cpp
@@ -30,7 +30,7 @@ struct AxisDouble_wrapper : AxisDouble, bp::wrapper< AxisDouble > {
}
- AxisDouble_wrapper(::std::string name, ::size_t size, double start, double end )
+ AxisDouble_wrapper(::std::string name, ::std::size_t size, double start, double end )
: AxisDouble( name, size, start, end )
, bp::wrapper< AxisDouble >(){
// constructor
@@ -44,38 +44,38 @@ struct AxisDouble_wrapper : AxisDouble, bp::wrapper< AxisDouble > {
}
- virtual ::size_t findClosestIndex( double value ) const {
+ virtual ::std::size_t findClosestIndex( double value ) const {
if( bp::override func_findClosestIndex = this->get_override( "findClosestIndex" ) )
return func_findClosestIndex( value );
- else{
+ else
return this->AxisDouble::findClosestIndex( value );
- }
}
- ::size_t default_findClosestIndex( double value ) const {
+
+ ::std::size_t default_findClosestIndex( double value ) const {
return AxisDouble::findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::size_t index ) const {
+ virtual ::Bin1D getBin( ::std::size_t index ) const {
if( bp::override func_getBin = this->get_override( "getBin" ) )
return func_getBin( index );
- else{
+ else
return this->AxisDouble::getBin( index );
- }
}
- ::Bin1D default_getBin( ::size_t index ) const {
+
+ ::Bin1D default_getBin( ::std::size_t index ) const {
return AxisDouble::getBin( index );
}
virtual double getMax( ) const {
if( bp::override func_getMax = this->get_override( "getMax" ) )
return func_getMax( );
- else{
+ else
return this->AxisDouble::getMax( );
- }
}
+
double default_getMax( ) const {
return AxisDouble::getMax( );
}
@@ -83,36 +83,36 @@ struct AxisDouble_wrapper : AxisDouble, bp::wrapper< AxisDouble > {
virtual double getMin( ) const {
if( bp::override func_getMin = this->get_override( "getMin" ) )
return func_getMin( );
- else{
+ else
return this->AxisDouble::getMin( );
- }
}
+
double default_getMin( ) const {
return AxisDouble::getMin( );
}
- virtual ::size_t getSize( ) const {
+ virtual ::std::size_t getSize( ) const {
if( bp::override func_getSize = this->get_override( "getSize" ) )
return func_getSize( );
- else{
+ else
return this->AxisDouble::getSize( );
- }
}
- ::size_t default_getSize( ) const {
+
+ ::std::size_t default_getSize( ) const {
return AxisDouble::getSize( );
}
- virtual double operator[]( ::size_t index ) const {
+ virtual double operator[]( ::std::size_t index ) const {
if( bp::override func___getitem__ = this->get_override( "__getitem__" ) )
return func___getitem__( index );
- else{
+ else
return this->AxisDouble::operator[]( index );
- }
}
- double default___getitem__( ::size_t index ) const {
+
+ double default___getitem__( ::std::size_t index ) const {
return AxisDouble::operator[]( index );
}
@@ -124,12 +124,12 @@ void register_AxisDouble_class(){
typedef bp::class_< AxisDouble_wrapper, bp::bases< IAxis > > AxisDouble_exposer_t;
AxisDouble_exposer_t AxisDouble_exposer = AxisDouble_exposer_t( "AxisDouble", bp::init< std::string >(( bp::arg("name") )) );
bp::scope AxisDouble_scope( AxisDouble_exposer );
- AxisDouble_exposer.def( bp::init< std::string, size_t, double, double >(( bp::arg("name"), bp::arg("size"), bp::arg("start"), bp::arg("end") )) );
+ AxisDouble_exposer.def( bp::init< std::string, std::size_t, double, double >(( bp::arg("name"), bp::arg("size"), bp::arg("start"), bp::arg("end") )) );
AxisDouble_exposer.def( bp::init< AxisBin const & >(( bp::arg("source") )) );
{ //::AxisDouble::findClosestIndex
- typedef ::size_t ( ::AxisDouble::*findClosestIndex_function_type )( double ) const;
- typedef ::size_t ( AxisDouble_wrapper::*default_findClosestIndex_function_type )( double ) const;
+ typedef ::std::size_t ( ::AxisDouble::*findClosestIndex_function_type )( double ) const;
+ typedef ::std::size_t ( AxisDouble_wrapper::*default_findClosestIndex_function_type )( double ) const;
AxisDouble_exposer.def(
"findClosestIndex"
@@ -140,8 +140,8 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getBin
- typedef ::Bin1D ( ::AxisDouble::*getBin_function_type )( ::size_t ) const;
- typedef ::Bin1D ( AxisDouble_wrapper::*default_getBin_function_type )( ::size_t ) const;
+ typedef ::Bin1D ( ::AxisDouble::*getBin_function_type )( ::std::size_t ) const;
+ typedef ::Bin1D ( AxisDouble_wrapper::*default_getBin_function_type )( ::std::size_t ) const;
AxisDouble_exposer.def(
"getBin"
@@ -152,7 +152,7 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getLowerBoundIndex
- typedef ::size_t ( ::AxisDouble::*getLowerBoundIndex_function_type )( double ) const;
+ typedef ::std::size_t ( ::AxisDouble::*getLowerBoundIndex_function_type )( double ) const;
AxisDouble_exposer.def(
"getLowerBoundIndex"
@@ -184,8 +184,8 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getSize
- typedef ::size_t ( ::AxisDouble::*getSize_function_type )( ) const;
- typedef ::size_t ( AxisDouble_wrapper::*default_getSize_function_type )( ) const;
+ typedef ::std::size_t ( ::AxisDouble::*getSize_function_type )( ) const;
+ typedef ::std::size_t ( AxisDouble_wrapper::*default_getSize_function_type )( ) const;
AxisDouble_exposer.def(
"getSize"
@@ -195,7 +195,7 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getUpperBoundIndex
- typedef ::size_t ( ::AxisDouble::*getUpperBoundIndex_function_type )( double ) const;
+ typedef ::std::size_t ( ::AxisDouble::*getUpperBoundIndex_function_type )( double ) const;
AxisDouble_exposer.def(
"getUpperBoundIndex"
@@ -214,7 +214,7 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::initElements
- typedef void ( ::AxisDouble::*initElements_function_type )( ::size_t,double,double ) ;
+ typedef void ( ::AxisDouble::*initElements_function_type )( ::std::size_t,double,double ) ;
AxisDouble_exposer.def(
"initElements"
@@ -224,8 +224,8 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::operator[]
- typedef double ( ::AxisDouble::*__getitem___function_type )( ::size_t ) const;
- typedef double ( AxisDouble_wrapper::*default___getitem___function_type )( ::size_t ) const;
+ typedef double ( ::AxisDouble::*__getitem___function_type )( ::std::size_t ) const;
+ typedef double ( AxisDouble_wrapper::*default___getitem___function_type )( ::std::size_t ) const;
AxisDouble_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/Beam.pypp.cpp b/Core/PythonAPI/src/Beam.pypp.cpp
index 99d3cc39bd7..3f33465d84b 100644
--- a/Core/PythonAPI/src/Beam.pypp.cpp
+++ b/Core/PythonAPI/src/Beam.pypp.cpp
@@ -35,11 +35,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -114,11 +114,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/Crystal.pypp.cpp b/Core/PythonAPI/src/Crystal.pypp.cpp
index 09f545e0797..c1bfbace3d1 100644
--- a/Core/PythonAPI/src/Crystal.pypp.cpp
+++ b/Core/PythonAPI/src/Crystal.pypp.cpp
@@ -28,11 +28,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else{
+ else
this->Crystal::applyTransformation( boost::ref(transform) );
- }
}
+
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Crystal::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Crystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Crystal::clone( );
- }
}
+
::Crystal * default_clone( ) const {
return Crystal::clone( );
}
@@ -52,11 +52,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Crystal * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->Crystal::cloneInvertB( );
- }
}
+
::Crystal * default_cloneInvertB( ) const {
return Crystal::cloneInvertB( );
}
@@ -64,11 +64,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Geometry::Transform3D const * getTransform( ) const {
if( bp::override func_getTransform = this->get_override( "getTransform" ) )
return func_getTransform( );
- else{
+ else
return this->Crystal::getTransform( );
- }
}
+
::Geometry::Transform3D const * default_getTransform( ) const {
return Crystal::getTransform( );
}
@@ -76,11 +76,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -88,11 +88,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -100,11 +100,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -112,11 +112,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -124,11 +124,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -160,11 +160,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -191,11 +191,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,24 +203,24 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -435,8 +435,8 @@ void register_Crystal_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( Crystal_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( Crystal_wrapper::*default_size_function_type )( ) const;
Crystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Detector.pypp.cpp b/Core/PythonAPI/src/Detector.pypp.cpp
index 17c52c99368..add6a2a0e22 100644
--- a/Core/PythonAPI/src/Detector.pypp.cpp
+++ b/Core/PythonAPI/src/Detector.pypp.cpp
@@ -35,11 +35,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -114,11 +114,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -143,7 +143,7 @@ void register_Detector_class(){
}
{ //::Detector::getAxis
- typedef ::IAxis const & ( ::Detector::*getAxis_function_type )( ::size_t ) const;
+ typedef ::IAxis const & ( ::Detector::*getAxis_function_type )( ::std::size_t ) const;
Detector_exposer.def(
"getAxis"
@@ -164,7 +164,7 @@ void register_Detector_class(){
}
{ //::Detector::getDimension
- typedef ::size_t ( ::Detector::*getDimension_function_type )( ) const;
+ typedef ::std::size_t ( ::Detector::*getDimension_function_type )( ) const;
Detector_exposer.def(
"getDimension"
diff --git a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
index a419ee3c962..3a354bc71f8 100644
--- a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
+++ b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
@@ -35,11 +35,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual ::FTDistribution2DCauchy * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FTDistribution2DCauchy::clone( );
- }
}
+
::FTDistribution2DCauchy * default_clone( ) const {
return FTDistribution2DCauchy::clone( );
}
@@ -47,11 +47,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual double evaluate( double qx, double qy ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( qx, qy );
- else{
+ else
return this->FTDistribution2DCauchy::evaluate( qx, qy );
- }
}
+
double default_evaluate( double qx, double qy ) const {
return FTDistribution2DCauchy::evaluate( qx, qy );
}
@@ -59,11 +59,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -71,11 +71,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -83,11 +83,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -95,11 +95,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -126,11 +126,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -138,11 +138,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
index 9fd9811fc23..aa27f553216 100644
--- a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual ::FormFactorAnisoPyramid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorAnisoPyramid::clone( );
- }
}
+
::FormFactorAnisoPyramid * default_clone( ) const {
return FormFactorAnisoPyramid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorAnisoPyramid::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorAnisoPyramid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else{
+ else
return this->FormFactorAnisoPyramid::getAlpha( );
- }
}
+
double default_getAlpha( ) const {
return FormFactorAnisoPyramid::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorAnisoPyramid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorAnisoPyramid::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else{
+ else
return this->FormFactorAnisoPyramid::getLength( );
- }
}
+
double default_getLength( ) const {
return FormFactorAnisoPyramid::getLength( );
}
@@ -88,11 +88,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorAnisoPyramid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorAnisoPyramid::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
- else{
+ else
return this->FormFactorAnisoPyramid::getWidth( );
- }
}
+
double default_getWidth( ) const {
return FormFactorAnisoPyramid::getWidth( );
}
@@ -112,11 +112,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else{
+ else
this->FormFactorAnisoPyramid::setAlpha( alpha );
- }
}
+
void default_setAlpha( double alpha ) {
FormFactorAnisoPyramid::setAlpha( alpha );
}
@@ -124,11 +124,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorAnisoPyramid::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorAnisoPyramid::setHeight( height );
}
@@ -136,11 +136,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setLength( double length ) {
if( bp::override func_setLength = this->get_override( "setLength" ) )
func_setLength( length );
- else{
+ else
this->FormFactorAnisoPyramid::setLength( length );
- }
}
+
void default_setLength( double length ) {
FormFactorAnisoPyramid::setLength( length );
}
@@ -148,11 +148,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setWidth( double width ) {
if( bp::override func_setWidth = this->get_override( "setWidth" ) )
func_setWidth( width );
- else{
+ else
this->FormFactorAnisoPyramid::setWidth( width );
- }
}
+
void default_setWidth( double width ) {
FormFactorAnisoPyramid::setWidth( width );
}
@@ -160,11 +160,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -172,11 +172,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -184,11 +184,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -196,35 +196,35 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -232,11 +232,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -244,11 +244,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -256,11 +256,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -268,11 +268,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -280,11 +280,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -292,11 +292,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -304,11 +304,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -316,11 +316,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -347,11 +347,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -359,11 +359,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -550,8 +550,8 @@ void register_FormFactorAnisoPyramid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorAnisoPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorAnisoPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorAnisoPyramid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index 9346b6f9dd9..c6b16da8a5b 100644
--- a/Core/PythonAPI/src/FormFactorBox.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::FormFactorBox * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorBox::clone( );
- }
}
+
::FormFactorBox * default_clone( ) const {
return FormFactorBox::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorBox::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorBox::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorBox::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorBox::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorBox::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorBox::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorBox::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorBox::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,11 +100,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -112,11 +112,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -124,35 +124,35 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -172,11 +172,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -208,11 +208,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -220,11 +220,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -232,11 +232,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -263,11 +263,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -275,11 +275,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -405,8 +405,8 @@ void register_FormFactorBox_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorBox_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorBox_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorBox_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCone.pypp.cpp b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
index 5fe32ad9e00..b9ed3e12609 100644
--- a/Core/PythonAPI/src/FormFactorCone.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::FormFactorCone * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCone::clone( );
- }
}
+
::FormFactorCone * default_clone( ) const {
return FormFactorCone::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorCone::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCone::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else{
+ else
return this->FormFactorCone::getAlpha( );
- }
}
+
double default_getAlpha( ) const {
return FormFactorCone::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorCone::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorCone::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorCone::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCone::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorCone::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorCone::getRadius( );
}
@@ -100,11 +100,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else{
+ else
this->FormFactorCone::setAlpha( alpha );
- }
}
+
void default_setAlpha( double alpha ) {
FormFactorCone::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorCone::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorCone::setHeight( height );
}
@@ -124,11 +124,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorCone::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorCone::setRadius( radius );
}
@@ -136,11 +136,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -148,11 +148,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -160,11 +160,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -172,35 +172,35 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -208,11 +208,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -220,11 +220,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -244,11 +244,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -256,11 +256,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -268,11 +268,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -280,11 +280,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -311,11 +311,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -323,11 +323,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -491,8 +491,8 @@ void register_FormFactorCone_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCone_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCone_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCone_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
index db2804b962d..d9568036925 100644
--- a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual ::FormFactorCone6 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCone6::clone( );
- }
}
+
::FormFactorCone6 * default_clone( ) const {
return FormFactorCone6::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorCone6::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCone6::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else{
+ else
return this->FormFactorCone6::getAlpha( );
- }
}
+
double default_getAlpha( ) const {
return FormFactorCone6::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorCone6::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorCone6::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorCone6::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCone6::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorCone6::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorCone6::getRadius( );
}
@@ -100,11 +100,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else{
+ else
this->FormFactorCone6::setAlpha( alpha );
- }
}
+
void default_setAlpha( double alpha ) {
FormFactorCone6::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorCone6::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorCone6::setHeight( height );
}
@@ -124,11 +124,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorCone6::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorCone6::setRadius( radius );
}
@@ -136,11 +136,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -148,11 +148,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -160,11 +160,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -172,35 +172,35 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -208,11 +208,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -220,11 +220,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -244,11 +244,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -256,11 +256,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -268,11 +268,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -280,11 +280,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -311,11 +311,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -323,11 +323,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -491,8 +491,8 @@ void register_FormFactorCone6_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCone6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCone6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCone6_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index 6bf5ef38a45..822d8cf9252 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -21,11 +21,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::FormFactorCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCrystal::clone( );
- }
}
+
::FormFactorCrystal * default_clone( ) const {
return FormFactorCrystal::clone( );
}
@@ -33,11 +33,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -45,11 +45,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorCrystal::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCrystal::evaluate_for_q( boost::ref(q) );
}
@@ -57,11 +57,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->FormFactorCrystal::getVolume( );
- }
}
+
double default_getVolume( ) const {
return FormFactorCrystal::getVolume( );
}
@@ -69,11 +69,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -81,11 +81,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -93,11 +93,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -105,35 +105,35 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -141,11 +141,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -153,11 +153,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -165,11 +165,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -177,11 +177,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -189,11 +189,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -201,11 +201,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -213,11 +213,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -225,11 +225,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -256,11 +256,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -268,11 +268,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -379,8 +379,8 @@ void register_FormFactorCrystal_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCrystal_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCrystal_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCrystal_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
index a410253f44e..94b9b94da2a 100644
--- a/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual ::FormFactorCuboctahedron * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCuboctahedron::clone( );
- }
}
+
::FormFactorCuboctahedron * default_clone( ) const {
return FormFactorCuboctahedron::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorCuboctahedron::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCuboctahedron::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else{
+ else
return this->FormFactorCuboctahedron::getAlpha( );
- }
}
+
double default_getAlpha( ) const {
return FormFactorCuboctahedron::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getHalfSide( ) const {
if( bp::override func_getHalfSide = this->get_override( "getHalfSide" ) )
return func_getHalfSide( );
- else{
+ else
return this->FormFactorCuboctahedron::getHalfSide( );
- }
}
+
double default_getHalfSide( ) const {
return FormFactorCuboctahedron::getHalfSide( );
}
@@ -76,11 +76,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorCuboctahedron::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorCuboctahedron::getHeight( );
}
@@ -88,11 +88,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getHeightRatio( ) const {
if( bp::override func_getHeightRatio = this->get_override( "getHeightRatio" ) )
return func_getHeightRatio( );
- else{
+ else
return this->FormFactorCuboctahedron::getHeightRatio( );
- }
}
+
double default_getHeightRatio( ) const {
return FormFactorCuboctahedron::getHeightRatio( );
}
@@ -100,11 +100,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorCuboctahedron::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCuboctahedron::getNumberOfStochasticParameters( );
}
@@ -112,11 +112,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else{
+ else
this->FormFactorCuboctahedron::setAlpha( alpha );
- }
}
+
void default_setAlpha( double alpha ) {
FormFactorCuboctahedron::setAlpha( alpha );
}
@@ -124,11 +124,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setHalfSide( double half_side ) {
if( bp::override func_setHalfSide = this->get_override( "setHalfSide" ) )
func_setHalfSide( half_side );
- else{
+ else
this->FormFactorCuboctahedron::setHalfSide( half_side );
- }
}
+
void default_setHalfSide( double half_side ) {
FormFactorCuboctahedron::setHalfSide( half_side );
}
@@ -136,11 +136,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorCuboctahedron::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorCuboctahedron::setHeight( height );
}
@@ -148,11 +148,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setHeightRatio( double height_ratio ) {
if( bp::override func_setHeightRatio = this->get_override( "setHeightRatio" ) )
func_setHeightRatio( height_ratio );
- else{
+ else
this->FormFactorCuboctahedron::setHeightRatio( height_ratio );
- }
}
+
void default_setHeightRatio( double height_ratio ) {
FormFactorCuboctahedron::setHeightRatio( height_ratio );
}
@@ -160,11 +160,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -172,11 +172,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -184,11 +184,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -196,35 +196,35 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -232,11 +232,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -244,11 +244,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -256,11 +256,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -268,11 +268,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -280,11 +280,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -292,11 +292,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -304,11 +304,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -316,11 +316,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -347,11 +347,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -359,11 +359,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -550,8 +550,8 @@ void register_FormFactorCuboctahedron_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCuboctahedron_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCuboctahedron_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCuboctahedron_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index 10032a13b17..46ba5332acf 100644
--- a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::FormFactorCylinder * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCylinder::clone( );
- }
}
+
::FormFactorCylinder * default_clone( ) const {
return FormFactorCylinder::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorCylinder::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCylinder::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorCylinder::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorCylinder::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorCylinder::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCylinder::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorCylinder::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorCylinder::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorCylinder::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorCylinder::setHeight( height );
}
@@ -100,11 +100,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorCylinder::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorCylinder::setRadius( radius );
}
@@ -112,11 +112,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,11 +136,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -148,35 +148,35 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -184,11 +184,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -196,11 +196,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -220,11 +220,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -232,11 +232,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -244,11 +244,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -256,11 +256,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -287,11 +287,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -299,11 +299,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -444,8 +444,8 @@ void register_FormFactorCylinder_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCylinder_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index 3ebf4f45b7d..40bad024a62 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::FormFactorDecoratorDebyeWaller * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorDecoratorDebyeWaller::clone( );
- }
}
+
::FormFactorDecoratorDebyeWaller * default_clone( ) const {
return FormFactorDecoratorDebyeWaller::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -52,11 +52,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,11 +88,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -100,35 +100,35 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -136,11 +136,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -160,11 +160,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactorDecorator::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactorDecorator::getHeight( );
}
@@ -172,11 +172,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactorDecorator::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactorDecorator::getRadius( );
}
@@ -184,11 +184,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorDecorator::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorDecorator::getVolume( );
}
@@ -196,11 +196,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -208,11 +208,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -220,11 +220,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -251,11 +251,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -362,8 +362,8 @@ void register_FormFactorDecoratorDebyeWaller_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorDecoratorDebyeWaller_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorDecoratorDebyeWaller_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorDecoratorDebyeWaller_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
index d05fb499e3b..763881a8463 100644
--- a/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual ::FormFactorEllipsoidalCylinder * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorEllipsoidalCylinder::clone( );
- }
}
+
::FormFactorEllipsoidalCylinder * default_clone( ) const {
return FormFactorEllipsoidalCylinder::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorEllipsoidalCylinder::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorEllipsoidalCylinder::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorEllipsoidalCylinder::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorEllipsoidalCylinder::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorEllipsoidalCylinder::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorEllipsoidalCylinder::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
- else{
+ else
return this->FormFactorEllipsoidalCylinder::getWidth( );
- }
}
+
double default_getWidth( ) const {
return FormFactorEllipsoidalCylinder::getWidth( );
}
@@ -100,11 +100,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorEllipsoidalCylinder::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorEllipsoidalCylinder::setHeight( height );
}
@@ -112,11 +112,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorEllipsoidalCylinder::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorEllipsoidalCylinder::setRadius( radius );
}
@@ -124,11 +124,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void setWidth( double width ) {
if( bp::override func_setWidth = this->get_override( "setWidth" ) )
func_setWidth( width );
- else{
+ else
this->FormFactorEllipsoidalCylinder::setWidth( width );
- }
}
+
void default_setWidth( double width ) {
FormFactorEllipsoidalCylinder::setWidth( width );
}
@@ -136,11 +136,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -148,11 +148,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -160,11 +160,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -172,35 +172,35 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -208,11 +208,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -220,11 +220,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -244,11 +244,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -256,11 +256,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -268,11 +268,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -280,11 +280,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -311,11 +311,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -323,11 +323,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -491,8 +491,8 @@ void register_FormFactorEllipsoidalCylinder_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorEllipsoidalCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorEllipsoidalCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorEllipsoidalCylinder_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index 84ea0c6dcae..0651f14122b 100644
--- a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::FormFactorFullSphere * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorFullSphere::clone( );
- }
}
+
::FormFactorFullSphere * default_clone( ) const {
return FormFactorFullSphere::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorFullSphere::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorFullSphere::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorFullSphere::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorFullSphere::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorFullSphere::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorFullSphere::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorFullSphere::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorFullSphere::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorFullSphere::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorFullSphere::setRadius( radius );
}
@@ -100,11 +100,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -136,35 +136,35 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -172,11 +172,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -184,11 +184,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -220,11 +220,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -232,11 +232,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -244,11 +244,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -275,11 +275,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -287,11 +287,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -420,8 +420,8 @@ void register_FormFactorFullSphere_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorFullSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorFullSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorFullSphere_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
index b3a83831d32..b67c0b7c6c8 100644
--- a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::FormFactorFullSpheroid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorFullSpheroid::clone( );
- }
}
+
::FormFactorFullSpheroid * default_clone( ) const {
return FormFactorFullSpheroid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorFullSpheroid::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorFullSpheroid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorFullSpheroid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorFullSpheroid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorFullSpheroid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorFullSpheroid::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorFullSpheroid::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorFullSpheroid::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,11 +100,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -112,11 +112,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -124,35 +124,35 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -172,11 +172,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -208,11 +208,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -220,11 +220,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -232,11 +232,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -263,11 +263,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -275,11 +275,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -396,8 +396,8 @@ void register_FormFactorFullSpheroid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorFullSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorFullSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorFullSpheroid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index 51f31fe06d2..2085d18f60d 100644
--- a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
@@ -35,11 +35,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::FormFactorGauss * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorGauss::clone( );
- }
}
+
::FormFactorGauss * default_clone( ) const {
return FormFactorGauss::clone( );
}
@@ -47,11 +47,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorGauss::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorGauss::evaluate_for_q( boost::ref(q) );
}
@@ -59,11 +59,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorGauss::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorGauss::getHeight( );
}
@@ -71,11 +71,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorGauss::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorGauss::getNumberOfStochasticParameters( );
}
@@ -83,11 +83,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorGauss::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorGauss::getRadius( );
}
@@ -95,11 +95,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->FormFactorGauss::getVolume( );
- }
}
+
double default_getVolume( ) const {
return FormFactorGauss::getVolume( );
}
@@ -107,11 +107,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -119,11 +119,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -131,11 +131,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -143,35 +143,35 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -179,11 +179,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -191,11 +191,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -203,11 +203,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -215,11 +215,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -227,11 +227,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -239,11 +239,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -270,11 +270,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -282,11 +282,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -415,8 +415,8 @@ void register_FormFactorGauss_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorGauss_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorGauss_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorGauss_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
index e5939edd2e6..eb23162d475 100644
--- a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual ::FormFactorHemiEllipsoid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorHemiEllipsoid::clone( );
- }
}
+
::FormFactorHemiEllipsoid * default_clone( ) const {
return FormFactorHemiEllipsoid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorHemiEllipsoid::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorHemiEllipsoid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorHemiEllipsoid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorHemiEllipsoid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorHemiEllipsoid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorHemiEllipsoid::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getRadiusA( ) const {
if( bp::override func_getRadiusA = this->get_override( "getRadiusA" ) )
return func_getRadiusA( );
- else{
+ else
return this->FormFactorHemiEllipsoid::getRadiusA( );
- }
}
+
double default_getRadiusA( ) const {
return FormFactorHemiEllipsoid::getRadiusA( );
}
@@ -88,11 +88,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getRadiusB( ) const {
if( bp::override func_getRadiusB = this->get_override( "getRadiusB" ) )
return func_getRadiusB( );
- else{
+ else
return this->FormFactorHemiEllipsoid::getRadiusB( );
- }
}
+
double default_getRadiusB( ) const {
return FormFactorHemiEllipsoid::getRadiusB( );
}
@@ -100,11 +100,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -136,35 +136,35 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -172,11 +172,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -184,11 +184,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -220,11 +220,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -232,11 +232,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -244,11 +244,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -256,11 +256,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -287,11 +287,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -299,11 +299,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -431,8 +431,8 @@ void register_FormFactorHemiEllipsoid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorHemiEllipsoid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorHemiEllipsoid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorHemiEllipsoid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index d247e1a3ce8..c8f3d706bd2 100644
--- a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
@@ -35,11 +35,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::FormFactorLorentz * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorLorentz::clone( );
- }
}
+
::FormFactorLorentz * default_clone( ) const {
return FormFactorLorentz::clone( );
}
@@ -47,11 +47,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorLorentz::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorLorentz::evaluate_for_q( boost::ref(q) );
}
@@ -59,11 +59,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorLorentz::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorLorentz::getNumberOfStochasticParameters( );
}
@@ -71,11 +71,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -83,11 +83,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -95,11 +95,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -107,35 +107,35 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -143,11 +143,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -155,11 +155,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -167,11 +167,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -179,11 +179,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -191,11 +191,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -203,11 +203,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -215,11 +215,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -227,11 +227,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -239,11 +239,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -270,11 +270,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -282,11 +282,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -382,8 +382,8 @@ void register_FormFactorLorentz_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorLorentz_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorLorentz_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorLorentz_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
index a3e019bdf6f..662b7318775 100644
--- a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::FormFactorParallelepiped * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorParallelepiped::clone( );
- }
}
+
::FormFactorParallelepiped * default_clone( ) const {
return FormFactorParallelepiped::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorParallelepiped::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorParallelepiped::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorParallelepiped::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorParallelepiped::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorParallelepiped::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorParallelepiped::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorParallelepiped::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorParallelepiped::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,11 +100,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -112,11 +112,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -124,35 +124,35 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -172,11 +172,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -208,11 +208,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -220,11 +220,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -232,11 +232,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -263,11 +263,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -275,11 +275,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -396,8 +396,8 @@ void register_FormFactorParallelepiped_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorParallelepiped_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorParallelepiped_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorParallelepiped_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index 6ef1ab7c9c2..ec84e6ddc15 100644
--- a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::FormFactorPrism3 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorPrism3::clone( );
- }
}
+
::FormFactorPrism3 * default_clone( ) const {
return FormFactorPrism3::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorPrism3::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPrism3::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getHalfSide( ) const {
if( bp::override func_getHalfSide = this->get_override( "getHalfSide" ) )
return func_getHalfSide( );
- else{
+ else
return this->FormFactorPrism3::getHalfSide( );
- }
}
+
double default_getHalfSide( ) const {
return FormFactorPrism3::getHalfSide( );
}
@@ -64,11 +64,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorPrism3::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorPrism3::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorPrism3::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPrism3::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setHalfSide( double half_side ) {
if( bp::override func_setHalfSide = this->get_override( "setHalfSide" ) )
func_setHalfSide( half_side );
- else{
+ else
this->FormFactorPrism3::setHalfSide( half_side );
- }
}
+
void default_setHalfSide( double half_side ) {
FormFactorPrism3::setHalfSide( half_side );
}
@@ -100,11 +100,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorPrism3::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorPrism3::setHeight( height );
}
@@ -112,11 +112,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,11 +136,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -148,35 +148,35 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -184,11 +184,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -196,11 +196,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -220,11 +220,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -232,11 +232,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -244,11 +244,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -256,11 +256,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -268,11 +268,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -299,11 +299,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -311,11 +311,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -456,8 +456,8 @@ void register_FormFactorPrism3_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorPrism3_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorPrism3_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorPrism3_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
index dd3e63a4275..f45575078bb 100644
--- a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::FormFactorPrism6 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorPrism6::clone( );
- }
}
+
::FormFactorPrism6 * default_clone( ) const {
return FormFactorPrism6::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorPrism6::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPrism6::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorPrism6::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorPrism6::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorPrism6::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPrism6::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorPrism6::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorPrism6::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorPrism6::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorPrism6::setHeight( height );
}
@@ -100,11 +100,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorPrism6::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorPrism6::setRadius( radius );
}
@@ -112,11 +112,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,11 +136,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -148,35 +148,35 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -184,11 +184,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -196,11 +196,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -220,11 +220,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -232,11 +232,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -244,11 +244,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -256,11 +256,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -287,11 +287,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -299,11 +299,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -444,8 +444,8 @@ void register_FormFactorPrism6_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorPrism6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorPrism6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorPrism6_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index 31da7741724..e176797d5d2 100644
--- a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::FormFactorPyramid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorPyramid::clone( );
- }
}
+
::FormFactorPyramid * default_clone( ) const {
return FormFactorPyramid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorPyramid::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPyramid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else{
+ else
return this->FormFactorPyramid::getAlpha( );
- }
}
+
double default_getAlpha( ) const {
return FormFactorPyramid::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getHalfSide( ) const {
if( bp::override func_getHalfSide = this->get_override( "getHalfSide" ) )
return func_getHalfSide( );
- else{
+ else
return this->FormFactorPyramid::getHalfSide( );
- }
}
+
double default_getHalfSide( ) const {
return FormFactorPyramid::getHalfSide( );
}
@@ -76,11 +76,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorPyramid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorPyramid::getHeight( );
}
@@ -88,11 +88,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorPyramid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPyramid::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else{
+ else
this->FormFactorPyramid::setAlpha( alpha );
- }
}
+
void default_setAlpha( double alpha ) {
FormFactorPyramid::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setHalfSide( double half_side ) {
if( bp::override func_setHalfSide = this->get_override( "setHalfSide" ) )
func_setHalfSide( half_side );
- else{
+ else
this->FormFactorPyramid::setHalfSide( half_side );
- }
}
+
void default_setHalfSide( double half_side ) {
FormFactorPyramid::setHalfSide( half_side );
}
@@ -124,11 +124,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorPyramid::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorPyramid::setHeight( height );
}
@@ -136,11 +136,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -148,11 +148,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -160,11 +160,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -172,35 +172,35 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -208,11 +208,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -220,11 +220,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -244,11 +244,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -256,11 +256,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -268,11 +268,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -280,11 +280,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -292,11 +292,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -323,11 +323,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -335,11 +335,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -503,8 +503,8 @@ void register_FormFactorPyramid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorPyramid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
index e2387e734a5..b01d1895784 100644
--- a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual ::FormFactorRipple1 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorRipple1::clone( );
- }
}
+
::FormFactorRipple1 * default_clone( ) const {
return FormFactorRipple1::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorRipple1::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorRipple1::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorRipple1::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorRipple1::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else{
+ else
return this->FormFactorRipple1::getLength( );
- }
}
+
double default_getLength( ) const {
return FormFactorRipple1::getLength( );
}
@@ -76,11 +76,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorRipple1::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorRipple1::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
- else{
+ else
return this->FormFactorRipple1::getWidth( );
- }
}
+
double default_getWidth( ) const {
return FormFactorRipple1::getWidth( );
}
@@ -100,11 +100,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -136,35 +136,35 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -172,11 +172,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -184,11 +184,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -220,11 +220,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -232,11 +232,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -244,11 +244,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -256,11 +256,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -287,11 +287,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -299,11 +299,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -431,8 +431,8 @@ void register_FormFactorRipple1_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorRipple1_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorRipple1_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorRipple1_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
index 5dda55f7153..901bf26a604 100644
--- a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual ::FormFactorRipple2 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorRipple2::clone( );
- }
}
+
::FormFactorRipple2 * default_clone( ) const {
return FormFactorRipple2::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorRipple2::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorRipple2::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getAsymetry( ) const {
if( bp::override func_getAsymetry = this->get_override( "getAsymetry" ) )
return func_getAsymetry( );
- else{
+ else
return this->FormFactorRipple2::getAsymetry( );
- }
}
+
double default_getAsymetry( ) const {
return FormFactorRipple2::getAsymetry( );
}
@@ -64,11 +64,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorRipple2::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorRipple2::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else{
+ else
return this->FormFactorRipple2::getLength( );
- }
}
+
double default_getLength( ) const {
return FormFactorRipple2::getLength( );
}
@@ -88,11 +88,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorRipple2::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorRipple2::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
- else{
+ else
return this->FormFactorRipple2::getWidth( );
- }
}
+
double default_getWidth( ) const {
return FormFactorRipple2::getWidth( );
}
@@ -112,11 +112,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,11 +136,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -148,35 +148,35 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -184,11 +184,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -196,11 +196,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -220,11 +220,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -232,11 +232,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -244,11 +244,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -256,11 +256,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -268,11 +268,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -299,11 +299,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -311,11 +311,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -454,8 +454,8 @@ void register_FormFactorRipple2_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorRipple2_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorRipple2_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorRipple2_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
index f57adcca4ec..4d7915d49d2 100644
--- a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::FormFactorSphere * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorSphere::clone( );
- }
}
+
::FormFactorSphere * default_clone( ) const {
return FormFactorSphere::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorSphere::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorSphere::getHeight( );
}
@@ -52,11 +52,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorSphere::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphere::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,11 +88,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -100,35 +100,35 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -136,11 +136,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -148,11 +148,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -160,11 +160,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -184,11 +184,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -196,11 +196,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -208,11 +208,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -220,11 +220,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -251,11 +251,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -361,8 +361,8 @@ void register_FormFactorSphere_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorSphere_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index e9149e37853..43c73df4a4c 100644
--- a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
@@ -28,35 +28,35 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::FormFactorSphereGaussianRadius * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::clone( );
- }
}
+
::FormFactorSphereGaussianRadius * default_clone( ) const {
return FormFactorSphereGaussianRadius::clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->FormFactorSphereGaussianRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
FormFactorSphereGaussianRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorSphereGaussianRadius::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSphereGaussianRadius::evaluate_for_q( boost::ref(q) );
}
@@ -64,11 +64,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorSphereGaussianRadius::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return FormFactorSphereGaussianRadius::isDistributedFormFactor( );
}
@@ -100,11 +100,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -136,11 +136,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -148,11 +148,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -172,11 +172,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -208,11 +208,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -220,11 +220,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -232,11 +232,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -263,11 +263,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -275,11 +275,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -306,8 +306,8 @@ void register_FormFactorSphereGaussianRadius_class(){
}
{ //::FormFactorSphereGaussianRadius::createDistributedFormFactors
- typedef void ( ::FormFactorSphereGaussianRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorSphereGaussianRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::FormFactorSphereGaussianRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorSphereGaussianRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorSphereGaussianRadius_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
index 6e5fbc83f15..598456e8d1b 100644
--- a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
@@ -28,35 +28,35 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual ::FormFactorSphereUniformRadius * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorSphereUniformRadius::clone( );
- }
}
+
::FormFactorSphereUniformRadius * default_clone( ) const {
return FormFactorSphereUniformRadius::clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->FormFactorSphereUniformRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
FormFactorSphereUniformRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorSphereUniformRadius::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSphereUniformRadius::evaluate_for_q( boost::ref(q) );
}
@@ -64,11 +64,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorSphereUniformRadius::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorSphereUniformRadius::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorSphereUniformRadius::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphereUniformRadius::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->FormFactorSphereUniformRadius::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return FormFactorSphereUniformRadius::isDistributedFormFactor( );
}
@@ -100,11 +100,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -136,11 +136,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -148,11 +148,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -172,11 +172,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -208,11 +208,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -220,11 +220,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -232,11 +232,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -263,11 +263,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -275,11 +275,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -306,8 +306,8 @@ void register_FormFactorSphereUniformRadius_class(){
}
{ //::FormFactorSphereUniformRadius::createDistributedFormFactors
- typedef void ( ::FormFactorSphereUniformRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorSphereUniformRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::FormFactorSphereUniformRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorSphereUniformRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorSphereUniformRadius_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
index 516cb7df497..0e316d4c8c5 100644
--- a/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual ::FormFactorSpheroid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorSpheroid::clone( );
- }
}
+
::FormFactorSpheroid * default_clone( ) const {
return FormFactorSpheroid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorSpheroid::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSpheroid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorSpheroid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorSpheroid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual double getHeightFullSpheroid( ) const {
if( bp::override func_getHeightFullSpheroid = this->get_override( "getHeightFullSpheroid" ) )
return func_getHeightFullSpheroid( );
- else{
+ else
return this->FormFactorSpheroid::getHeightFullSpheroid( );
- }
}
+
double default_getHeightFullSpheroid( ) const {
return FormFactorSpheroid::getHeightFullSpheroid( );
}
@@ -76,11 +76,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorSpheroid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSpheroid::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorSpheroid::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorSpheroid::getRadius( );
}
@@ -100,11 +100,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -136,35 +136,35 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -172,11 +172,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -184,11 +184,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -220,11 +220,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -232,11 +232,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -244,11 +244,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -275,11 +275,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -287,11 +287,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -419,8 +419,8 @@ void register_FormFactorSpheroid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorSpheroid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
index f86e4ae450d..8d21d07f2a3 100644
--- a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
@@ -40,11 +40,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual ::HomogeneousMaterial * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->HomogeneousMaterial::clone( );
- }
}
+
::HomogeneousMaterial * default_clone( ) const {
return HomogeneousMaterial::clone( );
}
@@ -52,11 +52,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual ::IMaterial const * createTransformedMaterial( ::Geometry::Transform3D const & transform ) const {
if( bp::override func_createTransformedMaterial = this->get_override( "createTransformedMaterial" ) )
return func_createTransformedMaterial( boost::ref(transform) );
- else{
+ else
return this->HomogeneousMaterial::createTransformedMaterial( boost::ref(transform) );
- }
}
+
::IMaterial const * default_createTransformedMaterial( ::Geometry::Transform3D const & transform ) const {
return HomogeneousMaterial::createTransformedMaterial( boost::ref(transform) );
}
@@ -64,11 +64,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->HomogeneousMaterial::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return HomogeneousMaterial::getRefractiveIndex( );
}
@@ -76,11 +76,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual bool isScalarMaterial( ) const {
if( bp::override func_isScalarMaterial = this->get_override( "isScalarMaterial" ) )
return func_isScalarMaterial( );
- else{
+ else
return this->IMaterial::isScalarMaterial( );
- }
}
+
bool default_isScalarMaterial( ) const {
return IMaterial::isScalarMaterial( );
}
diff --git a/Core/PythonAPI/src/IAxis.pypp.cpp b/Core/PythonAPI/src/IAxis.pypp.cpp
index a6c9c35dcd9..9c689bebe60 100644
--- a/Core/PythonAPI/src/IAxis.pypp.cpp
+++ b/Core/PythonAPI/src/IAxis.pypp.cpp
@@ -33,12 +33,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return func_createDoubleBinSize( );
}
- virtual ::size_t findClosestIndex( double value ) const {
+ virtual ::std::size_t findClosestIndex( double value ) const {
bp::override func_findClosestIndex = this->get_override( "findClosestIndex" );
return func_findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::size_t index ) const {
+ virtual ::Bin1D getBin( ::std::size_t index ) const {
bp::override func_getBin = this->get_override( "getBin" );
return func_getBin( index );
}
@@ -53,12 +53,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return func_getMin( );
}
- virtual ::size_t getSize( ) const {
+ virtual ::std::size_t getSize( ) const {
bp::override func_getSize = this->get_override( "getSize" );
return func_getSize( );
}
- virtual double operator[]( ::size_t index ) const {
+ virtual double operator[]( ::std::size_t index ) const {
bp::override func___getitem__ = this->get_override( "__getitem__" );
return func___getitem__( index );
}
@@ -93,7 +93,7 @@ void register_IAxis_class(){
}
{ //::IAxis::findClosestIndex
- typedef ::size_t ( ::IAxis::*findClosestIndex_function_type )( double ) const;
+ typedef ::std::size_t ( ::IAxis::*findClosestIndex_function_type )( double ) const;
IAxis_exposer.def(
"findClosestIndex"
@@ -103,7 +103,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getBin
- typedef ::Bin1D ( ::IAxis::*getBin_function_type )( ::size_t ) const;
+ typedef ::Bin1D ( ::IAxis::*getBin_function_type )( ::std::size_t ) const;
IAxis_exposer.def(
"getBin"
@@ -140,7 +140,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getSize
- typedef ::size_t ( ::IAxis::*getSize_function_type )( ) const;
+ typedef ::std::size_t ( ::IAxis::*getSize_function_type )( ) const;
IAxis_exposer.def(
"getSize"
@@ -149,7 +149,7 @@ void register_IAxis_class(){
}
{ //::IAxis::operator[]
- typedef double ( ::IAxis::*__getitem___function_type )( ::size_t ) const;
+ typedef double ( ::IAxis::*__getitem___function_type )( ::std::size_t ) const;
IAxis_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
index 230fe3022fc..4ce4a10a7c2 100644
--- a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
+++ b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
@@ -33,11 +33,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else{
+ else
this->IClusteredParticles::applyTransformation( boost::ref(transform) );
- }
}
+
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
IClusteredParticles::applyTransformation( boost::ref(transform) );
}
@@ -55,11 +55,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::Geometry::Transform3D const * getTransform( ) const {
if( bp::override func_getTransform = this->get_override( "getTransform" ) )
return func_getTransform( );
- else{
+ else
return this->IClusteredParticles::getTransform( );
- }
}
+
::Geometry::Transform3D const * default_getTransform( ) const {
return IClusteredParticles::getTransform( );
}
@@ -72,11 +72,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -84,11 +84,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -96,11 +96,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -108,11 +108,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -120,11 +120,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -132,11 +132,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -144,11 +144,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -156,11 +156,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -187,11 +187,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -199,24 +199,24 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -418,8 +418,8 @@ void register_IClusteredParticles_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( IClusteredParticles_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( IClusteredParticles_wrapper::*default_size_function_type )( ) const;
IClusteredParticles_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ICompositeSample.pypp.cpp b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
index 940fab7309a..de31cada49a 100644
--- a/Core/PythonAPI/src/ICompositeSample.pypp.cpp
+++ b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
@@ -33,11 +33,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -45,35 +45,35 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -81,11 +81,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -93,11 +93,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -105,11 +105,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -117,11 +117,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -129,11 +129,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -141,11 +141,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -172,11 +172,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -184,11 +184,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -237,8 +237,8 @@ void register_ICompositeSample_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ICompositeSample_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ICompositeSample_wrapper::*default_size_function_type )( ) const;
ICompositeSample_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IDecoration.pypp.cpp b/Core/PythonAPI/src/IDecoration.pypp.cpp
index 1c900adf522..8cd261b5a4b 100644
--- a/Core/PythonAPI/src/IDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/IDecoration.pypp.cpp
@@ -40,7 +40,7 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
return func_cloneInvertB( );
}
- virtual double getAbundanceFractionOfParticle( ::size_t index ) const {
+ virtual double getAbundanceFractionOfParticle( ::std::size_t index ) const {
bp::override func_getAbundanceFractionOfParticle = this->get_override( "getAbundanceFractionOfParticle" );
return func_getAbundanceFractionOfParticle( index );
}
@@ -50,24 +50,24 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
return func_getInterferenceFunctions( );
}
- virtual ::size_t getNumberOfInterferenceFunctions( ) const {
+ virtual ::std::size_t getNumberOfInterferenceFunctions( ) const {
if( bp::override func_getNumberOfInterferenceFunctions = this->get_override( "getNumberOfInterferenceFunctions" ) )
return func_getNumberOfInterferenceFunctions( );
- else{
+ else
return this->IDecoration::getNumberOfInterferenceFunctions( );
- }
}
- ::size_t default_getNumberOfInterferenceFunctions( ) const {
+
+ ::std::size_t default_getNumberOfInterferenceFunctions( ) const {
return IDecoration::getNumberOfInterferenceFunctions( );
}
- virtual ::size_t getNumberOfParticles( ) const {
+ virtual ::std::size_t getNumberOfParticles( ) const {
bp::override func_getNumberOfParticles = this->get_override( "getNumberOfParticles" );
return func_getNumberOfParticles( );
}
- virtual ::ParticleInfo const * getParticleInfo( ::size_t index ) const {
+ virtual ::ParticleInfo const * getParticleInfo( ::std::size_t index ) const {
bp::override func_getParticleInfo = this->get_override( "getParticleInfo" );
return func_getParticleInfo( index );
}
@@ -75,11 +75,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -87,11 +87,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -99,11 +99,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -111,11 +111,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -123,11 +123,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -135,11 +135,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -147,11 +147,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -159,11 +159,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -190,11 +190,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -202,24 +202,24 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -263,7 +263,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getAbundanceFractionOfParticle
- typedef double ( ::IDecoration::*getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
+ typedef double ( ::IDecoration::*getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
IDecoration_exposer.def(
"getAbundanceFractionOfParticle"
@@ -282,8 +282,8 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getNumberOfInterferenceFunctions
- typedef ::size_t ( ::IDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
- typedef ::size_t ( IDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( ::IDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( IDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
IDecoration_exposer.def(
"getNumberOfInterferenceFunctions"
@@ -293,7 +293,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getNumberOfParticles
- typedef ::size_t ( ::IDecoration::*getNumberOfParticles_function_type )( ) const;
+ typedef ::std::size_t ( ::IDecoration::*getNumberOfParticles_function_type )( ) const;
IDecoration_exposer.def(
"getNumberOfParticles"
@@ -302,7 +302,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getParticleInfo
- typedef ::ParticleInfo const * ( ::IDecoration::*getParticleInfo_function_type )( ::size_t ) const;
+ typedef ::ParticleInfo const * ( ::IDecoration::*getParticleInfo_function_type )( ::std::size_t ) const;
IDecoration_exposer.def(
"getParticleInfo"
@@ -456,8 +456,8 @@ void register_IDecoration_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( IDecoration_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( IDecoration_wrapper::*default_size_function_type )( ) const;
IDecoration_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
index 791afdbbb89..1bfbec60f6e 100644
--- a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
+++ b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
@@ -38,11 +38,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -50,11 +50,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -62,11 +62,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -74,11 +74,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -105,11 +105,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -117,11 +117,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
index 567a7e4048f..c9ec190383d 100644
--- a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
+++ b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
@@ -38,11 +38,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -50,11 +50,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -62,11 +62,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -74,11 +74,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -105,11 +105,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -117,11 +117,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index 12e73304f8f..1385a08b954 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -30,15 +30,15 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
return func_clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
@@ -50,11 +50,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -62,11 +62,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -74,11 +74,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -86,11 +86,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactor::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactor::getVolume( );
}
@@ -98,11 +98,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -110,11 +110,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -122,11 +122,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -134,11 +134,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -146,11 +146,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -158,11 +158,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -170,11 +170,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -182,11 +182,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -194,11 +194,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -206,11 +206,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -237,11 +237,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -249,11 +249,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -278,8 +278,8 @@ void register_IFormFactor_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( IFormFactor_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( IFormFactor_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
IFormFactor_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index fdf69075f10..d6edb33d989 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -33,11 +33,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -50,11 +50,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -62,11 +62,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -74,11 +74,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -86,11 +86,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -98,35 +98,35 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -134,11 +134,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -146,11 +146,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -158,11 +158,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -170,11 +170,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -182,11 +182,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -194,11 +194,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -206,11 +206,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -218,11 +218,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -249,11 +249,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -261,11 +261,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -368,8 +368,8 @@ void register_IFormFactorBorn_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( IFormFactorBorn_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( IFormFactorBorn_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
IFormFactorBorn_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
index 964e16e881c..5d1d4474161 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -31,11 +31,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactorDecorator::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactorDecorator::getHeight( );
}
@@ -43,11 +43,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactorDecorator::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactorDecorator::getRadius( );
}
@@ -55,11 +55,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorDecorator::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorDecorator::getVolume( );
}
@@ -67,11 +67,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -79,11 +79,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -91,11 +91,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -103,35 +103,35 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -144,11 +144,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -156,11 +156,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -168,11 +168,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -180,11 +180,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -192,11 +192,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -204,11 +204,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -235,11 +235,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -247,11 +247,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -364,8 +364,8 @@ void register_IFormFactorDecorator_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( IFormFactorDecorator_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( IFormFactorDecorator_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
IFormFactorDecorator_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
index 6cc8ddeffa9..bb778471e30 100644
--- a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
+++ b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
@@ -38,11 +38,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -50,11 +50,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -62,11 +62,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -74,11 +74,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -86,11 +86,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -98,11 +98,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -110,11 +110,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -122,11 +122,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -134,11 +134,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -146,11 +146,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -177,11 +177,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -189,11 +189,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IMaterial.pypp.cpp b/Core/PythonAPI/src/IMaterial.pypp.cpp
index 4fdcc750924..9364a49d4d0 100644
--- a/Core/PythonAPI/src/IMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/IMaterial.pypp.cpp
@@ -33,11 +33,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual ::IMaterial * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->IMaterial::clone( );
- }
}
+
::IMaterial * default_clone( ) const {
return IMaterial::clone( );
}
@@ -45,11 +45,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual ::IMaterial const * createTransformedMaterial( ::Geometry::Transform3D const & transform ) const {
if( bp::override func_createTransformedMaterial = this->get_override( "createTransformedMaterial" ) )
return func_createTransformedMaterial( boost::ref(transform) );
- else{
+ else
return this->IMaterial::createTransformedMaterial( boost::ref(transform) );
- }
}
+
::IMaterial const * default_createTransformedMaterial( ::Geometry::Transform3D const & transform ) const {
return IMaterial::createTransformedMaterial( boost::ref(transform) );
}
@@ -57,11 +57,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->IMaterial::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return IMaterial::getRefractiveIndex( );
}
@@ -69,11 +69,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual bool isScalarMaterial( ) const {
if( bp::override func_isScalarMaterial = this->get_override( "isScalarMaterial" ) )
return func_isScalarMaterial( );
- else{
+ else
return this->IMaterial::isScalarMaterial( );
- }
}
+
bool default_isScalarMaterial( ) const {
return IMaterial::isScalarMaterial( );
}
diff --git a/Core/PythonAPI/src/IObservable.pypp.cpp b/Core/PythonAPI/src/IObservable.pypp.cpp
index 6e3f06ed514..c73a23d0bf6 100644
--- a/Core/PythonAPI/src/IObservable.pypp.cpp
+++ b/Core/PythonAPI/src/IObservable.pypp.cpp
@@ -33,11 +33,11 @@ struct IObservable_wrapper : IObservable, bp::wrapper< IObservable > {
virtual void attachObserver( ::boost::shared_ptr< IObserver > obj ) {
if( bp::override func_attachObserver = this->get_override( "attachObserver" ) )
func_attachObserver( obj );
- else{
+ else
this->IObservable::attachObserver( obj );
- }
}
+
void default_attachObserver( ::boost::shared_ptr< IObserver > obj ) {
IObservable::attachObserver( obj );
}
@@ -45,11 +45,11 @@ struct IObservable_wrapper : IObservable, bp::wrapper< IObservable > {
virtual void notifyObservers( ) {
if( bp::override func_notifyObservers = this->get_override( "notifyObservers" ) )
func_notifyObservers( );
- else{
+ else
this->IObservable::notifyObservers( );
- }
}
+
void default_notifyObservers( ) {
IObservable::notifyObservers( );
}
diff --git a/Core/PythonAPI/src/IObserver.pypp.cpp b/Core/PythonAPI/src/IObserver.pypp.cpp
index 04ac2919e58..9d93fda86f3 100644
--- a/Core/PythonAPI/src/IObserver.pypp.cpp
+++ b/Core/PythonAPI/src/IObserver.pypp.cpp
@@ -33,11 +33,11 @@ struct IObserver_wrapper : IObserver, bp::wrapper< IObserver > {
virtual void update( ::IObservable * arg0 ) {
if( bp::override func_update = this->get_override( "update" ) )
func_update( boost::python::ptr(arg0) );
- else{
+ else
this->IObserver::update( boost::python::ptr(arg0) );
- }
}
+
void default_update( ::IObservable * arg0 ) {
IObserver::update( boost::python::ptr(arg0) );
}
diff --git a/Core/PythonAPI/src/IParameterized.pypp.cpp b/Core/PythonAPI/src/IParameterized.pypp.cpp
index 5c6ebffeeed..270c7cda80a 100644
--- a/Core/PythonAPI/src/IParameterized.pypp.cpp
+++ b/Core/PythonAPI/src/IParameterized.pypp.cpp
@@ -42,11 +42,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -54,11 +54,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -66,11 +66,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -78,11 +78,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -109,11 +109,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -121,11 +121,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
index 41b775dc630..2b51f7601e0 100644
--- a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
+++ b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
@@ -38,11 +38,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -50,11 +50,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -62,11 +62,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -74,11 +74,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -105,11 +105,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -117,11 +117,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ISample.pypp.cpp b/Core/PythonAPI/src/ISample.pypp.cpp
index 88da2207a83..d758d443186 100644
--- a/Core/PythonAPI/src/ISample.pypp.cpp
+++ b/Core/PythonAPI/src/ISample.pypp.cpp
@@ -38,11 +38,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -50,11 +50,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -62,11 +62,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -74,11 +74,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -86,11 +86,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -98,11 +98,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -110,11 +110,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -122,11 +122,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -134,11 +134,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -165,11 +165,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -177,11 +177,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
index bc194a182d3..3ce253f17d1 100644
--- a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
+++ b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
@@ -35,11 +35,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual ::ISample * buildSample( ) const {
if( bp::override func_buildSample = this->get_override( "buildSample" ) )
return func_buildSample( );
- else{
+ else
return this->ISampleBuilder::buildSample( );
- }
}
+
::ISample * default_buildSample( ) const {
return ISampleBuilder::buildSample( );
}
@@ -47,11 +47,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -83,11 +83,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -114,11 +114,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -126,11 +126,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/Instrument.pypp.cpp b/Core/PythonAPI/src/Instrument.pypp.cpp
index 7e2dc045bda..32f9e1a1d1d 100644
--- a/Core/PythonAPI/src/Instrument.pypp.cpp
+++ b/Core/PythonAPI/src/Instrument.pypp.cpp
@@ -35,11 +35,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -114,11 +114,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -152,7 +152,7 @@ void register_Instrument_class(){
}
{ //::Instrument::getDetectorAxis
- typedef ::IAxis const & ( ::Instrument::*getDetectorAxis_function_type )( ::size_t ) const;
+ typedef ::IAxis const & ( ::Instrument::*getDetectorAxis_function_type )( ::std::size_t ) const;
Instrument_exposer.def(
"getDetectorAxis"
@@ -163,7 +163,7 @@ void register_Instrument_class(){
}
{ //::Instrument::getDetectorDimension
- typedef ::size_t ( ::Instrument::*getDetectorDimension_function_type )( ) const;
+ typedef ::std::size_t ( ::Instrument::*getDetectorDimension_function_type )( ) const;
Instrument_exposer.def(
"getDetectorDimension"
@@ -221,7 +221,7 @@ void register_Instrument_class(){
}
{ //::Instrument::setDetectorParameters
- typedef void ( ::Instrument::*setDetectorParameters_function_type )( ::size_t,double,double,::size_t,double,double,bool ) ;
+ typedef void ( ::Instrument::*setDetectorParameters_function_type )( ::std::size_t,double,double,::std::size_t,double,double,bool ) ;
Instrument_exposer.def(
"setDetectorParameters"
diff --git a/Core/PythonAPI/src/IntensityData.pypp.cpp b/Core/PythonAPI/src/IntensityData.pypp.cpp
index a4764e19baa..55ba4ac878e 100644
--- a/Core/PythonAPI/src/IntensityData.pypp.cpp
+++ b/Core/PythonAPI/src/IntensityData.pypp.cpp
@@ -34,7 +34,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::addAxis
typedef OutputData< double > exported_class_t;
- typedef void ( exported_class_t::*addAxis_function_type )( ::std::string const &,::size_t,double,double ) ;
+ typedef void ( exported_class_t::*addAxis_function_type )( ::std::string const &,::std::size_t,double,double ) ;
IntensityData_exposer.def(
"addAxis"
@@ -87,7 +87,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getAllocatedSize
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getAllocatedSize_function_type )( ) const;
+ typedef ::std::size_t ( exported_class_t::*getAllocatedSize_function_type )( ) const;
IntensityData_exposer.def(
"getAllocatedSize"
@@ -107,7 +107,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getAxis
typedef OutputData< double > exported_class_t;
- typedef ::IAxis const * ( exported_class_t::*getAxis_function_type )( ::size_t ) const;
+ typedef ::IAxis const * ( exported_class_t::*getAxis_function_type )( ::std::size_t ) const;
IntensityData_exposer.def(
"getAxis"
@@ -131,7 +131,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getAxisIndex
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getAxisIndex_function_type )( ::std::string const & ) const;
+ typedef ::std::size_t ( exported_class_t::*getAxisIndex_function_type )( ::std::string const & ) const;
IntensityData_exposer.def(
"getAxisIndex"
@@ -142,7 +142,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getIndexOfAxis
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getIndexOfAxis_function_type )( ::std::string const &,::size_t ) const;
+ typedef ::std::size_t ( exported_class_t::*getIndexOfAxis_function_type )( ::std::string const &,::std::size_t ) const;
IntensityData_exposer.def(
"getIndexOfAxis"
@@ -153,7 +153,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getRank
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getRank_function_type )( ) const;
+ typedef ::std::size_t ( exported_class_t::*getRank_function_type )( ) const;
IntensityData_exposer.def(
"getRank"
@@ -173,7 +173,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getValueOfAxis
typedef OutputData< double > exported_class_t;
- typedef double ( exported_class_t::*getValueOfAxis_function_type )( ::std::string const &,::size_t ) const;
+ typedef double ( exported_class_t::*getValueOfAxis_function_type )( ::std::string const &,::std::size_t ) const;
IntensityData_exposer.def(
"getValueOfAxis"
@@ -210,7 +210,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::operator[]
typedef OutputData< double > exported_class_t;
- typedef double & ( exported_class_t::*__getitem___function_type )( ::size_t ) ;
+ typedef double & ( exported_class_t::*__getitem___function_type )( ::std::size_t ) ;
IntensityData_exposer.def(
"__getitem__"
@@ -222,7 +222,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::operator[]
typedef OutputData< double > exported_class_t;
- typedef double const & ( exported_class_t::*__getitem___function_type )( ::size_t ) const;
+ typedef double const & ( exported_class_t::*__getitem___function_type )( ::std::size_t ) const;
IntensityData_exposer.def(
"__getitem__"
@@ -277,7 +277,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::toCoordinate
typedef OutputData< double > exported_class_t;
- typedef int ( exported_class_t::*toCoordinate_function_type )( ::size_t,::size_t ) const;
+ typedef int ( exported_class_t::*toCoordinate_function_type )( ::std::size_t,::std::size_t ) const;
IntensityData_exposer.def(
"toCoordinate"
@@ -288,7 +288,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::toCoordinates
typedef OutputData< double > exported_class_t;
- typedef ::std::vector< int > ( exported_class_t::*toCoordinates_function_type )( ::size_t ) const;
+ typedef ::std::vector< int > ( exported_class_t::*toCoordinates_function_type )( ::std::size_t ) const;
IntensityData_exposer.def(
"toCoordinates"
@@ -299,7 +299,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::toIndex
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*toIndex_function_type )( ::std::vector< int > ) const;
+ typedef ::std::size_t ( exported_class_t::*toIndex_function_type )( ::std::vector< int > ) const;
IntensityData_exposer.def(
"toIndex"
diff --git a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
index 3680bbe8c0a..f3161ed7136 100644
--- a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::InterferenceFunction1DParaCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunction1DParaCrystal::clone( );
- }
}
+
::InterferenceFunction1DParaCrystal * default_clone( ) const {
return InterferenceFunction1DParaCrystal::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunction1DParaCrystal::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction1DParaCrystal::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->InterferenceFunction1DParaCrystal::getKappa( );
- }
}
+
double default_getKappa( ) const {
return InterferenceFunction1DParaCrystal::getKappa( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -160,11 +160,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -191,11 +191,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,11 +203,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
index e297089f173..0753d66da35 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::InterferenceFunction2DLattice * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunction2DLattice::clone( );
- }
}
+
::InterferenceFunction2DLattice * default_clone( ) const {
return InterferenceFunction2DLattice::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunction2DLattice::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DLattice::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -148,11 +148,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -160,11 +160,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -191,11 +191,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,11 +203,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
index cebdfd43429..7825deaae3b 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::InterferenceFunction2DParaCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunction2DParaCrystal::clone( );
- }
}
+
::InterferenceFunction2DParaCrystal * default_clone( ) const {
return InterferenceFunction2DParaCrystal::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunction2DParaCrystal::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DParaCrystal::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -148,11 +148,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -160,11 +160,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -191,11 +191,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,11 +203,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
index 60967add3e3..cac4dc45457 100644
--- a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::InterferenceFunctionNone * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunctionNone::clone( );
- }
}
+
::InterferenceFunctionNone * default_clone( ) const {
return InterferenceFunctionNone::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunctionNone::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunctionNone::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -148,11 +148,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -160,11 +160,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -191,11 +191,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,11 +203,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/LatticeBasis.pypp.cpp b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
index a649b341c83..842fde2fb08 100644
--- a/Core/PythonAPI/src/LatticeBasis.pypp.cpp
+++ b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
@@ -28,11 +28,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::applyTransformation( boost::ref(transform) );
- }
}
+
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -76,11 +76,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else{
+ else
return this->Particle::getAmbientMaterial( );
- }
}
+
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -100,11 +100,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else{
+ else
return this->Particle::getMaterial( );
- }
}
+
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -136,11 +136,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -148,11 +148,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::IFormFactor const * getSimpleFormFactor( ) const {
if( bp::override func_getSimpleFormFactor = this->get_override( "getSimpleFormFactor" ) )
return func_getSimpleFormFactor( );
- else{
+ else
return this->Particle::getSimpleFormFactor( );
- }
}
+
::IFormFactor const * default_getSimpleFormFactor( ) const {
return Particle::getSimpleFormFactor( );
}
@@ -160,11 +160,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -172,11 +172,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -184,11 +184,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -215,11 +215,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -227,11 +227,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -239,24 +239,24 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::setTransformation( boost::ref(transform) );
- }
}
+
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( boost::ref(transform) );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -486,8 +486,8 @@ void register_LatticeBasis_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( LatticeBasis_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( LatticeBasis_wrapper::*default_size_function_type )( ) const;
LatticeBasis_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Layer.pypp.cpp b/Core/PythonAPI/src/Layer.pypp.cpp
index e2cdcfdf4e1..107b589131d 100644
--- a/Core/PythonAPI/src/Layer.pypp.cpp
+++ b/Core/PythonAPI/src/Layer.pypp.cpp
@@ -49,11 +49,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::Layer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Layer::clone( );
- }
}
+
::Layer * default_clone( ) const {
return Layer::clone( );
}
@@ -61,11 +61,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::Layer * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->Layer::cloneInvertB( );
- }
}
+
::Layer * default_cloneInvertB( ) const {
return Layer::cloneInvertB( );
}
@@ -73,11 +73,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::IDecoration const * getDecoration( ) const {
if( bp::override func_getDecoration = this->get_override( "getDecoration" ) )
return func_getDecoration( );
- else{
+ else
return this->Layer::getDecoration( );
- }
}
+
::IDecoration const * default_getDecoration( ) const {
return Layer::getDecoration( );
}
@@ -85,11 +85,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else{
+ else
return this->Layer::getMaterial( );
- }
}
+
::IMaterial const * default_getMaterial( ) const {
return Layer::getMaterial( );
}
@@ -97,11 +97,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Layer::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return Layer::getRefractiveIndex( );
}
@@ -109,11 +109,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual double getThickness( ) const {
if( bp::override func_getThickness = this->get_override( "getThickness" ) )
return func_getThickness( );
- else{
+ else
return this->Layer::getThickness( );
- }
}
+
double default_getThickness( ) const {
return Layer::getThickness( );
}
@@ -121,11 +121,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual double getTotalParticleSurfaceDensity( ) const {
if( bp::override func_getTotalParticleSurfaceDensity = this->get_override( "getTotalParticleSurfaceDensity" ) )
return func_getTotalParticleSurfaceDensity( );
- else{
+ else
return this->Layer::getTotalParticleSurfaceDensity( );
- }
}
+
double default_getTotalParticleSurfaceDensity( ) const {
return Layer::getTotalParticleSurfaceDensity( );
}
@@ -133,11 +133,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setDecoration( ::IDecoration const & decoration ) {
if( bp::override func_setDecoration = this->get_override( "setDecoration" ) )
func_setDecoration( boost::ref(decoration) );
- else{
+ else
this->Layer::setDecoration( boost::ref(decoration) );
- }
}
+
void default_setDecoration( ::IDecoration const & decoration ) {
Layer::setDecoration( boost::ref(decoration) );
}
@@ -145,11 +145,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setMaterial( ::IMaterial const * material ) {
if( bp::override func_setMaterial = this->get_override( "setMaterial" ) )
func_setMaterial( boost::python::ptr(material) );
- else{
+ else
this->Layer::setMaterial( boost::python::ptr(material) );
- }
}
+
void default_setMaterial( ::IMaterial const * material ) {
Layer::setMaterial( boost::python::ptr(material) );
}
@@ -157,11 +157,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setMaterial( ::IMaterial const * material, double thickness ) {
if( bp::override func_setMaterial = this->get_override( "setMaterial" ) )
func_setMaterial( boost::python::ptr(material), thickness );
- else{
+ else
this->Layer::setMaterial( boost::python::ptr(material), thickness );
- }
}
+
void default_setMaterial( ::IMaterial const * material, double thickness ) {
Layer::setMaterial( boost::python::ptr(material), thickness );
}
@@ -169,11 +169,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setThickness( double thickness ) {
if( bp::override func_setThickness = this->get_override( "setThickness" ) )
func_setThickness( thickness );
- else{
+ else
this->Layer::setThickness( thickness );
- }
}
+
void default_setThickness( double thickness ) {
Layer::setThickness( thickness );
}
@@ -181,11 +181,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -193,11 +193,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -205,11 +205,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -217,11 +217,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -229,11 +229,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -241,11 +241,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -253,11 +253,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -265,11 +265,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -296,11 +296,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -308,24 +308,24 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -595,8 +595,8 @@ void register_Layer_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( Layer_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( Layer_wrapper::*default_size_function_type )( ) const;
Layer_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/LayerInterface.pypp.cpp b/Core/PythonAPI/src/LayerInterface.pypp.cpp
index 5e150acbcf6..f88b26117a1 100644
--- a/Core/PythonAPI/src/LayerInterface.pypp.cpp
+++ b/Core/PythonAPI/src/LayerInterface.pypp.cpp
@@ -21,11 +21,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::LayerInterface * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->LayerInterface::clone( );
- }
}
+
::LayerInterface * default_clone( ) const {
return LayerInterface::clone( );
}
@@ -33,11 +33,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -45,11 +45,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -57,11 +57,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -69,11 +69,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -81,11 +81,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -93,11 +93,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -105,11 +105,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -117,11 +117,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -129,11 +129,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -160,11 +160,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -172,24 +172,24 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -391,8 +391,8 @@ void register_LayerInterface_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( LayerInterface_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( LayerInterface_wrapper::*default_size_function_type )( ) const;
LayerInterface_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/LayerRoughness.pypp.cpp b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
index f5bded2feb6..5661e67c699 100644
--- a/Core/PythonAPI/src/LayerRoughness.pypp.cpp
+++ b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
@@ -35,11 +35,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::LayerRoughness * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->LayerRoughness::clone( );
- }
}
+
::LayerRoughness * default_clone( ) const {
return LayerRoughness::clone( );
}
@@ -47,11 +47,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ISample::cloneInvertB( );
- }
}
+
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -83,11 +83,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -95,11 +95,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -107,11 +107,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -119,11 +119,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -131,11 +131,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -143,11 +143,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -174,11 +174,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -186,11 +186,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/MesoCrystal.pypp.cpp b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
index 09e937917f4..271f7288e25 100644
--- a/Core/PythonAPI/src/MesoCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::applyTransformation( boost::ref(transform) );
- }
}
+
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -76,11 +76,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else{
+ else
return this->Particle::getAmbientMaterial( );
- }
}
+
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -100,11 +100,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else{
+ else
return this->Particle::getMaterial( );
- }
}
+
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -136,11 +136,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -148,11 +148,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -160,11 +160,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -172,11 +172,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -203,11 +203,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -215,11 +215,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -227,24 +227,24 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::setTransformation( boost::ref(transform) );
- }
}
+
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( boost::ref(transform) );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -452,8 +452,8 @@ void register_MesoCrystal_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( MesoCrystal_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( MesoCrystal_wrapper::*default_size_function_type )( ) const;
MesoCrystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/MultiLayer.pypp.cpp b/Core/PythonAPI/src/MultiLayer.pypp.cpp
index f498dabb226..de475b94a9e 100644
--- a/Core/PythonAPI/src/MultiLayer.pypp.cpp
+++ b/Core/PythonAPI/src/MultiLayer.pypp.cpp
@@ -28,11 +28,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::MultiLayer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->MultiLayer::clone( );
- }
}
+
::MultiLayer * default_clone( ) const {
return MultiLayer::clone( );
}
@@ -40,11 +40,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::MultiLayer * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->MultiLayer::cloneInvertB( );
- }
}
+
::MultiLayer * default_cloneInvertB( ) const {
return MultiLayer::cloneInvertB( );
}
@@ -52,11 +52,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -88,11 +88,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -179,24 +179,24 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -272,7 +272,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getCrossCorrSpectralFun
- typedef double ( ::MultiLayer::*getCrossCorrSpectralFun_function_type )( ::kvector_t const &,::size_t,::size_t ) const;
+ typedef double ( ::MultiLayer::*getCrossCorrSpectralFun_function_type )( ::kvector_t const &,::std::size_t,::std::size_t ) const;
MultiLayer_exposer.def(
"getCrossCorrSpectralFun"
@@ -282,7 +282,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayer
- typedef ::Layer const * ( ::MultiLayer::*getLayer_function_type )( ::size_t ) const;
+ typedef ::Layer const * ( ::MultiLayer::*getLayer_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayer"
@@ -293,7 +293,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerBottomInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerBottomInterface_function_type )( ::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerBottomInterface_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerBottomInterface"
@@ -304,7 +304,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerBottomZ
- typedef double ( ::MultiLayer::*getLayerBottomZ_function_type )( ::size_t ) const;
+ typedef double ( ::MultiLayer::*getLayerBottomZ_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerBottomZ"
@@ -314,7 +314,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerInterface_function_type )( ::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerInterface_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerInterface"
@@ -325,7 +325,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerThickness
- typedef double ( ::MultiLayer::*getLayerThickness_function_type )( ::size_t ) const;
+ typedef double ( ::MultiLayer::*getLayerThickness_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerThickness"
@@ -335,7 +335,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerTopInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerTopInterface_function_type )( ::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerTopInterface_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerTopInterface"
@@ -346,7 +346,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getNumberOfInterfaces
- typedef ::size_t ( ::MultiLayer::*getNumberOfInterfaces_function_type )( ) const;
+ typedef ::std::size_t ( ::MultiLayer::*getNumberOfInterfaces_function_type )( ) const;
MultiLayer_exposer.def(
"getNumberOfInterfaces"
@@ -355,7 +355,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getNumberOfLayers
- typedef ::size_t ( ::MultiLayer::*getNumberOfLayers_function_type )( ) const;
+ typedef ::std::size_t ( ::MultiLayer::*getNumberOfLayers_function_type )( ) const;
MultiLayer_exposer.def(
"getNumberOfLayers"
@@ -374,7 +374,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::setLayerThickness
- typedef void ( ::MultiLayer::*setLayerThickness_function_type )( ::size_t,double ) ;
+ typedef void ( ::MultiLayer::*setLayerThickness_function_type )( ::std::size_t,double ) ;
MultiLayer_exposer.def(
"setLayerThickness"
@@ -508,8 +508,8 @@ void register_MultiLayer_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( MultiLayer_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( MultiLayer_wrapper::*default_size_function_type )( ) const;
MultiLayer_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParameterPool.pypp.cpp b/Core/PythonAPI/src/ParameterPool.pypp.cpp
index 914cffcceb8..88a890adef4 100644
--- a/Core/PythonAPI/src/ParameterPool.pypp.cpp
+++ b/Core/PythonAPI/src/ParameterPool.pypp.cpp
@@ -26,11 +26,11 @@ struct ParameterPool_wrapper : ParameterPool, bp::wrapper< ParameterPool > {
virtual ::ParameterPool * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ParameterPool::clone( );
- }
}
+
::ParameterPool * default_clone( ) const {
return ParameterPool::clone( );
}
@@ -127,7 +127,7 @@ void register_ParameterPool_class(){
}
{ //::ParameterPool::size
- typedef ::size_t ( ::ParameterPool::*size_function_type )( ) const;
+ typedef ::std::size_t ( ::ParameterPool::*size_function_type )( ) const;
ParameterPool_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Particle.pypp.cpp b/Core/PythonAPI/src/Particle.pypp.cpp
index c3254261557..e142733be87 100644
--- a/Core/PythonAPI/src/Particle.pypp.cpp
+++ b/Core/PythonAPI/src/Particle.pypp.cpp
@@ -42,11 +42,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::applyTransformation( boost::ref(transform) );
- }
}
+
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -54,11 +54,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::Particle * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Particle::clone( );
- }
}
+
::Particle * default_clone( ) const {
return Particle::clone( );
}
@@ -66,11 +66,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::Particle * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->Particle::cloneInvertB( );
- }
}
+
::Particle * default_cloneInvertB( ) const {
return Particle::cloneInvertB( );
}
@@ -78,11 +78,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IFormFactor * createFormFactor( ::complex_t wavevector_scattering_factor ) const {
if( bp::override func_createFormFactor = this->get_override( "createFormFactor" ) )
return func_createFormFactor( wavevector_scattering_factor );
- else{
+ else
return this->Particle::createFormFactor( wavevector_scattering_factor );
- }
}
+
::IFormFactor * default_createFormFactor( ::complex_t wavevector_scattering_factor ) const {
return Particle::createFormFactor( wavevector_scattering_factor );
}
@@ -90,11 +90,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else{
+ else
return this->Particle::getAmbientMaterial( );
- }
}
+
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -102,11 +102,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else{
+ else
return this->Particle::getMaterial( );
- }
}
+
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -114,11 +114,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -126,11 +126,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IFormFactor const * getSimpleFormFactor( ) const {
if( bp::override func_getSimpleFormFactor = this->get_override( "getSimpleFormFactor" ) )
return func_getSimpleFormFactor( );
- else{
+ else
return this->Particle::getSimpleFormFactor( );
- }
}
+
::IFormFactor const * default_getSimpleFormFactor( ) const {
return Particle::getSimpleFormFactor( );
}
@@ -138,11 +138,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -150,11 +150,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::setTransformation( boost::ref(transform) );
- }
}
+
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( boost::ref(transform) );
}
@@ -162,11 +162,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -174,11 +174,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -186,11 +186,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -198,11 +198,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -210,11 +210,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -222,11 +222,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -234,11 +234,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -246,11 +246,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -277,11 +277,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -289,24 +289,24 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -575,8 +575,8 @@ void register_Particle_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( Particle_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( Particle_wrapper::*default_size_function_type )( ) const;
Particle_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
index 90ac41a1912..ad2ab1bfa96 100644
--- a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
@@ -28,11 +28,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::applyTransformation( boost::ref(transform) );
- }
}
+
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -76,11 +76,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else{
+ else
return this->Particle::getAmbientMaterial( );
- }
}
+
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -100,11 +100,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else{
+ else
return this->Particle::getMaterial( );
- }
}
+
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -136,11 +136,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -148,11 +148,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -160,11 +160,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -172,11 +172,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -203,11 +203,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -215,11 +215,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -227,24 +227,24 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else{
+ else
this->Particle::setTransformation( boost::ref(transform) );
- }
}
+
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( boost::ref(transform) );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -452,8 +452,8 @@ void register_ParticleCoreShell_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ParticleCoreShell_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ParticleCoreShell_wrapper::*default_size_function_type )( ) const;
ParticleCoreShell_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
index 1c96408325b..780a3b774da 100644
--- a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
@@ -35,11 +35,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParticleDecoration * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ParticleDecoration::clone( );
- }
}
+
::ParticleDecoration * default_clone( ) const {
return ParticleDecoration::clone( );
}
@@ -47,83 +47,83 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParticleDecoration * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ParticleDecoration::cloneInvertB( );
- }
}
+
::ParticleDecoration * default_cloneInvertB( ) const {
return ParticleDecoration::cloneInvertB( );
}
- virtual double getAbundanceFractionOfParticle( ::size_t index ) const {
+ virtual double getAbundanceFractionOfParticle( ::std::size_t index ) const {
if( bp::override func_getAbundanceFractionOfParticle = this->get_override( "getAbundanceFractionOfParticle" ) )
return func_getAbundanceFractionOfParticle( index );
- else{
+ else
return this->ParticleDecoration::getAbundanceFractionOfParticle( index );
- }
}
- double default_getAbundanceFractionOfParticle( ::size_t index ) const {
+
+ double default_getAbundanceFractionOfParticle( ::std::size_t index ) const {
return ParticleDecoration::getAbundanceFractionOfParticle( index );
}
virtual ::SafePointerVector< IInterferenceFunction > getInterferenceFunctions( ) const {
if( bp::override func_getInterferenceFunctions = this->get_override( "getInterferenceFunctions" ) )
return func_getInterferenceFunctions( );
- else{
+ else
return this->ParticleDecoration::getInterferenceFunctions( );
- }
}
+
::SafePointerVector< IInterferenceFunction > default_getInterferenceFunctions( ) const {
return ParticleDecoration::getInterferenceFunctions( );
}
- virtual ::size_t getNumberOfInterferenceFunctions( ) const {
+ virtual ::std::size_t getNumberOfInterferenceFunctions( ) const {
if( bp::override func_getNumberOfInterferenceFunctions = this->get_override( "getNumberOfInterferenceFunctions" ) )
return func_getNumberOfInterferenceFunctions( );
- else{
+ else
return this->ParticleDecoration::getNumberOfInterferenceFunctions( );
- }
}
- ::size_t default_getNumberOfInterferenceFunctions( ) const {
+
+ ::std::size_t default_getNumberOfInterferenceFunctions( ) const {
return ParticleDecoration::getNumberOfInterferenceFunctions( );
}
- virtual ::size_t getNumberOfParticles( ) const {
+ virtual ::std::size_t getNumberOfParticles( ) const {
if( bp::override func_getNumberOfParticles = this->get_override( "getNumberOfParticles" ) )
return func_getNumberOfParticles( );
- else{
+ else
return this->ParticleDecoration::getNumberOfParticles( );
- }
}
- ::size_t default_getNumberOfParticles( ) const {
+
+ ::std::size_t default_getNumberOfParticles( ) const {
return ParticleDecoration::getNumberOfParticles( );
}
- virtual ::ParticleInfo const * getParticleInfo( ::size_t index ) const {
+ virtual ::ParticleInfo const * getParticleInfo( ::std::size_t index ) const {
if( bp::override func_getParticleInfo = this->get_override( "getParticleInfo" ) )
return func_getParticleInfo( index );
- else{
+ else
return this->ParticleDecoration::getParticleInfo( index );
- }
}
- ::ParticleInfo const * default_getParticleInfo( ::size_t index ) const {
+
+ ::ParticleInfo const * default_getParticleInfo( ::std::size_t index ) const {
return ParticleDecoration::getParticleInfo( index );
}
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -131,11 +131,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -143,11 +143,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -155,11 +155,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -167,11 +167,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -179,11 +179,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -191,11 +191,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -203,11 +203,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -234,11 +234,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -246,24 +246,24 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -342,8 +342,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getAbundanceFractionOfParticle
- typedef double ( ::ParticleDecoration::*getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
- typedef double ( ParticleDecoration_wrapper::*default_getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
+ typedef double ( ::ParticleDecoration::*getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
+ typedef double ( ParticleDecoration_wrapper::*default_getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
ParticleDecoration_exposer.def(
"getAbundanceFractionOfParticle"
@@ -354,7 +354,7 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getInterferenceFunction
- typedef ::IInterferenceFunction const * ( ::ParticleDecoration::*getInterferenceFunction_function_type )( ::size_t ) const;
+ typedef ::IInterferenceFunction const * ( ::ParticleDecoration::*getInterferenceFunction_function_type )( ::std::size_t ) const;
ParticleDecoration_exposer.def(
"getInterferenceFunction"
@@ -376,8 +376,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getNumberOfInterferenceFunctions
- typedef ::size_t ( ::ParticleDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
- typedef ::size_t ( ParticleDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( ::ParticleDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( ParticleDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
ParticleDecoration_exposer.def(
"getNumberOfInterferenceFunctions"
@@ -387,8 +387,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getNumberOfParticles
- typedef ::size_t ( ::ParticleDecoration::*getNumberOfParticles_function_type )( ) const;
- typedef ::size_t ( ParticleDecoration_wrapper::*default_getNumberOfParticles_function_type )( ) const;
+ typedef ::std::size_t ( ::ParticleDecoration::*getNumberOfParticles_function_type )( ) const;
+ typedef ::std::size_t ( ParticleDecoration_wrapper::*default_getNumberOfParticles_function_type )( ) const;
ParticleDecoration_exposer.def(
"getNumberOfParticles"
@@ -398,8 +398,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getParticleInfo
- typedef ::ParticleInfo const * ( ::ParticleDecoration::*getParticleInfo_function_type )( ::size_t ) const;
- typedef ::ParticleInfo const * ( ParticleDecoration_wrapper::*default_getParticleInfo_function_type )( ::size_t ) const;
+ typedef ::ParticleInfo const * ( ::ParticleDecoration::*getParticleInfo_function_type )( ::std::size_t ) const;
+ typedef ::ParticleInfo const * ( ParticleDecoration_wrapper::*default_getParticleInfo_function_type )( ::std::size_t ) const;
ParticleDecoration_exposer.def(
"getParticleInfo"
@@ -535,8 +535,8 @@ void register_ParticleDecoration_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ParticleDecoration_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ParticleDecoration_wrapper::*default_size_function_type )( ) const;
ParticleDecoration_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleInfo.pypp.cpp b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
index 965c45de438..bea496bcbe5 100644
--- a/Core/PythonAPI/src/ParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
@@ -28,11 +28,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParticleInfo * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ParticleInfo::clone( );
- }
}
+
::ParticleInfo * default_clone( ) const {
return ParticleInfo::clone( );
}
@@ -40,11 +40,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParticleInfo * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ParticleInfo::cloneInvertB( );
- }
}
+
::ParticleInfo * default_cloneInvertB( ) const {
return ParticleInfo::cloneInvertB( );
}
@@ -52,11 +52,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -88,11 +88,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -179,24 +179,24 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -406,8 +406,8 @@ void register_ParticleInfo_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ParticleInfo_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ParticleInfo_wrapper::*default_size_function_type )( ) const;
ParticleInfo_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
index a9e364e86be..77d913740e9 100644
--- a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
@@ -28,11 +28,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::PositionParticleInfo * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->PositionParticleInfo::clone( );
- }
}
+
::PositionParticleInfo * default_clone( ) const {
return PositionParticleInfo::clone( );
}
@@ -40,11 +40,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ParticleInfo * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else{
+ else
return this->ParticleInfo::cloneInvertB( );
- }
}
+
::ParticleInfo * default_cloneInvertB( ) const {
return ParticleInfo::cloneInvertB( );
}
@@ -76,11 +76,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else{
+ else
return this->ISample::containsMagneticMaterial( );
- }
}
+
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -88,11 +88,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else{
+ else
this->ISample::printSampleTree( );
- }
}
+
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -179,24 +179,24 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -387,8 +387,8 @@ void register_PositionParticleInfo_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( PositionParticleInfo_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( PositionParticleInfo_wrapper::*default_size_function_type )( ) const;
PositionParticleInfo_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/PythonListConverter.cpp b/Core/PythonAPI/src/PythonListConverter.cpp
index 85a04d86478..ccfbaebaf65 100644
--- a/Core/PythonAPI/src/PythonListConverter.cpp
+++ b/Core/PythonAPI/src/PythonListConverter.cpp
@@ -20,6 +20,7 @@ void register_python2cpp_converters()
{
Vector_from_python_list<double>();
Vector_from_python_list<kvector_t>();
+ Vector_from_python_list<std::string>();
}
diff --git a/Core/PythonAPI/src/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index b518c100c66..e40e2599bd0 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -4,102 +4,102 @@
#include "numpy/arrayobject.h"
// the order of 3 guys above is important
-#include "AxisBin.pypp.h"
-#include "AxisDouble.pypp.h"
-#include "Beam.pypp.h"
-#include "Bin1D.pypp.h"
-#include "Bin1DCVector.pypp.h"
-#include "Crystal.pypp.h"
-#include "cvector_t.pypp.h"
+#include "IFTDistribution2D.pypp.h"
+#include "IntensityDataHelper.pypp.h"
#include "Detector.pypp.h"
-#include "FormFactorAnisoPyramid.pypp.h"
-#include "FormFactorBox.pypp.h"
-#include "FormFactorCone.pypp.h"
-#include "FormFactorCone6.pypp.h"
-#include "FormFactorCrystal.pypp.h"
-#include "FormFactorCuboctahedron.pypp.h"
+#include "FormFactorRipple2.pypp.h"
+#include "LatticeBasis.pypp.h"
+#include "ParticleCoreShell.pypp.h"
+#include "Beam.pypp.h"
+#include "Lattice.pypp.h"
#include "FormFactorCylinder.pypp.h"
-#include "FormFactorDecoratorDebyeWaller.pypp.h"
-#include "FormFactorEllipsoidalCylinder.pypp.h"
-#include "FormFactorFullSphere.pypp.h"
-#include "FormFactorFullSpheroid.pypp.h"
-#include "FormFactorGauss.pypp.h"
-#include "FormFactorHemiEllipsoid.pypp.h"
-#include "FormFactorLorentz.pypp.h"
+#include "ICloneable.pypp.h"
+#include "StochasticSampledParameter.pypp.h"
+#include "HomogeneousMaterial.pypp.h"
+#include "FormFactorCone6.pypp.h"
+#include "vector_integer_t.pypp.h"
+#include "AxisDouble.pypp.h"
+#include "IAxis.pypp.h"
+#include "Layer.pypp.h"
+#include "ThreadInfo.pypp.h"
+#include "IFormFactor.pypp.h"
+#include "IObservable.pypp.h"
#include "FormFactorParallelepiped.pypp.h"
-#include "FormFactorPrism3.pypp.h"
+#include "RealParameterWrapper.pypp.h"
+#include "MaterialManager.pypp.h"
+#include "ResolutionFunction2DSimple.pypp.h"
+#include "SimulationParameters.pypp.h"
+#include "FormFactorSphereUniformRadius.pypp.h"
+#include "AxisBin.pypp.h"
+#include "FormFactorGauss.pypp.h"
+#include "FormFactorFullSpheroid.pypp.h"
+#include "FormFactorAnisoPyramid.pypp.h"
+#include "PythonInterface_global_variables.pypp.h"
+#include "ISampleBuilder.pypp.h"
+#include "StochasticParameter_t.pypp.h"
+#include "StochasticDoubleGaussian.pypp.h"
#include "FormFactorPrism6.pypp.h"
+#include "InterferenceFunction2DLattice.pypp.h"
#include "FormFactorPyramid.pypp.h"
-#include "FormFactorRipple1.pypp.h"
-#include "FormFactorRipple2.pypp.h"
-#include "FormFactorSphere.pypp.h"
-#include "FormFactorSphereGaussianRadius.pypp.h"
-#include "FormFactorSphereUniformRadius.pypp.h"
+#include "FormFactorBox.pypp.h"
#include "FormFactorSpheroid.pypp.h"
+#include "IResolutionFunction2D.pypp.h"
+#include "IFormFactorBorn.pypp.h"
+#include "MultiLayer.pypp.h"
+#include "ParticleDecoration.pypp.h"
+#include "IDecoration.pypp.h"
#include "FTDistribution2DCauchy.pypp.h"
-#include "HomogeneousMaterial.pypp.h"
-#include "IAxis.pypp.h"
-#include "ICloneable.pypp.h"
-#include "IClusteredParticles.pypp.h"
#include "ICompositeSample.pypp.h"
-#include "IDecoration.pypp.h"
-#include "IDetectorResolution.pypp.h"
-#include "IFormFactor.pypp.h"
-#include "IFormFactorBorn.pypp.h"
-#include "IFormFactorDecorator.pypp.h"
-#include "IFTDistribution2D.pypp.h"
-#include "IInterferenceFunction.pypp.h"
+#include "cvector_t.pypp.h"
+#include "ParameterPool.pypp.h"
+#include "Particle.pypp.h"
+#include "FormFactorCone.pypp.h"
+#include "FormFactorPrism3.pypp.h"
+#include "InterferenceFunction2DParaCrystal.pypp.h"
+#include "vdouble1d_t.pypp.h"
+#include "FormFactorEllipsoidalCylinder.pypp.h"
+#include "MesoCrystal.pypp.h"
+#include "FormFactorDecoratorDebyeWaller.pypp.h"
+#include "vector_IFormFactorPtr_t.pypp.h"
#include "IMaterial.pypp.h"
+#include "IFormFactorDecorator.pypp.h"
#include "Instrument.pypp.h"
-#include "IntensityData.pypp.h"
-#include "IntensityDataHelper.pypp.h"
-#include "InterferenceFunction1DParaCrystal.pypp.h"
-#include "InterferenceFunction2DLattice.pypp.h"
-#include "InterferenceFunction2DParaCrystal.pypp.h"
-#include "InterferenceFunctionNone.pypp.h"
-#include "IObservable.pypp.h"
-#include "IObserver.pypp.h"
-#include "IParameterized.pypp.h"
-#include "IResolutionFunction2D.pypp.h"
-#include "ISample.pypp.h"
-#include "ISampleBuilder.pypp.h"
+#include "IDetectorResolution.pypp.h"
+#include "FormFactorHemiEllipsoid.pypp.h"
#include "ISelectionRule.pypp.h"
-#include "kvector_t.pypp.h"
-#include "Lattice.pypp.h"
-#include "Lattice2DIFParameters.pypp.h"
-#include "LatticeBasis.pypp.h"
-#include "Layer.pypp.h"
+#include "Bin1D.pypp.h"
+#include "ParticleInfo.pypp.h"
+#include "vector_longinteger_t.pypp.h"
#include "LayerInterface.pypp.h"
+#include "FormFactorFullSphere.pypp.h"
+#include "Transform3D.pypp.h"
+#include "FormFactorRipple1.pypp.h"
+#include "PositionParticleInfo.pypp.h"
#include "LayerRoughness.pypp.h"
-#include "MaterialManager.pypp.h"
-#include "MesoCrystal.pypp.h"
-#include "MultiLayer.pypp.h"
+#include "FormFactorCrystal.pypp.h"
+#include "IntensityData.pypp.h"
+#include "IParameterized.pypp.h"
+#include "Bin1DCVector.pypp.h"
+#include "StochasticDoubleGate.pypp.h"
+#include "IClusteredParticles.pypp.h"
+#include "IInterferenceFunction.pypp.h"
+#include "SimpleSelectionRule.pypp.h"
+#include "FormFactorLorentz.pypp.h"
#include "OutputDataIOFactory.pypp.h"
-#include "ParameterPool.pypp.h"
-#include "Particle.pypp.h"
-#include "ParticleBuilder.pypp.h"
-#include "ParticleCoreShell.pypp.h"
-#include "ParticleDecoration.pypp.h"
-#include "ParticleInfo.pypp.h"
-#include "PositionParticleInfo.pypp.h"
+#include "vector_kvector_t.pypp.h"
+#include "InterferenceFunction1DParaCrystal.pypp.h"
+#include "InterferenceFunctionNone.pypp.h"
+#include "Crystal.pypp.h"
+#include "FormFactorCuboctahedron.pypp.h"
#include "PythonInterface_free_functions.pypp.h"
-#include "PythonInterface_global_variables.pypp.h"
-#include "RealParameterWrapper.pypp.h"
-#include "ResolutionFunction2DSimple.pypp.h"
-#include "SimpleSelectionRule.pypp.h"
+#include "kvector_t.pypp.h"
#include "Simulation.pypp.h"
-#include "SimulationParameters.pypp.h"
-#include "StochasticDoubleGate.pypp.h"
-#include "StochasticDoubleGaussian.pypp.h"
-#include "StochasticParameter_t.pypp.h"
-#include "StochasticSampledParameter.pypp.h"
-#include "ThreadInfo.pypp.h"
-#include "Transform3D.pypp.h"
-#include "vdouble1d_t.pypp.h"
-#include "vector_IFormFactorPtr_t.pypp.h"
-#include "vector_integer_t.pypp.h"
-#include "vector_kvector_t.pypp.h"
-#include "vector_longinteger_t.pypp.h"
+#include "ISample.pypp.h"
+#include "IObserver.pypp.h"
+#include "ParticleBuilder.pypp.h"
+#include "FormFactorSphereGaussianRadius.pypp.h"
+#include "Lattice2DIFParameters.pypp.h"
+#include "FormFactorSphere.pypp.h"
#include "__call_policies.pypp.hpp"
#include "__convenience.pypp.hpp"
diff --git a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
index c607587eab0..ee1d7a797f5 100644
--- a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
+++ b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
@@ -28,11 +28,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual ::ResolutionFunction2DSimple * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ResolutionFunction2DSimple::clone( );
- }
}
+
::ResolutionFunction2DSimple * default_clone( ) const {
return ResolutionFunction2DSimple::clone( );
}
@@ -40,11 +40,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual double evaluateCDF( double x, double y ) const {
if( bp::override func_evaluateCDF = this->get_override( "evaluateCDF" ) )
return func_evaluateCDF( x, y );
- else{
+ else
return this->ResolutionFunction2DSimple::evaluateCDF( x, y );
- }
}
+
double default_evaluateCDF( double x, double y ) const {
return ResolutionFunction2DSimple::evaluateCDF( x, y );
}
@@ -52,11 +52,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -119,11 +119,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -131,11 +131,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
index cb07c7da7f2..b66737013bb 100644
--- a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
+++ b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
@@ -33,11 +33,11 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
virtual ::SimpleSelectionRule * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SimpleSelectionRule::clone( );
- }
}
+
::SimpleSelectionRule * default_clone( ) const {
return SimpleSelectionRule::clone( );
}
@@ -45,11 +45,11 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
virtual bool coordinateSelected( ::IndexVector3D const & coordinate ) const {
if( bp::override func_coordinateSelected = this->get_override( "coordinateSelected" ) )
return func_coordinateSelected( boost::ref(coordinate) );
- else{
+ else
return this->SimpleSelectionRule::coordinateSelected( boost::ref(coordinate) );
- }
}
+
bool default_coordinateSelected( ::IndexVector3D const & coordinate ) const {
return SimpleSelectionRule::coordinateSelected( boost::ref(coordinate) );
}
diff --git a/Core/PythonAPI/src/Simulation.pypp.cpp b/Core/PythonAPI/src/Simulation.pypp.cpp
index b6d48926c2e..932d34577f8 100644
--- a/Core/PythonAPI/src/Simulation.pypp.cpp
+++ b/Core/PythonAPI/src/Simulation.pypp.cpp
@@ -28,11 +28,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual ::Simulation * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Simulation::clone( );
- }
}
+
::Simulation * default_clone( ) const {
return Simulation::clone( );
}
@@ -40,11 +40,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -76,11 +76,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -107,11 +107,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -119,11 +119,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -236,7 +236,7 @@ void register_Simulation_class(){
}
{ //::Simulation::runSimulationElement
- typedef void ( ::Simulation::*runSimulationElement_function_type )( ::size_t ) ;
+ typedef void ( ::Simulation::*runSimulationElement_function_type )( ::std::size_t ) ;
Simulation_exposer.def(
"runSimulationElement"
@@ -276,7 +276,7 @@ void register_Simulation_class(){
}
{ //::Simulation::setDetectorParameters
- typedef void ( ::Simulation::*setDetectorParameters_function_type )( ::size_t,double,double,::size_t,double,double,bool ) ;
+ typedef void ( ::Simulation::*setDetectorParameters_function_type )( ::std::size_t,double,double,::std::size_t,double,double,bool ) ;
Simulation_exposer.def(
"setDetectorParameters"
diff --git a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
index ea0d2bcc00b..a2c2e6ca95b 100644
--- a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
@@ -26,11 +26,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual ::StochasticDoubleGate * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->StochasticDoubleGate::clone( );
- }
}
+
::StochasticDoubleGate * default_clone( ) const {
return StochasticDoubleGate::clone( );
}
@@ -38,11 +38,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticDoubleGate::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticDoubleGate::getFWHM( );
}
@@ -50,11 +50,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else{
+ else
return this->StochasticDoubleGate::probabilityDensity( value );
- }
}
+
double default_probabilityDensity( double value ) const {
return StochasticDoubleGate::probabilityDensity( value );
}
@@ -62,11 +62,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else{
+ else
this->StochasticDoubleGate::setToRandom( );
- }
}
+
void default_setToRandom( ) {
StochasticDoubleGate::setToRandom( );
}
@@ -74,11 +74,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -86,11 +86,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
index 820e29c3e45..ec0bb290500 100644
--- a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
@@ -26,11 +26,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual ::StochasticDoubleGaussian * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->StochasticDoubleGaussian::clone( );
- }
}
+
::StochasticDoubleGaussian * default_clone( ) const {
return StochasticDoubleGaussian::clone( );
}
@@ -38,11 +38,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticDoubleGaussian::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticDoubleGaussian::getFWHM( );
}
@@ -50,11 +50,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else{
+ else
return this->StochasticDoubleGaussian::probabilityDensity( value );
- }
}
+
double default_probabilityDensity( double value ) const {
return StochasticDoubleGaussian::probabilityDensity( value );
}
@@ -62,11 +62,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else{
+ else
this->StochasticDoubleGaussian::setToRandom( );
- }
}
+
void default_setToRandom( ) {
StochasticDoubleGaussian::setToRandom( );
}
@@ -74,11 +74,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -86,11 +86,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
index 1c7f4060708..e6cd435ac44 100644
--- a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
@@ -31,11 +31,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticParameter< double >::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticParameter< double >::getFWHM( );
}
@@ -43,11 +43,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -60,11 +60,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
index 26fc062960c..6868e315885 100644
--- a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
@@ -16,14 +16,14 @@ namespace bp = boost::python;
struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrapper< StochasticSampledParameter > {
- StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::size_t nbins, double xmin, double xmax )
+ StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::std::size_t nbins, double xmin, double xmax )
: StochasticSampledParameter( boost::ref(par), nbins, xmin, xmax )
, bp::wrapper< StochasticSampledParameter >(){
// constructor
}
- StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::size_t nbins, int nfwhm=3 )
+ StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::std::size_t nbins, int nfwhm=3 )
: StochasticSampledParameter( boost::ref(par), nbins, nfwhm )
, bp::wrapper< StochasticSampledParameter >(){
// constructor
@@ -33,11 +33,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual ::StochasticSampledParameter * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->StochasticSampledParameter::clone( );
- }
}
+
::StochasticSampledParameter * default_clone( ) const {
return StochasticSampledParameter::clone( );
}
@@ -45,11 +45,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else{
+ else
return this->StochasticSampledParameter::probabilityDensity( value );
- }
}
+
double default_probabilityDensity( double value ) const {
return StochasticSampledParameter::probabilityDensity( value );
}
@@ -57,11 +57,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else{
+ else
this->StochasticSampledParameter::setToRandom( );
- }
}
+
void default_setToRandom( ) {
StochasticSampledParameter::setToRandom( );
}
@@ -69,11 +69,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticParameter< double >::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticParameter< double >::getFWHM( );
}
@@ -81,11 +81,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -93,11 +93,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
@@ -108,9 +108,9 @@ void register_StochasticSampledParameter_class(){
{ //::StochasticSampledParameter
typedef bp::class_< StochasticSampledParameter_wrapper, bp::bases< StochasticParameter< double > >, boost::noncopyable > StochasticSampledParameter_exposer_t;
- StochasticSampledParameter_exposer_t StochasticSampledParameter_exposer = StochasticSampledParameter_exposer_t( "StochasticSampledParameter", bp::init< StochasticParameter< double > const &, size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) );
+ StochasticSampledParameter_exposer_t StochasticSampledParameter_exposer = StochasticSampledParameter_exposer_t( "StochasticSampledParameter", bp::init< StochasticParameter< double > const &, std::size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) );
bp::scope StochasticSampledParameter_scope( StochasticSampledParameter_exposer );
- StochasticSampledParameter_exposer.def( bp::init< StochasticParameter< double > const &, size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) );
+ StochasticSampledParameter_exposer.def( bp::init< StochasticParameter< double > const &, std::size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) );
{ //::StochasticSampledParameter::clone
typedef ::StochasticSampledParameter * ( ::StochasticSampledParameter::*clone_function_type )( ) const;
@@ -125,7 +125,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getBinValue
- typedef double ( ::StochasticSampledParameter::*getBinValue_function_type )( ::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*getBinValue_function_type )( ::std::size_t ) const;
StochasticSampledParameter_exposer.def(
"getBinValue"
@@ -135,7 +135,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getNbins
- typedef ::size_t ( ::StochasticSampledParameter::*getNbins_function_type )( ) const;
+ typedef ::std::size_t ( ::StochasticSampledParameter::*getNbins_function_type )( ) const;
StochasticSampledParameter_exposer.def(
"getNbins"
@@ -144,7 +144,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getNormalizedProbability
- typedef double ( ::StochasticSampledParameter::*getNormalizedProbability_function_type )( ::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*getNormalizedProbability_function_type )( ::std::size_t ) const;
StochasticSampledParameter_exposer.def(
"getNormalizedProbability"
@@ -154,7 +154,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::probabilityBinDensity
- typedef double ( ::StochasticSampledParameter::*probabilityBinDensity_function_type )( ::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*probabilityBinDensity_function_type )( ::std::size_t ) const;
StochasticSampledParameter_exposer.def(
"probabilityBinDensity"
diff --git a/Fit/FitKernel/inc/FitStrategyAdjustParameters.h b/Fit/FitKernel/inc/FitStrategyAdjustParameters.h
index b6cf64215a3..5e028d15eee 100644
--- a/Fit/FitKernel/inc/FitStrategyAdjustParameters.h
+++ b/Fit/FitKernel/inc/FitStrategyAdjustParameters.h
@@ -19,7 +19,7 @@
#include "IFitStrategy.h"
//! @class FitStrategyAdjustParameters
-//! @ingroup fitting_internal
+//! @ingroup fitting
//! @brief Strategy which fixes/releases fit parameters and call minimizer
class BA_CORE_API_ FitStrategyAdjustParameters : public IFitStrategy
@@ -27,37 +27,52 @@ class BA_CORE_API_ FitStrategyAdjustParameters : public IFitStrategy
public:
FitStrategyAdjustParameters(const std::string& name)
: IFitStrategy(name)
- , m_fix_all(false)
- , m_release_all(false)
- , m_preserve_original_values(false) { }
+ {
+ clear();
+ }
+
FitStrategyAdjustParameters()
: IFitStrategy("FitSuiteStrategyAdjustParameters")
- , m_fix_all(false)
- , m_release_all(false)
- , m_preserve_original_values(false) { }
+ {
+ clear();
+ }
+
virtual ~FitStrategyAdjustParameters(){}
virtual FitStrategyAdjustParameters *clone() const { return new FitStrategyAdjustParameters(*this); }
virtual void execute();
- FitStrategyAdjustParameters& fix_all() {
+
+ virtual FitStrategyAdjustParameters& fix_all() {
m_fix_all = true; return *this;
}
- FitStrategyAdjustParameters& release_all() {
+
+ virtual FitStrategyAdjustParameters& release_all() {
m_release_all = true; return *this;
}
- FitStrategyAdjustParameters& fix(std::string parname ) {
+
+ virtual FitStrategyAdjustParameters& fix(std::string parname ) {
m_pars_to_fix.push_back(parname);
return *this;
}
- FitStrategyAdjustParameters& release(std::string parname ) {
+
+ virtual FitStrategyAdjustParameters& release(std::string parname ) {
m_pars_to_release.push_back(parname);
return *this;
}
- void setPreserveOriginalValues(bool preserve_values) {
+
+ virtual void setPreserveOriginalValues(bool preserve_values) {
m_preserve_original_values = preserve_values;
}
+ virtual void clear() {
+ m_fix_all = false;
+ m_release_all = false;
+ m_preserve_original_values = false;
+ m_pars_to_fix.clear();
+ m_pars_to_release.clear();
+ }
+
protected:
FitStrategyAdjustParameters(const FitStrategyAdjustParameters &other);
@@ -72,12 +87,81 @@ protected:
//! @class FitStrategyFixParameters
-//! @ingroup fitting_internal
-//! @brief Strategy which fixes/releases fit parameters and call minimizer
+//! @ingroup fitting
+//! @brief Strategy which fixes certain fit parameters leaving other released
+
+class BA_CORE_API_ FitStrategyFixParameters : public FitStrategyAdjustParameters
+{
+public:
+ FitStrategyFixParameters()
+ : FitStrategyAdjustParameters("FixStrategyFixParameters")
+ {
+ m_fix_all = false;
+ m_release_all = true;
+ }
+
+ FitStrategyFixParameters(const std::vector<std::string> &pars)
+ : FitStrategyAdjustParameters("FixStrategyFixParameters")
+ {
+ m_fix_all = false;
+ m_release_all = true;
+ setFixed(pars);
+ }
+
+ virtual ~FitStrategyFixParameters(){}
+ virtual FitStrategyFixParameters *clone() const { return new FitStrategyFixParameters(*this); }
+
+ virtual void clear() {
+ FitStrategyAdjustParameters::clear();
+ m_release_all = true;
+ }
+
+ virtual void setFixed(const std::vector<std::string> &pars) {
+ m_pars_to_fix = pars;
+ }
+
+};
+
+
+//! @class FitStrategyReleaseParameters
+//! @ingroup fitting
+//! @brief Strategy which releases certain fit parameters leaving other fixed
+
+class BA_CORE_API_ FitStrategyReleaseParameters : public FitStrategyAdjustParameters
+{
+public:
+ FitStrategyReleaseParameters()
+ : FitStrategyAdjustParameters("FixStrategyReleaseParameters")
+ {
+ m_fix_all = true;
+ m_release_all = false;
+ }
+
+ FitStrategyReleaseParameters(const std::vector<std::string > &pars)
+ : FitStrategyAdjustParameters("FixStrategyReleaseParameters")
+ {
+ m_fix_all = true;
+ m_release_all = false;
+ setReleased(pars);
+ }
+
+
+ virtual ~FitStrategyReleaseParameters(){}
+ virtual FitStrategyReleaseParameters *clone() const { return new FitStrategyReleaseParameters(*this); }
+
+ virtual void clear() {
+ FitStrategyAdjustParameters::clear();
+ m_fix_all = true;
+ }
+
+ virtual void setReleased(const std::vector<std::string> &pars) {
+ m_pars_to_release = pars;
+ }
+
+};
+
+
-//class BA_CORE_API_ FitStrategyFixParameters : public IFitStrategy
-//{
-//public:
#endif // FITSTRATEGYADJUSTPARAMETERS_H
diff --git a/Fit/FitKernel/src/FitStrategyAdjustParameters.cpp b/Fit/FitKernel/src/FitStrategyAdjustParameters.cpp
index d4c385d0ab6..cdfd3f84a5f 100644
--- a/Fit/FitKernel/src/FitStrategyAdjustParameters.cpp
+++ b/Fit/FitKernel/src/FitStrategyAdjustParameters.cpp
@@ -61,3 +61,5 @@ void FitStrategyAdjustParameters::execute()
}
+
+
diff --git a/Fit/PythonAPI/inc/FitStrategyAdjustMinimizer.pypp.h b/Fit/PythonAPI/inc/FitStrategyAdjustMinimizer.pypp.h
new file mode 100644
index 00000000000..fba35918a5b
--- /dev/null
+++ b/Fit/PythonAPI/inc/FitStrategyAdjustMinimizer.pypp.h
@@ -0,0 +1,11 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#ifndef FitStrategyAdjustMinimizer_hpp__pyplusplus_wrapper
+#define FitStrategyAdjustMinimizer_hpp__pyplusplus_wrapper
+
+void register_FitStrategyAdjustMinimizer_class();
+
+#endif//FitStrategyAdjustMinimizer_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/FitStrategyAdjustParameters.pypp.h b/Fit/PythonAPI/inc/FitStrategyAdjustParameters.pypp.h
new file mode 100644
index 00000000000..fdfb39c96ea
--- /dev/null
+++ b/Fit/PythonAPI/inc/FitStrategyAdjustParameters.pypp.h
@@ -0,0 +1,11 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#ifndef FitStrategyAdjustParameters_hpp__pyplusplus_wrapper
+#define FitStrategyAdjustParameters_hpp__pyplusplus_wrapper
+
+void register_FitStrategyAdjustParameters_class();
+
+#endif//FitStrategyAdjustParameters_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/FitStrategyDefault.pypp.h b/Fit/PythonAPI/inc/FitStrategyDefault.pypp.h
new file mode 100644
index 00000000000..7440942d13c
--- /dev/null
+++ b/Fit/PythonAPI/inc/FitStrategyDefault.pypp.h
@@ -0,0 +1,11 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#ifndef FitStrategyDefault_hpp__pyplusplus_wrapper
+#define FitStrategyDefault_hpp__pyplusplus_wrapper
+
+void register_FitStrategyDefault_class();
+
+#endif//FitStrategyDefault_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/FitStrategyFixParameters.pypp.h b/Fit/PythonAPI/inc/FitStrategyFixParameters.pypp.h
new file mode 100644
index 00000000000..d1c8d6c5b04
--- /dev/null
+++ b/Fit/PythonAPI/inc/FitStrategyFixParameters.pypp.h
@@ -0,0 +1,11 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#ifndef FitStrategyFixParameters_hpp__pyplusplus_wrapper
+#define FitStrategyFixParameters_hpp__pyplusplus_wrapper
+
+void register_FitStrategyFixParameters_class();
+
+#endif//FitStrategyFixParameters_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/FitStrategyReleaseParameters.pypp.h b/Fit/PythonAPI/inc/FitStrategyReleaseParameters.pypp.h
new file mode 100644
index 00000000000..cfdb7caa6f7
--- /dev/null
+++ b/Fit/PythonAPI/inc/FitStrategyReleaseParameters.pypp.h
@@ -0,0 +1,11 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#ifndef FitStrategyReleaseParameters_hpp__pyplusplus_wrapper
+#define FitStrategyReleaseParameters_hpp__pyplusplus_wrapper
+
+void register_FitStrategyReleaseParameters_class();
+
+#endif//FitStrategyReleaseParameters_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/IFitStrategy.pypp.h b/Fit/PythonAPI/inc/IFitStrategy.pypp.h
new file mode 100644
index 00000000000..fa742e44176
--- /dev/null
+++ b/Fit/PythonAPI/inc/IFitStrategy.pypp.h
@@ -0,0 +1,11 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#ifndef IFitStrategy_hpp__pyplusplus_wrapper
+#define IFitStrategy_hpp__pyplusplus_wrapper
+
+void register_IFitStrategy_class();
+
+#endif//IFitStrategy_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/PythonFitExposer.h b/Fit/PythonAPI/inc/PythonFitExposer.h
index 72716dd53e4..bc6895b1e45 100644
--- a/Fit/PythonAPI/inc/PythonFitExposer.h
+++ b/Fit/PythonAPI/inc/PythonFitExposer.h
@@ -10,6 +10,7 @@ namespace pyplusplus {
typedef std::vector<double > vdouble1d_t;
typedef std::vector<vdouble1d_t > vdouble2d_t;
typedef std::vector<complex_t > vcomplex1d_t;
+ typedef std::vector<std::string > vector_string_t;
}
}
@@ -18,6 +19,7 @@ namespace pyplusplus {
namespace pyplusplus {
inline size_t pyplusplus_boost_vdouble1d() { return sizeof(pyplusplus::aliases::vdouble1d_t); }
inline size_t pyplusplus_boost_vcomplex1d() { return sizeof(pyplusplus::aliases::vcomplex1d_t); }
+ inline size_t pyplusplus_boost_vector_string() { return sizeof(pyplusplus::aliases::vector_string_t); }
}
#endif // PYTHONFITEXPOSER_H
diff --git a/Fit/PythonAPI/inc/PythonFitList.h b/Fit/PythonAPI/inc/PythonFitList.h
index f234fa7e803..e5607453045 100644
--- a/Fit/PythonAPI/inc/PythonFitList.h
+++ b/Fit/PythonAPI/inc/PythonFitList.h
@@ -18,6 +18,9 @@
#include "MinimizerOptions.h"
#include "ISquaredFunction.h"
#include "IOutputDataNormalizer.h"
+#include "IFitStrategy.h"
+#include "FitStrategyAdjustParameters.h"
+#include "FitStrategyAdjustMinimizer.h"
//! file containig additional exposers
#include "PythonFitExposer.h"
diff --git a/Fit/PythonAPI/inc/vector_string_t.pypp.h b/Fit/PythonAPI/inc/vector_string_t.pypp.h
new file mode 100644
index 00000000000..775589bcd5a
--- /dev/null
+++ b/Fit/PythonAPI/inc/vector_string_t.pypp.h
@@ -0,0 +1,11 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#ifndef vector_string_t_hpp__pyplusplus_wrapper
+#define vector_string_t_hpp__pyplusplus_wrapper
+
+void register_vector_string_t_class();
+
+#endif//vector_string_t_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/src/AttLimits.pypp.cpp b/Fit/PythonAPI/src/AttLimits.pypp.cpp
index e9ebeee424e..9faa92236e7 100644
--- a/Fit/PythonAPI/src/AttLimits.pypp.cpp
+++ b/Fit/PythonAPI/src/AttLimits.pypp.cpp
@@ -33,11 +33,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual double getLowerLimit( ) const {
if( bp::override func_getLowerLimit = this->get_override( "getLowerLimit" ) )
return func_getLowerLimit( );
- else{
+ else
return this->AttLimits::getLowerLimit( );
- }
}
+
double default_getLowerLimit( ) const {
return AttLimits::getLowerLimit( );
}
@@ -45,11 +45,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual double getUpperLimit( ) const {
if( bp::override func_getUpperLimit = this->get_override( "getUpperLimit" ) )
return func_getUpperLimit( );
- else{
+ else
return this->AttLimits::getUpperLimit( );
- }
}
+
double default_getUpperLimit( ) const {
return AttLimits::getUpperLimit( );
}
@@ -57,11 +57,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasLowerAndUpperLimits( ) const {
if( bp::override func_hasLowerAndUpperLimits = this->get_override( "hasLowerAndUpperLimits" ) )
return func_hasLowerAndUpperLimits( );
- else{
+ else
return this->AttLimits::hasLowerAndUpperLimits( );
- }
}
+
bool default_hasLowerAndUpperLimits( ) const {
return AttLimits::hasLowerAndUpperLimits( );
}
@@ -69,11 +69,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasLowerLimit( ) const {
if( bp::override func_hasLowerLimit = this->get_override( "hasLowerLimit" ) )
return func_hasLowerLimit( );
- else{
+ else
return this->AttLimits::hasLowerLimit( );
- }
}
+
bool default_hasLowerLimit( ) const {
return AttLimits::hasLowerLimit( );
}
@@ -81,11 +81,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasUpperLimit( ) const {
if( bp::override func_hasUpperLimit = this->get_override( "hasUpperLimit" ) )
return func_hasUpperLimit( );
- else{
+ else
return this->AttLimits::hasUpperLimit( );
- }
}
+
bool default_hasUpperLimit( ) const {
return AttLimits::hasUpperLimit( );
}
@@ -93,11 +93,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool isFixed( ) const {
if( bp::override func_isFixed = this->get_override( "isFixed" ) )
return func_isFixed( );
- else{
+ else
return this->AttLimits::isFixed( );
- }
}
+
bool default_isFixed( ) const {
return AttLimits::isFixed( );
}
@@ -105,11 +105,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeLimits( ) {
if( bp::override func_removeLimits = this->get_override( "removeLimits" ) )
func_removeLimits( );
- else{
+ else
this->AttLimits::removeLimits( );
- }
}
+
void default_removeLimits( ) {
AttLimits::removeLimits( );
}
@@ -117,11 +117,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeLowerLimit( ) {
if( bp::override func_removeLowerLimit = this->get_override( "removeLowerLimit" ) )
func_removeLowerLimit( );
- else{
+ else
this->AttLimits::removeLowerLimit( );
- }
}
+
void default_removeLowerLimit( ) {
AttLimits::removeLowerLimit( );
}
@@ -129,11 +129,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeUpperLimit( ) {
if( bp::override func_removeUpperLimit = this->get_override( "removeUpperLimit" ) )
func_removeUpperLimit( );
- else{
+ else
this->AttLimits::removeUpperLimit( );
- }
}
+
void default_removeUpperLimit( ) {
AttLimits::removeUpperLimit( );
}
@@ -141,11 +141,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setFixed( bool is_fixed ) {
if( bp::override func_setFixed = this->get_override( "setFixed" ) )
func_setFixed( is_fixed );
- else{
+ else
this->AttLimits::setFixed( is_fixed );
- }
}
+
void default_setFixed( bool is_fixed ) {
AttLimits::setFixed( is_fixed );
}
@@ -153,11 +153,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setLimits( double xmin, double xmax ) {
if( bp::override func_setLimits = this->get_override( "setLimits" ) )
func_setLimits( xmin, xmax );
- else{
+ else
this->AttLimits::setLimits( xmin, xmax );
- }
}
+
void default_setLimits( double xmin, double xmax ) {
AttLimits::setLimits( xmin, xmax );
}
@@ -165,11 +165,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setLowerLimit( double value ) {
if( bp::override func_setLowerLimit = this->get_override( "setLowerLimit" ) )
func_setLowerLimit( value );
- else{
+ else
this->AttLimits::setLowerLimit( value );
- }
}
+
void default_setLowerLimit( double value ) {
AttLimits::setLowerLimit( value );
}
@@ -177,11 +177,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setUpperLimit( double value ) {
if( bp::override func_setUpperLimit = this->get_override( "setUpperLimit" ) )
func_setUpperLimit( value );
- else{
+ else
this->AttLimits::setUpperLimit( value );
- }
}
+
void default_setUpperLimit( double value ) {
AttLimits::setUpperLimit( value );
}
diff --git a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
index 85ec4492f73..b2e416fca35 100644
--- a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
@@ -33,11 +33,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual double calculateChiSquared( ) {
if( bp::override func_calculateChiSquared = this->get_override( "calculateChiSquared" ) )
return func_calculateChiSquared( );
- else{
+ else
return this->ChiSquaredModule::calculateChiSquared( );
- }
}
+
double default_calculateChiSquared( ) {
return ChiSquaredModule::calculateChiSquared( );
}
@@ -45,11 +45,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::ChiSquaredModule * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ChiSquaredModule::clone( );
- }
}
+
::ChiSquaredModule * default_clone( ) const {
return ChiSquaredModule::clone( );
}
@@ -57,35 +57,35 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::OutputData< double > * createChi2DifferenceMap( ) const {
if( bp::override func_createChi2DifferenceMap = this->get_override( "createChi2DifferenceMap" ) )
return func_createChi2DifferenceMap( );
- else{
+ else
return this->ChiSquaredModule::createChi2DifferenceMap( );
- }
}
+
::OutputData< double > * default_createChi2DifferenceMap( ) const {
return ChiSquaredModule::createChi2DifferenceMap( );
}
- virtual double getResidualValue( ::size_t index ) const {
+ virtual double getResidualValue( ::std::size_t index ) const {
if( bp::override func_getResidualValue = this->get_override( "getResidualValue" ) )
return func_getResidualValue( index );
- else{
+ else
return this->ChiSquaredModule::getResidualValue( index );
- }
}
- double default_getResidualValue( ::size_t index ) const {
+
+ double default_getResidualValue( ::std::size_t index ) const {
return ChiSquaredModule::getResidualValue( index );
}
virtual ::IFittingDataSelector const * getFittingDataSelector( ) const {
if( bp::override func_getFittingDataSelector = this->get_override( "getFittingDataSelector" ) )
return func_getFittingDataSelector( );
- else{
+ else
return this->IChiSquaredModule::getFittingDataSelector( );
- }
}
+
::IFittingDataSelector const * default_getFittingDataSelector( ) const {
return IChiSquaredModule::getFittingDataSelector( );
}
@@ -93,11 +93,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IIntensityFunction const * getIntensityFunction( ) const {
if( bp::override func_getIntensityFunction = this->get_override( "getIntensityFunction" ) )
return func_getIntensityFunction( );
- else{
+ else
return this->IChiSquaredModule::getIntensityFunction( );
- }
}
+
::IIntensityFunction const * default_getIntensityFunction( ) const {
return IChiSquaredModule::getIntensityFunction( );
}
@@ -105,11 +105,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IOutputDataNormalizer const * getOutputDataNormalizer( ) const {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer const * default_getOutputDataNormalizer( ) const {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -117,11 +117,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IOutputDataNormalizer * getOutputDataNormalizer( ) {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer * default_getOutputDataNormalizer( ) {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -129,11 +129,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
- else{
+ else
this->IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
- }
}
+
void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
@@ -141,11 +141,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
- else{
+ else
this->IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
- }
}
+
void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
@@ -153,11 +153,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
- else{
+ else
this->IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
- }
}
+
void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -208,8 +208,8 @@ void register_ChiSquaredModule_class(){
}
{ //::ChiSquaredModule::getResidualValue
- typedef double ( ::ChiSquaredModule::*getResidualValue_function_type )( ::size_t ) const;
- typedef double ( ChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::size_t ) const;
+ typedef double ( ::ChiSquaredModule::*getResidualValue_function_type )( ::std::size_t ) const;
+ typedef double ( ChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::std::size_t ) const;
ChiSquaredModule_exposer.def(
"getResidualValue"
diff --git a/Fit/PythonAPI/src/FitObject.pypp.cpp b/Fit/PythonAPI/src/FitObject.pypp.cpp
index c07985a9a32..44aaab36a69 100644
--- a/Fit/PythonAPI/src/FitObject.pypp.cpp
+++ b/Fit/PythonAPI/src/FitObject.pypp.cpp
@@ -91,7 +91,7 @@ void register_FitObject_class(){
}
{ //::FitObject::getSizeOfData
- typedef ::size_t ( ::FitObject::*getSizeOfData_function_type )( ) const;
+ typedef ::std::size_t ( ::FitObject::*getSizeOfData_function_type )( ) const;
FitObject_exposer.def(
"getSizeOfData"
diff --git a/Fit/PythonAPI/src/FitParameter.pypp.cpp b/Fit/PythonAPI/src/FitParameter.pypp.cpp
index 719bdf807eb..36fb7bcb151 100644
--- a/Fit/PythonAPI/src/FitParameter.pypp.cpp
+++ b/Fit/PythonAPI/src/FitParameter.pypp.cpp
@@ -40,11 +40,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getError( ) const {
if( bp::override func_getError = this->get_override( "getError" ) )
return func_getError( );
- else{
+ else
return this->FitParameter::getError( );
- }
}
+
double default_getError( ) const {
return FitParameter::getError( );
}
@@ -52,11 +52,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getStep( ) const {
if( bp::override func_getStep = this->get_override( "getStep" ) )
return func_getStep( );
- else{
+ else
return this->FitParameter::getStep( );
- }
}
+
double default_getStep( ) const {
return FitParameter::getStep( );
}
@@ -64,11 +64,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getValue( ) const {
if( bp::override func_getValue = this->get_override( "getValue" ) )
return func_getValue( );
- else{
+ else
return this->FitParameter::getValue( );
- }
}
+
double default_getValue( ) const {
return FitParameter::getValue( );
}
@@ -76,11 +76,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setError( double value ) {
if( bp::override func_setError = this->get_override( "setError" ) )
func_setError( value );
- else{
+ else
this->FitParameter::setError( value );
- }
}
+
void default_setError( double value ) {
FitParameter::setError( value );
}
@@ -88,11 +88,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setStep( double value ) {
if( bp::override func_setStep = this->get_override( "setStep" ) )
func_setStep( value );
- else{
+ else
this->FitParameter::setStep( value );
- }
}
+
void default_setStep( double value ) {
FitParameter::setStep( value );
}
@@ -100,11 +100,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setValue( double value ) {
if( bp::override func_setValue = this->get_override( "setValue" ) )
func_setValue( value );
- else{
+ else
this->FitParameter::setValue( value );
- }
}
+
void default_setValue( double value ) {
FitParameter::setValue( value );
}
@@ -112,11 +112,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getLowerLimit( ) const {
if( bp::override func_getLowerLimit = this->get_override( "getLowerLimit" ) )
return func_getLowerLimit( );
- else{
+ else
return this->AttLimits::getLowerLimit( );
- }
}
+
double default_getLowerLimit( ) const {
return AttLimits::getLowerLimit( );
}
@@ -124,11 +124,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getUpperLimit( ) const {
if( bp::override func_getUpperLimit = this->get_override( "getUpperLimit" ) )
return func_getUpperLimit( );
- else{
+ else
return this->AttLimits::getUpperLimit( );
- }
}
+
double default_getUpperLimit( ) const {
return AttLimits::getUpperLimit( );
}
@@ -136,11 +136,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool hasLowerAndUpperLimits( ) const {
if( bp::override func_hasLowerAndUpperLimits = this->get_override( "hasLowerAndUpperLimits" ) )
return func_hasLowerAndUpperLimits( );
- else{
+ else
return this->AttLimits::hasLowerAndUpperLimits( );
- }
}
+
bool default_hasLowerAndUpperLimits( ) const {
return AttLimits::hasLowerAndUpperLimits( );
}
@@ -148,11 +148,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool hasLowerLimit( ) const {
if( bp::override func_hasLowerLimit = this->get_override( "hasLowerLimit" ) )
return func_hasLowerLimit( );
- else{
+ else
return this->AttLimits::hasLowerLimit( );
- }
}
+
bool default_hasLowerLimit( ) const {
return AttLimits::hasLowerLimit( );
}
@@ -160,11 +160,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool hasUpperLimit( ) const {
if( bp::override func_hasUpperLimit = this->get_override( "hasUpperLimit" ) )
return func_hasUpperLimit( );
- else{
+ else
return this->AttLimits::hasUpperLimit( );
- }
}
+
bool default_hasUpperLimit( ) const {
return AttLimits::hasUpperLimit( );
}
@@ -172,11 +172,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool isFixed( ) const {
if( bp::override func_isFixed = this->get_override( "isFixed" ) )
return func_isFixed( );
- else{
+ else
return this->AttLimits::isFixed( );
- }
}
+
bool default_isFixed( ) const {
return AttLimits::isFixed( );
}
@@ -184,11 +184,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void removeLimits( ) {
if( bp::override func_removeLimits = this->get_override( "removeLimits" ) )
func_removeLimits( );
- else{
+ else
this->AttLimits::removeLimits( );
- }
}
+
void default_removeLimits( ) {
AttLimits::removeLimits( );
}
@@ -196,11 +196,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void removeLowerLimit( ) {
if( bp::override func_removeLowerLimit = this->get_override( "removeLowerLimit" ) )
func_removeLowerLimit( );
- else{
+ else
this->AttLimits::removeLowerLimit( );
- }
}
+
void default_removeLowerLimit( ) {
AttLimits::removeLowerLimit( );
}
@@ -208,11 +208,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void removeUpperLimit( ) {
if( bp::override func_removeUpperLimit = this->get_override( "removeUpperLimit" ) )
func_removeUpperLimit( );
- else{
+ else
this->AttLimits::removeUpperLimit( );
- }
}
+
void default_removeUpperLimit( ) {
AttLimits::removeUpperLimit( );
}
@@ -220,11 +220,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setFixed( bool is_fixed ) {
if( bp::override func_setFixed = this->get_override( "setFixed" ) )
func_setFixed( is_fixed );
- else{
+ else
this->AttLimits::setFixed( is_fixed );
- }
}
+
void default_setFixed( bool is_fixed ) {
AttLimits::setFixed( is_fixed );
}
@@ -232,11 +232,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setLimits( double xmin, double xmax ) {
if( bp::override func_setLimits = this->get_override( "setLimits" ) )
func_setLimits( xmin, xmax );
- else{
+ else
this->AttLimits::setLimits( xmin, xmax );
- }
}
+
void default_setLimits( double xmin, double xmax ) {
AttLimits::setLimits( xmin, xmax );
}
@@ -244,11 +244,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setLowerLimit( double value ) {
if( bp::override func_setLowerLimit = this->get_override( "setLowerLimit" ) )
func_setLowerLimit( value );
- else{
+ else
this->AttLimits::setLowerLimit( value );
- }
}
+
void default_setLowerLimit( double value ) {
AttLimits::setLowerLimit( value );
}
@@ -256,11 +256,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setUpperLimit( double value ) {
if( bp::override func_setUpperLimit = this->get_override( "setUpperLimit" ) )
func_setUpperLimit( value );
- else{
+ else
this->AttLimits::setUpperLimit( value );
- }
}
+
void default_setUpperLimit( double value ) {
AttLimits::setUpperLimit( value );
}
diff --git a/Fit/PythonAPI/src/FitStrategyAdjustMinimizer.pypp.cpp b/Fit/PythonAPI/src/FitStrategyAdjustMinimizer.pypp.cpp
new file mode 100644
index 00000000000..484e94f4552
--- /dev/null
+++ b/Fit/PythonAPI/src/FitStrategyAdjustMinimizer.pypp.cpp
@@ -0,0 +1,65 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "PythonFitList.h"
+#include "FitStrategyAdjustMinimizer.pypp.h"
+
+namespace bp = boost::python;
+
+struct FitStrategyAdjustMinimizer_wrapper : FitStrategyAdjustMinimizer, bp::wrapper< FitStrategyAdjustMinimizer > {
+
+ FitStrategyAdjustMinimizer_wrapper()
+ : FitStrategyAdjustMinimizer()
+ , bp::wrapper< FitStrategyAdjustMinimizer >(){
+ // null constructor
+
+ }
+
+ virtual ::IFitStrategy * clone( ) const {
+ bp::override func_clone = this->get_override( "clone" );
+ return func_clone( );
+ }
+
+ virtual void execute( ){
+ bp::override func_execute = this->get_override( "execute" );
+ func_execute( );
+ }
+
+};
+
+void register_FitStrategyAdjustMinimizer_class(){
+
+ { //::FitStrategyAdjustMinimizer
+ typedef bp::class_< FitStrategyAdjustMinimizer_wrapper, bp::bases< IFitStrategy >, boost::noncopyable > FitStrategyAdjustMinimizer_exposer_t;
+ FitStrategyAdjustMinimizer_exposer_t FitStrategyAdjustMinimizer_exposer = FitStrategyAdjustMinimizer_exposer_t( "FitStrategyAdjustMinimizer" );
+ bp::scope FitStrategyAdjustMinimizer_scope( FitStrategyAdjustMinimizer_exposer );
+ { //::IFitStrategy::clone
+
+ typedef ::IFitStrategy * ( ::IFitStrategy::*clone_function_type )( ) const;
+
+ FitStrategyAdjustMinimizer_exposer.def(
+ "clone"
+ , bp::pure_virtual( clone_function_type(&::IFitStrategy::clone) )
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+ }
+ { //::IFitStrategy::execute
+
+ typedef void ( ::IFitStrategy::*execute_function_type )( ) ;
+
+ FitStrategyAdjustMinimizer_exposer.def(
+ "execute"
+ , bp::pure_virtual( execute_function_type(&::IFitStrategy::execute) ) );
+
+ }
+ }
+
+}
diff --git a/Fit/PythonAPI/src/FitStrategyAdjustParameters.pypp.cpp b/Fit/PythonAPI/src/FitStrategyAdjustParameters.pypp.cpp
new file mode 100644
index 00000000000..fdc55ea2978
--- /dev/null
+++ b/Fit/PythonAPI/src/FitStrategyAdjustParameters.pypp.cpp
@@ -0,0 +1,180 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "PythonFitList.h"
+#include "FitStrategyAdjustParameters.pypp.h"
+
+namespace bp = boost::python;
+
+struct FitStrategyAdjustParameters_wrapper : FitStrategyAdjustParameters, bp::wrapper< FitStrategyAdjustParameters > {
+
+ FitStrategyAdjustParameters_wrapper(::std::string const & name )
+ : FitStrategyAdjustParameters( name )
+ , bp::wrapper< FitStrategyAdjustParameters >(){
+ // constructor
+
+ }
+
+ FitStrategyAdjustParameters_wrapper( )
+ : FitStrategyAdjustParameters( )
+ , bp::wrapper< FitStrategyAdjustParameters >(){
+ // null constructor
+
+ }
+
+ virtual void clear( ) {
+ if( bp::override func_clear = this->get_override( "clear" ) )
+ func_clear( );
+ else
+ this->FitStrategyAdjustParameters::clear( );
+ }
+
+
+ void default_clear( ) {
+ FitStrategyAdjustParameters::clear( );
+ }
+
+ virtual ::FitStrategyAdjustParameters * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else
+ return this->FitStrategyAdjustParameters::clone( );
+ }
+
+
+ ::FitStrategyAdjustParameters * default_clone( ) const {
+ return FitStrategyAdjustParameters::clone( );
+ }
+
+ virtual void execute( ) {
+ if( bp::override func_execute = this->get_override( "execute" ) )
+ func_execute( );
+ else
+ this->FitStrategyAdjustParameters::execute( );
+ }
+
+
+ void default_execute( ) {
+ FitStrategyAdjustParameters::execute( );
+ }
+
+ virtual void setPreserveOriginalValues( bool preserve_values ) {
+ if( bp::override func_setPreserveOriginalValues = this->get_override( "setPreserveOriginalValues" ) )
+ func_setPreserveOriginalValues( preserve_values );
+ else
+ this->FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
+
+
+ void default_setPreserveOriginalValues( bool preserve_values ) {
+ FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
+
+};
+
+void register_FitStrategyAdjustParameters_class(){
+
+ { //::FitStrategyAdjustParameters
+ typedef bp::class_< FitStrategyAdjustParameters_wrapper, bp::bases< IFitStrategy >, boost::noncopyable > FitStrategyAdjustParameters_exposer_t;
+ FitStrategyAdjustParameters_exposer_t FitStrategyAdjustParameters_exposer = FitStrategyAdjustParameters_exposer_t( "FitStrategyAdjustParameters", bp::init< std::string const & >(( bp::arg("name") )) );
+ bp::scope FitStrategyAdjustParameters_scope( FitStrategyAdjustParameters_exposer );
+ FitStrategyAdjustParameters_exposer.def( bp::init< >() );
+ { //::FitStrategyAdjustParameters::clear
+
+ typedef void ( ::FitStrategyAdjustParameters::*clear_function_type )( ) ;
+ typedef void ( FitStrategyAdjustParameters_wrapper::*default_clear_function_type )( ) ;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "clear"
+ , clear_function_type(&::FitStrategyAdjustParameters::clear)
+ , default_clear_function_type(&FitStrategyAdjustParameters_wrapper::default_clear) );
+
+ }
+ { //::FitStrategyAdjustParameters::clone
+
+ typedef ::FitStrategyAdjustParameters * ( ::FitStrategyAdjustParameters::*clone_function_type )( ) const;
+ typedef ::FitStrategyAdjustParameters * ( FitStrategyAdjustParameters_wrapper::*default_clone_function_type )( ) const;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "clone"
+ , clone_function_type(&::FitStrategyAdjustParameters::clone)
+ , default_clone_function_type(&FitStrategyAdjustParameters_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::execute
+
+ typedef void ( ::FitStrategyAdjustParameters::*execute_function_type )( ) ;
+ typedef void ( FitStrategyAdjustParameters_wrapper::*default_execute_function_type )( ) ;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "execute"
+ , execute_function_type(&::FitStrategyAdjustParameters::execute)
+ , default_execute_function_type(&FitStrategyAdjustParameters_wrapper::default_execute) );
+
+ }
+ { //::FitStrategyAdjustParameters::fix
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*fix_function_type )( ::std::string ) ;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "fix"
+ , fix_function_type(&::FitStrategyAdjustParameters::fix)
+ , ( bp::arg("parname") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::fix_all
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*fix_all_function_type )( ) ;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "fix_all"
+ , fix_all_function_type(&::FitStrategyAdjustParameters::fix_all)
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::release
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*release_function_type )( ::std::string ) ;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "release"
+ , release_function_type(&::FitStrategyAdjustParameters::release)
+ , ( bp::arg("parname") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::release_all
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*release_all_function_type )( ) ;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "release_all"
+ , release_all_function_type(&::FitStrategyAdjustParameters::release_all)
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::setPreserveOriginalValues
+
+ typedef void ( ::FitStrategyAdjustParameters::*setPreserveOriginalValues_function_type )( bool ) ;
+ typedef void ( FitStrategyAdjustParameters_wrapper::*default_setPreserveOriginalValues_function_type )( bool ) ;
+
+ FitStrategyAdjustParameters_exposer.def(
+ "setPreserveOriginalValues"
+ , setPreserveOriginalValues_function_type(&::FitStrategyAdjustParameters::setPreserveOriginalValues)
+ , default_setPreserveOriginalValues_function_type(&FitStrategyAdjustParameters_wrapper::default_setPreserveOriginalValues)
+ , ( bp::arg("preserve_values") ) );
+
+ }
+ }
+
+}
diff --git a/Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp b/Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp
new file mode 100644
index 00000000000..8fa11cd7a45
--- /dev/null
+++ b/Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp
@@ -0,0 +1,90 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "PythonFitList.h"
+#include "FitStrategyDefault.pypp.h"
+
+namespace bp = boost::python;
+
+struct FitStrategyDefault_wrapper : FitStrategyDefault, bp::wrapper< FitStrategyDefault > {
+
+ FitStrategyDefault_wrapper(FitStrategyDefault const & arg )
+ : FitStrategyDefault( arg )
+ , bp::wrapper< FitStrategyDefault >(){
+ // copy constructor
+
+ }
+
+ FitStrategyDefault_wrapper( )
+ : FitStrategyDefault( )
+ , bp::wrapper< FitStrategyDefault >(){
+ // null constructor
+
+ }
+
+ virtual ::IFitStrategy * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else
+ return this->FitStrategyDefault::clone( );
+ }
+
+
+ ::IFitStrategy * default_clone( ) const {
+ return FitStrategyDefault::clone( );
+ }
+
+ virtual void execute( ) {
+ if( bp::override func_execute = this->get_override( "execute" ) )
+ func_execute( );
+ else
+ this->FitStrategyDefault::execute( );
+ }
+
+
+ void default_execute( ) {
+ FitStrategyDefault::execute( );
+ }
+
+};
+
+void register_FitStrategyDefault_class(){
+
+ { //::FitStrategyDefault
+ typedef bp::class_< FitStrategyDefault_wrapper, bp::bases< IFitStrategy > > FitStrategyDefault_exposer_t;
+ FitStrategyDefault_exposer_t FitStrategyDefault_exposer = FitStrategyDefault_exposer_t( "FitStrategyDefault", bp::init< >() );
+ bp::scope FitStrategyDefault_scope( FitStrategyDefault_exposer );
+ { //::FitStrategyDefault::clone
+
+ typedef ::IFitStrategy * ( ::FitStrategyDefault::*clone_function_type )( ) const;
+ typedef ::IFitStrategy * ( FitStrategyDefault_wrapper::*default_clone_function_type )( ) const;
+
+ FitStrategyDefault_exposer.def(
+ "clone"
+ , clone_function_type(&::FitStrategyDefault::clone)
+ , default_clone_function_type(&FitStrategyDefault_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+ }
+ { //::FitStrategyDefault::execute
+
+ typedef void ( ::FitStrategyDefault::*execute_function_type )( ) ;
+ typedef void ( FitStrategyDefault_wrapper::*default_execute_function_type )( ) ;
+
+ FitStrategyDefault_exposer.def(
+ "execute"
+ , execute_function_type(&::FitStrategyDefault::execute)
+ , default_execute_function_type(&FitStrategyDefault_wrapper::default_execute) );
+
+ }
+ }
+
+}
diff --git a/Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp b/Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp
new file mode 100644
index 00000000000..54738ca49f0
--- /dev/null
+++ b/Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp
@@ -0,0 +1,203 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "PythonFitList.h"
+#include "FitStrategyFixParameters.pypp.h"
+
+namespace bp = boost::python;
+
+struct FitStrategyFixParameters_wrapper : FitStrategyFixParameters, bp::wrapper< FitStrategyFixParameters > {
+
+ FitStrategyFixParameters_wrapper(FitStrategyFixParameters const & arg )
+ : FitStrategyFixParameters( arg )
+ , bp::wrapper< FitStrategyFixParameters >(){
+ // copy constructor
+
+ }
+
+ FitStrategyFixParameters_wrapper( )
+ : FitStrategyFixParameters( )
+ , bp::wrapper< FitStrategyFixParameters >(){
+ // null constructor
+
+ }
+
+ virtual void clear( ) {
+ if( bp::override func_clear = this->get_override( "clear" ) )
+ func_clear( );
+ else
+ this->FitStrategyFixParameters::clear( );
+ }
+
+
+ void default_clear( ) {
+ FitStrategyFixParameters::clear( );
+ }
+
+ virtual ::FitStrategyFixParameters * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else
+ return this->FitStrategyFixParameters::clone( );
+ }
+
+
+ ::FitStrategyFixParameters * default_clone( ) const {
+ return FitStrategyFixParameters::clone( );
+ }
+
+ virtual void setFixed( ::std::vector< std::string > const & pars ) {
+ if( bp::override func_setFixed = this->get_override( "setFixed" ) )
+ func_setFixed( boost::ref(pars) );
+ else
+ this->FitStrategyFixParameters::setFixed( boost::ref(pars) );
+ }
+
+
+ void default_setFixed( ::std::vector< std::string > const & pars ) {
+ FitStrategyFixParameters::setFixed( boost::ref(pars) );
+ }
+
+ virtual void execute( ) {
+ if( bp::override func_execute = this->get_override( "execute" ) )
+ func_execute( );
+ else
+ this->FitStrategyAdjustParameters::execute( );
+ }
+
+
+ void default_execute( ) {
+ FitStrategyAdjustParameters::execute( );
+ }
+
+ virtual void setPreserveOriginalValues( bool preserve_values ) {
+ if( bp::override func_setPreserveOriginalValues = this->get_override( "setPreserveOriginalValues" ) )
+ func_setPreserveOriginalValues( preserve_values );
+ else
+ this->FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
+
+
+ void default_setPreserveOriginalValues( bool preserve_values ) {
+ FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
+
+};
+
+void register_FitStrategyFixParameters_class(){
+
+ { //::FitStrategyFixParameters
+ typedef bp::class_< FitStrategyFixParameters_wrapper, bp::bases< FitStrategyAdjustParameters > > FitStrategyFixParameters_exposer_t;
+ FitStrategyFixParameters_exposer_t FitStrategyFixParameters_exposer = FitStrategyFixParameters_exposer_t( "FitStrategyFixParameters", bp::init< >() );
+ bp::scope FitStrategyFixParameters_scope( FitStrategyFixParameters_exposer );
+ { //::FitStrategyFixParameters::clear
+
+ typedef void ( ::FitStrategyFixParameters::*clear_function_type )( ) ;
+ typedef void ( FitStrategyFixParameters_wrapper::*default_clear_function_type )( ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "clear"
+ , clear_function_type(&::FitStrategyFixParameters::clear)
+ , default_clear_function_type(&FitStrategyFixParameters_wrapper::default_clear) );
+
+ }
+ { //::FitStrategyFixParameters::clone
+
+ typedef ::FitStrategyFixParameters * ( ::FitStrategyFixParameters::*clone_function_type )( ) const;
+ typedef ::FitStrategyFixParameters * ( FitStrategyFixParameters_wrapper::*default_clone_function_type )( ) const;
+
+ FitStrategyFixParameters_exposer.def(
+ "clone"
+ , clone_function_type(&::FitStrategyFixParameters::clone)
+ , default_clone_function_type(&FitStrategyFixParameters_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+ }
+ { //::FitStrategyFixParameters::setFixed
+
+ typedef void ( ::FitStrategyFixParameters::*setFixed_function_type )( ::std::vector< std::string > const & ) ;
+ typedef void ( FitStrategyFixParameters_wrapper::*default_setFixed_function_type )( ::std::vector< std::string > const & ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "setFixed"
+ , setFixed_function_type(&::FitStrategyFixParameters::setFixed)
+ , default_setFixed_function_type(&FitStrategyFixParameters_wrapper::default_setFixed)
+ , ( bp::arg("pars") ) );
+
+ }
+ { //::FitStrategyAdjustParameters::execute
+
+ typedef void ( ::FitStrategyAdjustParameters::*execute_function_type )( ) ;
+ typedef void ( FitStrategyFixParameters_wrapper::*default_execute_function_type )( ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "execute"
+ , execute_function_type(&::FitStrategyAdjustParameters::execute)
+ , default_execute_function_type(&FitStrategyFixParameters_wrapper::default_execute) );
+
+ }
+ { //::FitStrategyAdjustParameters::fix
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*fix_function_type )( ::std::string ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "fix"
+ , fix_function_type(&::FitStrategyAdjustParameters::fix)
+ , ( bp::arg("parname") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::fix_all
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*fix_all_function_type )( ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "fix_all"
+ , fix_all_function_type(&::FitStrategyAdjustParameters::fix_all)
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::release
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*release_function_type )( ::std::string ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "release"
+ , release_function_type(&::FitStrategyAdjustParameters::release)
+ , ( bp::arg("parname") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::release_all
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*release_all_function_type )( ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "release_all"
+ , release_all_function_type(&::FitStrategyAdjustParameters::release_all)
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::setPreserveOriginalValues
+
+ typedef void ( ::FitStrategyAdjustParameters::*setPreserveOriginalValues_function_type )( bool ) ;
+ typedef void ( FitStrategyFixParameters_wrapper::*default_setPreserveOriginalValues_function_type )( bool ) ;
+
+ FitStrategyFixParameters_exposer.def(
+ "setPreserveOriginalValues"
+ , setPreserveOriginalValues_function_type(&::FitStrategyAdjustParameters::setPreserveOriginalValues)
+ , default_setPreserveOriginalValues_function_type(&FitStrategyFixParameters_wrapper::default_setPreserveOriginalValues)
+ , ( bp::arg("preserve_values") ) );
+
+ }
+ }
+
+}
diff --git a/Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp b/Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp
new file mode 100644
index 00000000000..4a41384a562
--- /dev/null
+++ b/Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp
@@ -0,0 +1,203 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "PythonFitList.h"
+#include "FitStrategyReleaseParameters.pypp.h"
+
+namespace bp = boost::python;
+
+struct FitStrategyReleaseParameters_wrapper : FitStrategyReleaseParameters, bp::wrapper< FitStrategyReleaseParameters > {
+
+ FitStrategyReleaseParameters_wrapper(FitStrategyReleaseParameters const & arg )
+ : FitStrategyReleaseParameters( arg )
+ , bp::wrapper< FitStrategyReleaseParameters >(){
+ // copy constructor
+
+ }
+
+ FitStrategyReleaseParameters_wrapper( )
+ : FitStrategyReleaseParameters( )
+ , bp::wrapper< FitStrategyReleaseParameters >(){
+ // null constructor
+
+ }
+
+ virtual void clear( ) {
+ if( bp::override func_clear = this->get_override( "clear" ) )
+ func_clear( );
+ else
+ this->FitStrategyReleaseParameters::clear( );
+ }
+
+
+ void default_clear( ) {
+ FitStrategyReleaseParameters::clear( );
+ }
+
+ virtual ::FitStrategyReleaseParameters * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else
+ return this->FitStrategyReleaseParameters::clone( );
+ }
+
+
+ ::FitStrategyReleaseParameters * default_clone( ) const {
+ return FitStrategyReleaseParameters::clone( );
+ }
+
+ virtual void setReleased( ::std::vector< std::string > const & pars ) {
+ if( bp::override func_setReleased = this->get_override( "setReleased" ) )
+ func_setReleased( boost::ref(pars) );
+ else
+ this->FitStrategyReleaseParameters::setReleased( boost::ref(pars) );
+ }
+
+
+ void default_setReleased( ::std::vector< std::string > const & pars ) {
+ FitStrategyReleaseParameters::setReleased( boost::ref(pars) );
+ }
+
+ virtual void execute( ) {
+ if( bp::override func_execute = this->get_override( "execute" ) )
+ func_execute( );
+ else
+ this->FitStrategyAdjustParameters::execute( );
+ }
+
+
+ void default_execute( ) {
+ FitStrategyAdjustParameters::execute( );
+ }
+
+ virtual void setPreserveOriginalValues( bool preserve_values ) {
+ if( bp::override func_setPreserveOriginalValues = this->get_override( "setPreserveOriginalValues" ) )
+ func_setPreserveOriginalValues( preserve_values );
+ else
+ this->FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
+
+
+ void default_setPreserveOriginalValues( bool preserve_values ) {
+ FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
+
+};
+
+void register_FitStrategyReleaseParameters_class(){
+
+ { //::FitStrategyReleaseParameters
+ typedef bp::class_< FitStrategyReleaseParameters_wrapper, bp::bases< FitStrategyAdjustParameters > > FitStrategyReleaseParameters_exposer_t;
+ FitStrategyReleaseParameters_exposer_t FitStrategyReleaseParameters_exposer = FitStrategyReleaseParameters_exposer_t( "FitStrategyReleaseParameters", bp::init< >() );
+ bp::scope FitStrategyReleaseParameters_scope( FitStrategyReleaseParameters_exposer );
+ { //::FitStrategyReleaseParameters::clear
+
+ typedef void ( ::FitStrategyReleaseParameters::*clear_function_type )( ) ;
+ typedef void ( FitStrategyReleaseParameters_wrapper::*default_clear_function_type )( ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "clear"
+ , clear_function_type(&::FitStrategyReleaseParameters::clear)
+ , default_clear_function_type(&FitStrategyReleaseParameters_wrapper::default_clear) );
+
+ }
+ { //::FitStrategyReleaseParameters::clone
+
+ typedef ::FitStrategyReleaseParameters * ( ::FitStrategyReleaseParameters::*clone_function_type )( ) const;
+ typedef ::FitStrategyReleaseParameters * ( FitStrategyReleaseParameters_wrapper::*default_clone_function_type )( ) const;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "clone"
+ , clone_function_type(&::FitStrategyReleaseParameters::clone)
+ , default_clone_function_type(&FitStrategyReleaseParameters_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+ }
+ { //::FitStrategyReleaseParameters::setReleased
+
+ typedef void ( ::FitStrategyReleaseParameters::*setReleased_function_type )( ::std::vector< std::string > const & ) ;
+ typedef void ( FitStrategyReleaseParameters_wrapper::*default_setReleased_function_type )( ::std::vector< std::string > const & ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "setReleased"
+ , setReleased_function_type(&::FitStrategyReleaseParameters::setReleased)
+ , default_setReleased_function_type(&FitStrategyReleaseParameters_wrapper::default_setReleased)
+ , ( bp::arg("pars") ) );
+
+ }
+ { //::FitStrategyAdjustParameters::execute
+
+ typedef void ( ::FitStrategyAdjustParameters::*execute_function_type )( ) ;
+ typedef void ( FitStrategyReleaseParameters_wrapper::*default_execute_function_type )( ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "execute"
+ , execute_function_type(&::FitStrategyAdjustParameters::execute)
+ , default_execute_function_type(&FitStrategyReleaseParameters_wrapper::default_execute) );
+
+ }
+ { //::FitStrategyAdjustParameters::fix
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*fix_function_type )( ::std::string ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "fix"
+ , fix_function_type(&::FitStrategyAdjustParameters::fix)
+ , ( bp::arg("parname") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::fix_all
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*fix_all_function_type )( ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "fix_all"
+ , fix_all_function_type(&::FitStrategyAdjustParameters::fix_all)
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::release
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*release_function_type )( ::std::string ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "release"
+ , release_function_type(&::FitStrategyAdjustParameters::release)
+ , ( bp::arg("parname") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::release_all
+
+ typedef ::FitStrategyAdjustParameters & ( ::FitStrategyAdjustParameters::*release_all_function_type )( ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "release_all"
+ , release_all_function_type(&::FitStrategyAdjustParameters::release_all)
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+ { //::FitStrategyAdjustParameters::setPreserveOriginalValues
+
+ typedef void ( ::FitStrategyAdjustParameters::*setPreserveOriginalValues_function_type )( bool ) ;
+ typedef void ( FitStrategyReleaseParameters_wrapper::*default_setPreserveOriginalValues_function_type )( bool ) ;
+
+ FitStrategyReleaseParameters_exposer.def(
+ "setPreserveOriginalValues"
+ , setPreserveOriginalValues_function_type(&::FitStrategyAdjustParameters::setPreserveOriginalValues)
+ , default_setPreserveOriginalValues_function_type(&FitStrategyReleaseParameters_wrapper::default_setPreserveOriginalValues)
+ , ( bp::arg("preserve_values") ) );
+
+ }
+ }
+
+}
diff --git a/Fit/PythonAPI/src/FitSuite.pypp.cpp b/Fit/PythonAPI/src/FitSuite.pypp.cpp
index a110610d2bd..d873c4cc497 100644
--- a/Fit/PythonAPI/src/FitSuite.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuite.pypp.cpp
@@ -26,11 +26,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void link_fit_parameters( ) {
if( bp::override func_link_fit_parameters = this->get_override( "link_fit_parameters" ) )
func_link_fit_parameters( );
- else{
+ else
this->FitSuite::link_fit_parameters( );
- }
}
+
void default_link_fit_parameters( ) {
FitSuite::link_fit_parameters( );
}
@@ -38,11 +38,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void minimize( ) {
if( bp::override func_minimize = this->get_override( "minimize" ) )
func_minimize( );
- else{
+ else
this->FitSuite::minimize( );
- }
}
+
void default_minimize( ) {
FitSuite::minimize( );
}
@@ -50,11 +50,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void runFit( ) {
if( bp::override func_runFit = this->get_override( "runFit" ) )
func_runFit( );
- else{
+ else
this->FitSuite::runFit( );
- }
}
+
void default_runFit( ) {
FitSuite::runFit( );
}
@@ -62,11 +62,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void attachObserver( ::boost::shared_ptr< IObserver > obj ) {
if( bp::override func_attachObserver = this->get_override( "attachObserver" ) )
func_attachObserver( obj );
- else{
+ else
this->IObservable::attachObserver( obj );
- }
}
+
void default_attachObserver( ::boost::shared_ptr< IObserver > obj ) {
IObservable::attachObserver( obj );
}
@@ -74,11 +74,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void notifyObservers( ) {
if( bp::override func_notifyObservers = this->get_override( "notifyObservers" ) )
func_notifyObservers( );
- else{
+ else
this->IObservable::notifyObservers( );
- }
}
+
void default_notifyObservers( ) {
IObservable::notifyObservers( );
}
@@ -193,7 +193,7 @@ void register_FitSuite_class(){
}
{ //::FitSuite::getNCalls
- typedef ::size_t ( ::FitSuite::*getNCalls_function_type )( ) const;
+ typedef ::std::size_t ( ::FitSuite::*getNCalls_function_type )( ) const;
FitSuite_exposer.def(
"getNCalls"
@@ -202,7 +202,7 @@ void register_FitSuite_class(){
}
{ //::FitSuite::getNStrategy
- typedef ::size_t ( ::FitSuite::*getNStrategy_function_type )( ) const;
+ typedef ::std::size_t ( ::FitSuite::*getNStrategy_function_type )( ) const;
FitSuite_exposer.def(
"getNStrategy"
diff --git a/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp b/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp
index 0aea9b4d8f4..50e77c75aaa 100644
--- a/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp
@@ -59,40 +59,40 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::getObject
- typedef ::FitObject const * ( ::FitSuiteObjects::*getObject_function_type )( ::size_t ) const;
+ typedef ::FitObject const * ( ::FitSuiteObjects::*getObject_function_type )( ::std::size_t ) const;
FitSuiteObjects_exposer.def(
"getObject"
, getObject_function_type( &::FitSuiteObjects::getObject )
- , ( bp::arg("i_item")=(::size_t)(0) )
+ , ( bp::arg("i_item")=(long unsigned int)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getObject
- typedef ::FitObject * ( ::FitSuiteObjects::*getObject_function_type )( ::size_t ) ;
+ typedef ::FitObject * ( ::FitSuiteObjects::*getObject_function_type )( ::std::size_t ) ;
FitSuiteObjects_exposer.def(
"getObject"
, getObject_function_type( &::FitSuiteObjects::getObject )
- , ( bp::arg("i_item")=(::size_t)(0) )
+ , ( bp::arg("i_item")=(long unsigned int)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getRealData
- typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getRealData_function_type )( ::size_t ) const;
+ typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getRealData_function_type )( ::std::size_t ) const;
FitSuiteObjects_exposer.def(
"getRealData"
, getRealData_function_type( &::FitSuiteObjects::getRealData )
- , ( bp::arg("i_item")=(::size_t)(0) )
+ , ( bp::arg("i_item")=(long unsigned int)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getResidualValue
- typedef double ( ::FitSuiteObjects::*getResidualValue_function_type )( ::size_t ) ;
+ typedef double ( ::FitSuiteObjects::*getResidualValue_function_type )( ::std::size_t ) ;
FitSuiteObjects_exposer.def(
"getResidualValue"
@@ -102,40 +102,40 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::getSimulation
- typedef ::Simulation const * ( ::FitSuiteObjects::*getSimulation_function_type )( ::size_t ) const;
+ typedef ::Simulation const * ( ::FitSuiteObjects::*getSimulation_function_type )( ::std::size_t ) const;
FitSuiteObjects_exposer.def(
"getSimulation"
, getSimulation_function_type( &::FitSuiteObjects::getSimulation )
- , ( bp::arg("i_item")=(::size_t)(0) )
+ , ( bp::arg("i_item")=(long unsigned int)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getSimulation
- typedef ::Simulation * ( ::FitSuiteObjects::*getSimulation_function_type )( ::size_t ) ;
+ typedef ::Simulation * ( ::FitSuiteObjects::*getSimulation_function_type )( ::std::size_t ) ;
FitSuiteObjects_exposer.def(
"getSimulation"
, getSimulation_function_type( &::FitSuiteObjects::getSimulation )
- , ( bp::arg("i_item")=(::size_t)(0) )
+ , ( bp::arg("i_item")=(long unsigned int)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getSimulationData
- typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getSimulationData_function_type )( ::size_t ) const;
+ typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getSimulationData_function_type )( ::std::size_t ) const;
FitSuiteObjects_exposer.def(
"getSimulationData"
, getSimulationData_function_type( &::FitSuiteObjects::getSimulationData )
- , ( bp::arg("i_item")=(::size_t)(0) )
+ , ( bp::arg("i_item")=(long unsigned int)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getSizeOfDataSet
- typedef ::size_t ( ::FitSuiteObjects::*getSizeOfDataSet_function_type )( ) const;
+ typedef ::std::size_t ( ::FitSuiteObjects::*getSizeOfDataSet_function_type )( ) const;
FitSuiteObjects_exposer.def(
"getSizeOfDataSet"
@@ -163,12 +163,12 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::setRealData
- typedef void ( ::FitSuiteObjects::*setRealData_function_type )( ::OutputData< double > const &,::size_t ) ;
+ typedef void ( ::FitSuiteObjects::*setRealData_function_type )( ::OutputData< double > const &,::std::size_t ) ;
FitSuiteObjects_exposer.def(
"setRealData"
, setRealData_function_type( &::FitSuiteObjects::setRealData )
- , ( bp::arg("real_data"), bp::arg("i_item")=(::size_t)(0) ) );
+ , ( bp::arg("real_data"), bp::arg("i_item")=(long unsigned int)(0) ) );
}
{ //::FitSuiteObjects::setSimulationNormalize
@@ -183,7 +183,7 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::size
- typedef ::size_t ( ::FitSuiteObjects::*size_function_type )( ) const;
+ typedef ::std::size_t ( ::FitSuiteObjects::*size_function_type )( ) const;
FitSuiteObjects_exposer.def(
"size"
diff --git a/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp b/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
index 3ac893aa991..586ccde2d6c 100644
--- a/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
@@ -50,7 +50,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::getNfreeParameters
- typedef ::size_t ( ::FitSuiteParameters::*getNfreeParameters_function_type )( ) const;
+ typedef ::std::size_t ( ::FitSuiteParameters::*getNfreeParameters_function_type )( ) const;
FitSuiteParameters_exposer.def(
"getNfreeParameters"
@@ -90,7 +90,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::operator[]
- typedef ::FitParameter const * ( ::FitSuiteParameters::*__getitem___function_type )( ::size_t ) const;
+ typedef ::FitParameter const * ( ::FitSuiteParameters::*__getitem___function_type )( ::std::size_t ) const;
FitSuiteParameters_exposer.def(
"__getitem__"
@@ -101,7 +101,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::operator[]
- typedef ::FitParameter * ( ::FitSuiteParameters::*__getitem___function_type )( ::size_t ) ;
+ typedef ::FitParameter * ( ::FitSuiteParameters::*__getitem___function_type )( ::std::size_t ) ;
FitSuiteParameters_exposer.def(
"__getitem__"
@@ -163,7 +163,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::size
- typedef ::size_t ( ::FitSuiteParameters::*size_function_type )( ) const;
+ typedef ::std::size_t ( ::FitSuiteParameters::*size_function_type )( ) const;
FitSuiteParameters_exposer.def(
"size"
diff --git a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
index 5952056df86..2d8c14cad8d 100644
--- a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
@@ -41,11 +41,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IFittingDataSelector const * getFittingDataSelector( ) const {
if( bp::override func_getFittingDataSelector = this->get_override( "getFittingDataSelector" ) )
return func_getFittingDataSelector( );
- else{
+ else
return this->IChiSquaredModule::getFittingDataSelector( );
- }
}
+
::IFittingDataSelector const * default_getFittingDataSelector( ) const {
return IChiSquaredModule::getFittingDataSelector( );
}
@@ -53,11 +53,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IIntensityFunction const * getIntensityFunction( ) const {
if( bp::override func_getIntensityFunction = this->get_override( "getIntensityFunction" ) )
return func_getIntensityFunction( );
- else{
+ else
return this->IChiSquaredModule::getIntensityFunction( );
- }
}
+
::IIntensityFunction const * default_getIntensityFunction( ) const {
return IChiSquaredModule::getIntensityFunction( );
}
@@ -65,11 +65,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IOutputDataNormalizer const * getOutputDataNormalizer( ) const {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer const * default_getOutputDataNormalizer( ) const {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -77,35 +77,35 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IOutputDataNormalizer * getOutputDataNormalizer( ) {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer * default_getOutputDataNormalizer( ) {
return IChiSquaredModule::getOutputDataNormalizer( );
}
- virtual double getResidualValue( ::size_t arg0 ) const {
+ virtual double getResidualValue( ::std::size_t arg0 ) const {
if( bp::override func_getResidualValue = this->get_override( "getResidualValue" ) )
return func_getResidualValue( arg0 );
- else{
+ else
return this->IChiSquaredModule::getResidualValue( arg0 );
- }
}
- double default_getResidualValue( ::size_t arg0 ) const {
+
+ double default_getResidualValue( ::std::size_t arg0 ) const {
return IChiSquaredModule::getResidualValue( arg0 );
}
virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
- else{
+ else
this->IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
- }
}
+
void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
@@ -113,11 +113,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
- else{
+ else
this->IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
- }
}
+
void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
@@ -125,11 +125,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
- else{
+ else
this->IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
- }
}
+
void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -231,8 +231,8 @@ void register_IChiSquaredModule_class(){
}
{ //::IChiSquaredModule::getResidualValue
- typedef double ( ::IChiSquaredModule::*getResidualValue_function_type )( ::size_t ) const;
- typedef double ( IChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::size_t ) const;
+ typedef double ( ::IChiSquaredModule::*getResidualValue_function_type )( ::std::size_t ) const;
+ typedef double ( IChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::std::size_t ) const;
IChiSquaredModule_exposer.def(
"getResidualValue"
diff --git a/Fit/PythonAPI/src/IFitStrategy.pypp.cpp b/Fit/PythonAPI/src/IFitStrategy.pypp.cpp
new file mode 100644
index 00000000000..322daa8ff6d
--- /dev/null
+++ b/Fit/PythonAPI/src/IFitStrategy.pypp.cpp
@@ -0,0 +1,73 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "PythonFitList.h"
+#include "IFitStrategy.pypp.h"
+
+namespace bp = boost::python;
+
+struct IFitStrategy_wrapper : IFitStrategy, bp::wrapper< IFitStrategy > {
+
+ IFitStrategy_wrapper( )
+ : IFitStrategy( )
+ , bp::wrapper< IFitStrategy >(){
+ // null constructor
+
+ }
+
+ IFitStrategy_wrapper(::std::string const & name )
+ : IFitStrategy( name )
+ , bp::wrapper< IFitStrategy >(){
+ // constructor
+
+ }
+
+ virtual ::IFitStrategy * clone( ) const {
+ bp::override func_clone = this->get_override( "clone" );
+ return func_clone( );
+ }
+
+ virtual void execute( ){
+ bp::override func_execute = this->get_override( "execute" );
+ func_execute( );
+ }
+
+};
+
+void register_IFitStrategy_class(){
+
+ { //::IFitStrategy
+ typedef bp::class_< IFitStrategy_wrapper, bp::bases< INamed >, boost::noncopyable > IFitStrategy_exposer_t;
+ IFitStrategy_exposer_t IFitStrategy_exposer = IFitStrategy_exposer_t( "IFitStrategy", bp::init< >() );
+ bp::scope IFitStrategy_scope( IFitStrategy_exposer );
+ IFitStrategy_exposer.def( bp::init< std::string const & >(( bp::arg("name") )) );
+ { //::IFitStrategy::clone
+
+ typedef ::IFitStrategy * ( ::IFitStrategy::*clone_function_type )( ) const;
+
+ IFitStrategy_exposer.def(
+ "clone"
+ , bp::pure_virtual( clone_function_type(&::IFitStrategy::clone) )
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+ }
+ { //::IFitStrategy::execute
+
+ typedef void ( ::IFitStrategy::*execute_function_type )( ) ;
+
+ IFitStrategy_exposer.def(
+ "execute"
+ , bp::pure_virtual( execute_function_type(&::IFitStrategy::execute) ) );
+
+ }
+ }
+
+}
diff --git a/Fit/PythonAPI/src/IMinimizer.pypp.cpp b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
index e7d5213970a..692986d6c79 100644
--- a/Fit/PythonAPI/src/IMinimizer.pypp.cpp
+++ b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
@@ -26,35 +26,35 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void clear( ) {
if( bp::override func_clear = this->get_override( "clear" ) )
func_clear( );
- else{
+ else
this->IMinimizer::clear( );
- }
}
+
void default_clear( ) {
IMinimizer::clear( );
}
- virtual double getErrorOfVariable( ::size_t arg0 ) const {
+ virtual double getErrorOfVariable( ::std::size_t arg0 ) const {
if( bp::override func_getErrorOfVariable = this->get_override( "getErrorOfVariable" ) )
return func_getErrorOfVariable( arg0 );
- else{
+ else
return this->IMinimizer::getErrorOfVariable( arg0 );
- }
}
- double default_getErrorOfVariable( ::size_t arg0 ) const {
+
+ double default_getErrorOfVariable( ::std::size_t arg0 ) const {
return IMinimizer::getErrorOfVariable( arg0 );
}
virtual ::std::vector< double > getErrorOfVariables( ) const {
if( bp::override func_getErrorOfVariables = this->get_override( "getErrorOfVariables" ) )
return func_getErrorOfVariables( );
- else{
+ else
return this->IMinimizer::getErrorOfVariables( );
- }
}
+
::std::vector< double > default_getErrorOfVariables( ) const {
return IMinimizer::getErrorOfVariables( );
}
@@ -62,71 +62,71 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual double getMinValue( ) const {
if( bp::override func_getMinValue = this->get_override( "getMinValue" ) )
return func_getMinValue( );
- else{
+ else
return this->IMinimizer::getMinValue( );
- }
}
+
double default_getMinValue( ) const {
return IMinimizer::getMinValue( );
}
- virtual ::size_t getNCalls( ) const {
+ virtual ::std::size_t getNCalls( ) const {
if( bp::override func_getNCalls = this->get_override( "getNCalls" ) )
return func_getNCalls( );
- else{
+ else
return this->IMinimizer::getNCalls( );
- }
}
- ::size_t default_getNCalls( ) const {
+
+ ::std::size_t default_getNCalls( ) const {
return IMinimizer::getNCalls( );
}
- virtual ::size_t getNumberOfVariables( ) const {
+ virtual ::std::size_t getNumberOfVariables( ) const {
if( bp::override func_getNumberOfVariables = this->get_override( "getNumberOfVariables" ) )
return func_getNumberOfVariables( );
- else{
+ else
return this->IMinimizer::getNumberOfVariables( );
- }
}
- ::size_t default_getNumberOfVariables( ) const {
+
+ ::std::size_t default_getNumberOfVariables( ) const {
return IMinimizer::getNumberOfVariables( );
}
virtual ::MinimizerOptions getOptions( ) const {
if( bp::override func_getOptions = this->get_override( "getOptions" ) )
return func_getOptions( );
- else{
+ else
return this->IMinimizer::getOptions( );
- }
}
+
::MinimizerOptions default_getOptions( ) const {
return IMinimizer::getOptions( );
}
- virtual double getValueOfVariableAtMinimum( ::size_t arg0 ) const {
+ virtual double getValueOfVariableAtMinimum( ::std::size_t arg0 ) const {
if( bp::override func_getValueOfVariableAtMinimum = this->get_override( "getValueOfVariableAtMinimum" ) )
return func_getValueOfVariableAtMinimum( arg0 );
- else{
+ else
return this->IMinimizer::getValueOfVariableAtMinimum( arg0 );
- }
}
- double default_getValueOfVariableAtMinimum( ::size_t arg0 ) const {
+
+ double default_getValueOfVariableAtMinimum( ::std::size_t arg0 ) const {
return IMinimizer::getValueOfVariableAtMinimum( arg0 );
}
virtual ::std::vector< double > getValueOfVariablesAtMinimum( ) const {
if( bp::override func_getValueOfVariablesAtMinimum = this->get_override( "getValueOfVariablesAtMinimum" ) )
return func_getValueOfVariablesAtMinimum( );
- else{
+ else
return this->IMinimizer::getValueOfVariablesAtMinimum( );
- }
}
+
::std::vector< double > default_getValueOfVariablesAtMinimum( ) const {
return IMinimizer::getValueOfVariablesAtMinimum( );
}
@@ -139,11 +139,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void printResults( ) const {
if( bp::override func_printResults = this->get_override( "printResults" ) )
func_printResults( );
- else{
+ else
this->IMinimizer::printResults( );
- }
}
+
void default_printResults( ) const {
IMinimizer::printResults( );
}
@@ -151,11 +151,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setOptions( ::MinimizerOptions const & arg0 ) {
if( bp::override func_setOptions = this->get_override( "setOptions" ) )
func_setOptions( boost::ref(arg0) );
- else{
+ else
this->IMinimizer::setOptions( boost::ref(arg0) );
- }
}
+
void default_setOptions( ::MinimizerOptions const & arg0 ) {
IMinimizer::setOptions( boost::ref(arg0) );
}
@@ -163,11 +163,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setOptions( ::std::string const & arg0 ) {
if( bp::override func_setOptions = this->get_override( "setOptions" ) )
func_setOptions( arg0 );
- else{
+ else
this->IMinimizer::setOptions( arg0 );
- }
}
+
void default_setOptions( ::std::string const & arg0 ) {
IMinimizer::setOptions( arg0 );
}
@@ -175,11 +175,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setParameters( ::FitSuiteParameters const & arg0 ) {
if( bp::override func_setParameters = this->get_override( "setParameters" ) )
func_setParameters( boost::ref(arg0) );
- else{
+ else
this->IMinimizer::setParameters( boost::ref(arg0) );
- }
}
+
void default_setParameters( ::FitSuiteParameters const & arg0 ) {
IMinimizer::setParameters( boost::ref(arg0) );
}
@@ -205,8 +205,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getErrorOfVariable
- typedef double ( ::IMinimizer::*getErrorOfVariable_function_type )( ::size_t ) const;
- typedef double ( IMinimizer_wrapper::*default_getErrorOfVariable_function_type )( ::size_t ) const;
+ typedef double ( ::IMinimizer::*getErrorOfVariable_function_type )( ::std::size_t ) const;
+ typedef double ( IMinimizer_wrapper::*default_getErrorOfVariable_function_type )( ::std::size_t ) const;
IMinimizer_exposer.def(
"getErrorOfVariable"
@@ -239,8 +239,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getNCalls
- typedef ::size_t ( ::IMinimizer::*getNCalls_function_type )( ) const;
- typedef ::size_t ( IMinimizer_wrapper::*default_getNCalls_function_type )( ) const;
+ typedef ::std::size_t ( ::IMinimizer::*getNCalls_function_type )( ) const;
+ typedef ::std::size_t ( IMinimizer_wrapper::*default_getNCalls_function_type )( ) const;
IMinimizer_exposer.def(
"getNCalls"
@@ -250,8 +250,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getNumberOfVariables
- typedef ::size_t ( ::IMinimizer::*getNumberOfVariables_function_type )( ) const;
- typedef ::size_t ( IMinimizer_wrapper::*default_getNumberOfVariables_function_type )( ) const;
+ typedef ::std::size_t ( ::IMinimizer::*getNumberOfVariables_function_type )( ) const;
+ typedef ::std::size_t ( IMinimizer_wrapper::*default_getNumberOfVariables_function_type )( ) const;
IMinimizer_exposer.def(
"getNumberOfVariables"
@@ -272,8 +272,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getValueOfVariableAtMinimum
- typedef double ( ::IMinimizer::*getValueOfVariableAtMinimum_function_type )( ::size_t ) const;
- typedef double ( IMinimizer_wrapper::*default_getValueOfVariableAtMinimum_function_type )( ::size_t ) const;
+ typedef double ( ::IMinimizer::*getValueOfVariableAtMinimum_function_type )( ::std::size_t ) const;
+ typedef double ( IMinimizer_wrapper::*default_getValueOfVariableAtMinimum_function_type )( ::std::size_t ) const;
IMinimizer_exposer.def(
"getValueOfVariableAtMinimum"
diff --git a/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
index d3102be1a4b..03961fd42f5 100644
--- a/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
+++ b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
@@ -31,11 +31,11 @@ struct ISquaredFunction_wrapper : ISquaredFunction, bp::wrapper< ISquaredFunctio
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else{
+ else
return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
- }
}
+
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
}
diff --git a/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
index 1f174b834df..e73f1c904aa 100644
--- a/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
+++ b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
@@ -33,11 +33,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual ::OutputDataNormalizer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->OutputDataNormalizer::clone( );
- }
}
+
::OutputDataNormalizer * default_clone( ) const {
return OutputDataNormalizer::clone( );
}
@@ -45,11 +45,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual ::OutputData< double > * createNormalizedData( ::OutputData< double > const & data ) const {
if( bp::override func_createNormalizedData = this->get_override( "createNormalizedData" ) )
return func_createNormalizedData( boost::ref(data) );
- else{
+ else
return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
- }
}
+
::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
}
@@ -57,11 +57,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual void setMaximumIntensity( double max_intensity ) {
if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
func_setMaximumIntensity( max_intensity );
- else{
+ else
this->OutputDataNormalizer::setMaximumIntensity( max_intensity );
- }
}
+
void default_setMaximumIntensity( double max_intensity ) {
OutputDataNormalizer::setMaximumIntensity( max_intensity );
}
diff --git a/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
index 70b59588290..0bce6f350de 100644
--- a/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
+++ b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
@@ -33,11 +33,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual ::OutputDataSimpleNormalizer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->OutputDataSimpleNormalizer::clone( );
- }
}
+
::OutputDataSimpleNormalizer * default_clone( ) const {
return OutputDataSimpleNormalizer::clone( );
}
@@ -45,11 +45,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual void setMaximumIntensity( double max_intensity ) {
if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
func_setMaximumIntensity( max_intensity );
- else{
+ else
this->OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
- }
}
+
void default_setMaximumIntensity( double max_intensity ) {
OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
}
@@ -57,11 +57,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual ::OutputData< double > * createNormalizedData( ::OutputData< double > const & data ) const {
if( bp::override func_createNormalizedData = this->get_override( "createNormalizedData" ) )
return func_createNormalizedData( boost::ref(data) );
- else{
+ else
return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
- }
}
+
::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
}
diff --git a/Fit/PythonAPI/src/PythonModule.cpp b/Fit/PythonAPI/src/PythonModule.cpp
index f74e2e72732..96def5a3fdc 100644
--- a/Fit/PythonAPI/src/PythonModule.cpp
+++ b/Fit/PythonAPI/src/PythonModule.cpp
@@ -6,32 +6,40 @@ GCC_DIAG_OFF(missing-field-initializers);
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "FitStrategyFixParameters.pypp.h"
+#include "OutputDataSimpleNormalizer.pypp.h"
#include "AttFitting.pypp.h"
-#include "AttLimits.pypp.h"
-#include "ChiSquaredModule.pypp.h"
-#include "FitObject.pypp.h"
-#include "FitParameter.pypp.h"
-#include "FitSuite.pypp.h"
#include "FitSuiteObjects.pypp.h"
-#include "FitSuiteParameters.pypp.h"
-#include "IChiSquaredModule.pypp.h"
-#include "IMinimizer.pypp.h"
-#include "INamed.pypp.h"
-#include "IOutputDataNormalizer.pypp.h"
#include "ISquaredFunction.pypp.h"
#include "MinimizerFactory.pypp.h"
-#include "MinimizerOptions.pypp.h"
+#include "SquaredFunctionMeanSquaredError.pypp.h"
#include "OutputDataNormalizer.pypp.h"
-#include "OutputDataSimpleNormalizer.pypp.h"
+#include "vector_string_t.pypp.h"
+#include "MinimizerOptions.pypp.h"
+#include "IFitStrategy.pypp.h"
+#include "IOutputDataNormalizer.pypp.h"
+#include "FitParameter.pypp.h"
+#include "FitObject.pypp.h"
+#include "IMinimizer.pypp.h"
+#include "INamed.pypp.h"
+#include "FitStrategyReleaseParameters.pypp.h"
+#include "FitStrategyAdjustParameters.pypp.h"
#include "SquaredFunctionDefault.pypp.h"
-#include "SquaredFunctionGaussianError.pypp.h"
-#include "SquaredFunctionMeanSquaredError.pypp.h"
+#include "ChiSquaredModule.pypp.h"
+#include "FitStrategyAdjustMinimizer.pypp.h"
+#include "FitStrategyDefault.pypp.h"
+#include "FitSuite.pypp.h"
+#include "AttLimits.pypp.h"
+#include "IChiSquaredModule.pypp.h"
+#include "FitSuiteParameters.pypp.h"
#include "SquaredFunctionSystematicError.pypp.h"
+#include "SquaredFunctionGaussianError.pypp.h"
BOOST_PYTHON_MODULE(libBornAgainFit){
boost::python::docstring_options doc_options(true, true, false);
+ register_vector_string_t_class();
register_AttFitting_class();
register_AttLimits_class();
register_IChiSquaredModule_class();
@@ -39,6 +47,12 @@ BOOST_PYTHON_MODULE(libBornAgainFit){
register_FitObject_class();
register_INamed_class();
register_FitParameter_class();
+ register_IFitStrategy_class();
+ register_FitStrategyAdjustMinimizer_class();
+ register_FitStrategyAdjustParameters_class();
+ register_FitStrategyDefault_class();
+ register_FitStrategyFixParameters_class();
+ register_FitStrategyReleaseParameters_class();
register_FitSuite_class();
register_FitSuiteObjects_class();
register_FitSuiteParameters_class();
diff --git a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
index 24c1031d440..3b0b52c824a 100644
--- a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionDefault::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionDefault::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual double calculateSquaredError( double real_value, double arg1 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, arg1 );
- else{
+ else
return this->SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
- }
}
+
double default_calculateSquaredError( double real_value, double arg1 ) const {
return SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual ::SquaredFunctionDefault * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionDefault::clone( );
- }
}
+
::SquaredFunctionDefault * default_clone( ) const {
return SquaredFunctionDefault::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionGaussianError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionGaussianError.pypp.cpp
index d29129479d7..35ffa1942c4 100644
--- a/Fit/PythonAPI/src/SquaredFunctionGaussianError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionGaussianError.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionGaussianError_wrapper : SquaredFunctionGaussianError, bp::
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionGaussianError::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionGaussianError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionGaussianError_wrapper : SquaredFunctionGaussianError, bp::
virtual double calculateSquaredError( double arg0, double arg1 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( arg0, arg1 );
- else{
+ else
return this->SquaredFunctionGaussianError::calculateSquaredError( arg0, arg1 );
- }
}
+
double default_calculateSquaredError( double arg0, double arg1 ) const {
return SquaredFunctionGaussianError::calculateSquaredError( arg0, arg1 );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionGaussianError_wrapper : SquaredFunctionGaussianError, bp::
virtual ::SquaredFunctionGaussianError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionGaussianError::clone( );
- }
}
+
::SquaredFunctionGaussianError * default_clone( ) const {
return SquaredFunctionGaussianError::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp
index d20774c7205..075705d2b2e 100644
--- a/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionMeanSquaredError_wrapper : SquaredFunctionMeanSquaredError
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionMeanSquaredError::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionMeanSquaredError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionMeanSquaredError_wrapper : SquaredFunctionMeanSquaredError
virtual ::SquaredFunctionMeanSquaredError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionMeanSquaredError::clone( );
- }
}
+
::SquaredFunctionMeanSquaredError * default_clone( ) const {
return SquaredFunctionMeanSquaredError::clone( );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionMeanSquaredError_wrapper : SquaredFunctionMeanSquaredError
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else{
+ else
return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
- }
}
+
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp
index d9442de6f08..f6db460c160 100644
--- a/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionSystematicError_wrapper : SquaredFunctionSystematicError,
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionSystematicError::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionSystematicError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionSystematicError_wrapper : SquaredFunctionSystematicError,
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionSystematicError::calculateSquaredError( real_value, simulated_value );
- }
}
+
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return SquaredFunctionSystematicError::calculateSquaredError( real_value, simulated_value );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionSystematicError_wrapper : SquaredFunctionSystematicError,
virtual ::SquaredFunctionSystematicError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionSystematicError::clone( );
- }
}
+
::SquaredFunctionSystematicError * default_clone( ) const {
return SquaredFunctionSystematicError::clone( );
}
diff --git a/Fit/PythonAPI/src/vector_string_t.pypp.cpp b/Fit/PythonAPI/src/vector_string_t.pypp.cpp
new file mode 100644
index 00000000000..fd0d602a7e9
--- /dev/null
+++ b/Fit/PythonAPI/src/vector_string_t.pypp.cpp
@@ -0,0 +1,27 @@
+// This file has been generated by Py++.
+
+// BornAgain: simulate and fit scattering at grazing incidence
+//! @brief automatically generated boost::python code for PythonCoreAPI
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "PythonFitList.h"
+#include "vector_string_t.pypp.h"
+
+namespace bp = boost::python;
+
+void register_vector_string_t_class(){
+
+ { //::std::vector< std::string >
+ typedef bp::class_< std::vector< std::string > > vector_string_t_exposer_t;
+ vector_string_t_exposer_t vector_string_t_exposer = vector_string_t_exposer_t( "vector_string_t" );
+ bp::scope vector_string_t_scope( vector_string_t_exposer );
+ vector_string_t_exposer.def( bp::vector_indexing_suite< ::std::vector< std::string >, true >() );
+ }
+
+}
diff --git a/dev-tools/python-bindings/MakePyFit.py b/dev-tools/python-bindings/MakePyFit.py
index ab49483985f..c197b3feb37 100644
--- a/dev-tools/python-bindings/MakePyFit.py
+++ b/dev-tools/python-bindings/MakePyFit.py
@@ -45,6 +45,12 @@ include_classes = [
"IMinimizer",
"IOutputDataNormalizer",
"ISquaredFunction",
+ "IFitStrategy",
+ "FitStrategyDefault",
+ "FitStrategyAdjustParameters",
+ "FitStrategyFixParameters",
+ "FitStrategyReleaseParameters",
+ "FitStrategyAdjustMinimizer",
"MinimizerFactory",
"MinimizerOptions",
"OutputDataNormalizer",
--
GitLab