diff --git a/Core/FormFactors/inc/FormFactorAnisoPyramid.h b/Core/FormFactors/inc/FormFactorAnisoPyramid.h
index a377a71d711feb39b8765b241e13672571c3ce3d..6925f12e23a1a47817a3de10e4209a8a11e1a160 100644
--- a/Core/FormFactors/inc/FormFactorAnisoPyramid.h
+++ b/Core/FormFactors/inc/FormFactorAnisoPyramid.h
@@ -38,8 +38,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 4; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorBox.h b/Core/FormFactors/inc/FormFactorBox.h
index dccdc38db7030a37b3614fdd1de651095b20a746..ee289713a6b99749e6aa907f2710aed8ffd7212f 100644
--- a/Core/FormFactors/inc/FormFactorBox.h
+++ b/Core/FormFactors/inc/FormFactorBox.h
@@ -29,21 +29,11 @@ public:
//! @param length of Box's base
//! @param width of Box's base
//! @param height of Box
- FormFactorBox( double length, double width, double height)
- : m_length(length), m_width(width), m_height(height) {
-
- setName("FormFactorBox");
- check_initialization();
- init_parameters();
- }
-
- virtual ~FormFactorBox() {}
+ FormFactorBox( double length, double width, double height);
FormFactorBox *clone() const;
- virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
-
- int getNumberOfStochasticParameters() const { return 3; }
+ virtual void accept(ISampleVisitor *visitor) const;
//! Returns length of Box
double getLength() const { return m_length; }
diff --git a/Core/FormFactors/inc/FormFactorCone.h b/Core/FormFactors/inc/FormFactorCone.h
index 52bbbaed5eee00a8a24e9e7d4c15b42b477647f4..b5c957b7aa2e0d66b66741dc1cb54f2875a77292 100644
--- a/Core/FormFactors/inc/FormFactorCone.h
+++ b/Core/FormFactors/inc/FormFactorCone.h
@@ -37,8 +37,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorCone6.h b/Core/FormFactors/inc/FormFactorCone6.h
index e8d1e8f01d58b5e68cc2c78d9725f77bc5870988..3643cfa5deb61bb5d699df92f72cac2e7559332c 100644
--- a/Core/FormFactors/inc/FormFactorCone6.h
+++ b/Core/FormFactors/inc/FormFactorCone6.h
@@ -37,8 +37,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorCuboctahedron.h b/Core/FormFactors/inc/FormFactorCuboctahedron.h
index 151785696397fce9fa47749d5f0a6b4ab5f83d59..9937c7da2b242dc1d49d8248f8a27224ca83b4dd 100644
--- a/Core/FormFactors/inc/FormFactorCuboctahedron.h
+++ b/Core/FormFactors/inc/FormFactorCuboctahedron.h
@@ -39,8 +39,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 4; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorCylinder.h b/Core/FormFactors/inc/FormFactorCylinder.h
index 7dd12eebdafb19d4a4ff723c65a58e17407a1a82..ee42a145bd5f81c21c8a130858b9500ec902e9e2 100644
--- a/Core/FormFactors/inc/FormFactorCylinder.h
+++ b/Core/FormFactors/inc/FormFactorCylinder.h
@@ -34,8 +34,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h b/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h
index 9c69ae6655de6494acbfbced2941c37ac1eab0ac..1ea4ab11e2ac2d474a56c88306dfa8a7d3b19218 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h
@@ -45,11 +45,6 @@ public:
virtual complex_t evaluate(const WavevectorInfo& wavevectors) const;
- virtual int getNumberOfStochasticParameters() const
- {
- return mp_form_factor->getNumberOfStochasticParameters();
- }
-
protected:
virtual bool check_initialization() const;
virtual void init_parameters();
diff --git a/Core/FormFactors/inc/FormFactorDecoratorFactor.h b/Core/FormFactors/inc/FormFactorDecoratorFactor.h
index 35cd5750f8dc3c21605cb43a3b80a7f5496888dd..28ff2f5c169fcfba8012e262e52df6c935646457 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorFactor.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorFactor.h
@@ -38,8 +38,6 @@ public:
//! Evaluate the form factor for scalar calculations
virtual complex_t evaluate(const WavevectorInfo& wavevectors) const;
- virtual int getNumberOfStochasticParameters() const;
-
protected:
complex_t m_factor;
};
@@ -63,9 +61,4 @@ inline complex_t FormFactorDecoratorFactor::evaluate(const WavevectorInfo& wavev
return m_factor * mp_form_factor->evaluate(wavevectors);
}
-inline int FormFactorDecoratorFactor::getNumberOfStochasticParameters() const
-{
- return mp_form_factor->getNumberOfStochasticParameters();
-}
-
#endif /* FORMFACTORDECORATORFACTOR_H_ */
diff --git a/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h b/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h
index ced1bb51c87efa3afe10a67876418d21c70174ff..ec9763a14b853ca97bc44bf6c969b829f1cca15b 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h
@@ -43,11 +43,6 @@ public:
virtual Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const;
#endif
- virtual int getNumberOfStochasticParameters() const
- {
- return mp_form_factor->getNumberOfStochasticParameters();
- }
-
private:
complex_t getPositionsFactor(const cvector_t &q) const;
std::vector<kvector_t> m_positions;
diff --git a/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h b/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h
index ec733feccbb4afa6ebf120ebbe89a01f0fbddc72..f7c699e988078f4e08db7694bc7839faf68503c8 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h
@@ -42,11 +42,6 @@ public:
virtual Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const;
#endif
- virtual int getNumberOfStochasticParameters() const
- {
- return mp_form_factor->getNumberOfStochasticParameters();
- }
-
protected:
kvector_t m_position;
diff --git a/Core/FormFactors/inc/FormFactorDecoratorRotation.h b/Core/FormFactors/inc/FormFactorDecoratorRotation.h
index 6a4d7695d677031b916053b8271f277bbe6e4198..7ecb537cfa9d67ed206002367605a7076b6d177f 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorRotation.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorRotation.h
@@ -47,11 +47,6 @@ public:
virtual complex_t evaluate(const WavevectorInfo& wavevectors) const;
- virtual int getNumberOfStochasticParameters() const
- {
- return mp_form_factor->getNumberOfStochasticParameters();
- }
-
protected:
Geometry::Transform3D m_transform;
};
diff --git a/Core/FormFactors/inc/FormFactorEllipsoidalCylinder.h b/Core/FormFactors/inc/FormFactorEllipsoidalCylinder.h
index ce1bd82776562622327be1bf816dea3b284c9d03..60a12b789b7983d7c81d1b18f2b9712021a78eb1 100644
--- a/Core/FormFactors/inc/FormFactorEllipsoidalCylinder.h
+++ b/Core/FormFactors/inc/FormFactorEllipsoidalCylinder.h
@@ -36,8 +36,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
double getRadiusA() const { return m_radius_a; }
virtual void setRadiusA(double radius_a) { m_radius_a = radius_a; }
diff --git a/Core/FormFactors/inc/FormFactorFullSphere.h b/Core/FormFactors/inc/FormFactorFullSphere.h
index 8f0ccd1c6b10920a3d4cabdd3ebc7afec6cc7e3e..82b0a823fac2ca9fa479196dece8060d81200d7a 100644
--- a/Core/FormFactors/inc/FormFactorFullSphere.h
+++ b/Core/FormFactors/inc/FormFactorFullSphere.h
@@ -60,8 +60,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 1; }
-
//! Returns radius of sphere
virtual double getRadius() const { return m_radius; }
virtual void setRadius(double radius) {m_radius = radius; }
diff --git a/Core/FormFactors/inc/FormFactorFullSpheroid.h b/Core/FormFactors/inc/FormFactorFullSpheroid.h
index 73f03fe02c9c7c17606e7533ee092b0781836dd1..7495c81ccb631c58066c61efd421f04dab58b615 100644
--- a/Core/FormFactors/inc/FormFactorFullSpheroid.h
+++ b/Core/FormFactors/inc/FormFactorFullSpheroid.h
@@ -38,8 +38,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual double getHeight() const { return m_height; }
virtual double getRadius() const { return m_radius; }
diff --git a/Core/FormFactors/inc/FormFactorGauss.h b/Core/FormFactors/inc/FormFactorGauss.h
index 879122b327702d384f90f6817960940b85f80357..a797b22a2b0dd8aa1af9b7745103758202ecf7c7 100644
--- a/Core/FormFactors/inc/FormFactorGauss.h
+++ b/Core/FormFactors/inc/FormFactorGauss.h
@@ -32,8 +32,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual complex_t evaluate_for_q(const cvector_t& q) const;
//! Returns volume
diff --git a/Core/FormFactors/inc/FormFactorHemiEllipsoid.h b/Core/FormFactors/inc/FormFactorHemiEllipsoid.h
index f208966ddd367e16dd07cfab3f0c7904990f75ed..04147fec6dd70515f6e3ed523121d6f6877a2e3e 100644
--- a/Core/FormFactors/inc/FormFactorHemiEllipsoid.h
+++ b/Core/FormFactors/inc/FormFactorHemiEllipsoid.h
@@ -39,8 +39,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
virtual double getHeight() const { return m_height; }
virtual double getRadiusA() const { return m_radius_a; }
diff --git a/Core/FormFactors/inc/FormFactorLorentz.h b/Core/FormFactors/inc/FormFactorLorentz.h
index b2a1400fe98cb5faac4eff15ae8284ada77c67fa..099c06104db3aad44f547c01349f26fa06cd59ef 100644
--- a/Core/FormFactors/inc/FormFactorLorentz.h
+++ b/Core/FormFactors/inc/FormFactorLorentz.h
@@ -32,8 +32,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual complex_t evaluate_for_q(const cvector_t& q) const;
protected:
diff --git a/Core/FormFactors/inc/FormFactorPrism3.h b/Core/FormFactors/inc/FormFactorPrism3.h
index a104c4f9e5db6f435f80164e4c52580b5c679f82..30b7172683f41550fc514391bbd2e740744d346e 100644
--- a/Core/FormFactors/inc/FormFactorPrism3.h
+++ b/Core/FormFactors/inc/FormFactorPrism3.h
@@ -34,8 +34,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorPrism6.h b/Core/FormFactors/inc/FormFactorPrism6.h
index 943f50e8c8ee5e9b28849c26be89c43d9d182f33..77f28f906117ae587ac2c50b81588ba2fe20cacd 100644
--- a/Core/FormFactors/inc/FormFactorPrism6.h
+++ b/Core/FormFactors/inc/FormFactorPrism6.h
@@ -33,8 +33,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorPyramid.h b/Core/FormFactors/inc/FormFactorPyramid.h
index b1604513d1e9fab1a95583f2a62f0006ef3f5c0f..0557d10a5dfdc9a266f8dbc23a18f2ee94c90976 100644
--- a/Core/FormFactors/inc/FormFactorPyramid.h
+++ b/Core/FormFactors/inc/FormFactorPyramid.h
@@ -36,8 +36,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorRipple1.h b/Core/FormFactors/inc/FormFactorRipple1.h
index 055a3008c6a5f4f812c03534ed7d6f51b9d7b892..45f6c46e9c929b60c0a1e99746b67cab2ff980e5 100644
--- a/Core/FormFactors/inc/FormFactorRipple1.h
+++ b/Core/FormFactors/inc/FormFactorRipple1.h
@@ -38,8 +38,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
virtual double getHeight() const { return m_height; }
virtual double getWidth() const { return m_width; }
virtual double getLength() const { return m_length; }
diff --git a/Core/FormFactors/inc/FormFactorRipple2.h b/Core/FormFactors/inc/FormFactorRipple2.h
index 2003ed3e88b61b22ab9375f05a0700ee4658da7b..f0e843b87513b20a2c9453b95bee729738ec482b 100644
--- a/Core/FormFactors/inc/FormFactorRipple2.h
+++ b/Core/FormFactors/inc/FormFactorRipple2.h
@@ -39,8 +39,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 4; }
-
virtual double getHeight() const { return m_height; }
virtual double getWidth() const { return m_width; }
virtual double getLength() const { return m_length; }
diff --git a/Core/FormFactors/inc/FormFactorSphereGaussianRadius.h b/Core/FormFactors/inc/FormFactorSphereGaussianRadius.h
index d4c83a32c51d39f91d71848d3b3ed7d66bb3df59..ca4254479383ffc99df4e8b9dbe508e1b1ebda08 100644
--- a/Core/FormFactors/inc/FormFactorSphereGaussianRadius.h
+++ b/Core/FormFactors/inc/FormFactorSphereGaussianRadius.h
@@ -34,8 +34,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const;
-
virtual double getHeight() const { return p_ff_sphere->getHeight(); }
virtual complex_t evaluate_for_q(const cvector_t& q) const;
diff --git a/Core/FormFactors/inc/FormFactorSphereLogNormalRadius.h b/Core/FormFactors/inc/FormFactorSphereLogNormalRadius.h
index 9f4a18efd84cae52d238b646c51ea416b63b7a4e..2b69856b3fcc1a9bcd072b2e03e3be168ff4ff6e 100644
--- a/Core/FormFactors/inc/FormFactorSphereLogNormalRadius.h
+++ b/Core/FormFactors/inc/FormFactorSphereLogNormalRadius.h
@@ -38,8 +38,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const;
-
virtual double getHeight() const;
virtual complex_t evaluate_for_q(const cvector_t& q) const;
diff --git a/Core/FormFactors/inc/FormFactorSphereUniformRadius.h b/Core/FormFactors/inc/FormFactorSphereUniformRadius.h
index a965f738877a5b00c671a0961b849771554f5059..4059446710e592d3ef5c67b52c4238bfc212bb46 100644
--- a/Core/FormFactors/inc/FormFactorSphereUniformRadius.h
+++ b/Core/FormFactors/inc/FormFactorSphereUniformRadius.h
@@ -35,8 +35,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const;
-
virtual double getHeight() const { return 2.0*m_mean; }
virtual complex_t evaluate_for_q(const cvector_t& q) const;
diff --git a/Core/FormFactors/inc/FormFactorTetrahedron.h b/Core/FormFactors/inc/FormFactorTetrahedron.h
index e7c6b96fa97349d9d5f385f003abb9d5ff2b0ac5..57636e2f2f772ae954d2dc5411068feb4ec01817 100644
--- a/Core/FormFactors/inc/FormFactorTetrahedron.h
+++ b/Core/FormFactors/inc/FormFactorTetrahedron.h
@@ -37,8 +37,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
virtual double getHeight() const { return m_height; }
virtual void setHeight(double height) { m_height = height; }
diff --git a/Core/FormFactors/inc/FormFactorTrivial.h b/Core/FormFactors/inc/FormFactorTrivial.h
index 1b3356d380850cd17b866db1e6fc323da9d19e26..de1f1a233c9537080ac86a76127bd2e53cb0fd14 100644
--- a/Core/FormFactors/inc/FormFactorTrivial.h
+++ b/Core/FormFactors/inc/FormFactorTrivial.h
@@ -34,8 +34,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 0; }
-
virtual complex_t evaluate_for_q(const cvector_t& q) const;
protected:
diff --git a/Core/FormFactors/inc/FormFactorTruncatedCube.h b/Core/FormFactors/inc/FormFactorTruncatedCube.h
index c3a06b944eeb2d9e704a6154669d35360a7496dc..9bf45b7c5e6ab4aea14657ff973c05cd4539386c 100644
--- a/Core/FormFactors/inc/FormFactorTruncatedCube.h
+++ b/Core/FormFactors/inc/FormFactorTruncatedCube.h
@@ -34,8 +34,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual double getLength() const { return m_length; }
virtual void setLength(double length) { m_length = length; }
diff --git a/Core/FormFactors/inc/FormFactorTruncatedSphere.h b/Core/FormFactors/inc/FormFactorTruncatedSphere.h
index 58ab3497d03be3057a58464276faaa4c1bde63fc..7c2985f4a5dd4b984c78ba14bb6d666a09e9f83f 100644
--- a/Core/FormFactors/inc/FormFactorTruncatedSphere.h
+++ b/Core/FormFactors/inc/FormFactorTruncatedSphere.h
@@ -37,8 +37,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 2; }
-
virtual double getRadius() const { return m_radius; }
virtual double getHeight() const { return m_height; }
diff --git a/Core/FormFactors/inc/FormFactorTruncatedSpheroid.h b/Core/FormFactors/inc/FormFactorTruncatedSpheroid.h
index 52949f3ba1a34aefe2fe389f177ad583739ce12a..61e295b3650e68f7e2b0167e1305c3e77b175d27 100644
--- a/Core/FormFactors/inc/FormFactorTruncatedSpheroid.h
+++ b/Core/FormFactors/inc/FormFactorTruncatedSpheroid.h
@@ -39,8 +39,6 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
- virtual int getNumberOfStochasticParameters() const { return 3; }
-
virtual double getHeight() const { return m_height; }
virtual double getHeightFlattening() const { return m_height_flattening; }
diff --git a/Core/FormFactors/inc/FormFactorWeighted.h b/Core/FormFactors/inc/FormFactorWeighted.h
index 77a24bc5606a2bd460dbf081d25dbecd29025c20..115c34984f61c696eb7a0a3e642febcdda5499ff 100644
--- a/Core/FormFactors/inc/FormFactorWeighted.h
+++ b/Core/FormFactors/inc/FormFactorWeighted.h
@@ -44,8 +44,6 @@ public:
virtual Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const;
#endif
- virtual int getNumberOfStochasticParameters() const;
-
protected:
std::vector<IFormFactor *> m_form_factors;
std::vector<double> m_weights;
diff --git a/Core/FormFactors/inc/IFormFactor.h b/Core/FormFactors/inc/IFormFactor.h
index 6b38732cb1b144650bdf32fb1647d18b085ded95..ea91dce91707af8b906c96db8b2a8af55a24430e 100644
--- a/Core/FormFactors/inc/IFormFactor.h
+++ b/Core/FormFactors/inc/IFormFactor.h
@@ -59,9 +59,6 @@ public:
virtual Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const;
#endif
- //! Returns number of variable/stochastic parameters
- virtual int getNumberOfStochasticParameters() const { return 0; }
-
//! Returns the total volume of the particle of this form factor's shape
virtual double getVolume() const;
diff --git a/Core/FormFactors/src/FormFactorBox.cpp b/Core/FormFactors/src/FormFactorBox.cpp
index ca0afe0e06ef1fe41257eaae53877e88046da1b0..5d1d18d5a3b6993bb9302d7f8f2880f057af6789 100644
--- a/Core/FormFactors/src/FormFactorBox.cpp
+++ b/Core/FormFactors/src/FormFactorBox.cpp
@@ -17,6 +17,14 @@
#include "MathFunctions.h"
+FormFactorBox::FormFactorBox(double length, double width, double height)
+ : m_length(length), m_width(width), m_height(height) {
+
+ setName("FormFactorBox");
+ check_initialization();
+ init_parameters();
+}
+
FormFactorBox *FormFactorBox::clone() const
{
FormFactorBox *result = new FormFactorBox(m_length, m_width, m_height);
@@ -24,6 +32,11 @@ FormFactorBox *FormFactorBox::clone() const
return result;
}
+void FormFactorBox::accept(ISampleVisitor *visitor) const
+{
+ visitor->visit(this);
+}
+
complex_t FormFactorBox::evaluate_for_q(const cvector_t& q) const
{
diff --git a/Core/FormFactors/src/FormFactorSphereGaussianRadius.cpp b/Core/FormFactors/src/FormFactorSphereGaussianRadius.cpp
index a70290cd9708f6e65c5d164b098272e5fea6ab62..c607a6606d91ed318e7a9cda843f9546ba32d86b 100644
--- a/Core/FormFactors/src/FormFactorSphereGaussianRadius.cpp
+++ b/Core/FormFactors/src/FormFactorSphereGaussianRadius.cpp
@@ -42,11 +42,6 @@ FormFactorSphereGaussianRadius::~FormFactorSphereGaussianRadius()
delete p_ff_sphere;
}
-int FormFactorSphereGaussianRadius::getNumberOfStochasticParameters() const
-{
- return 2;
-}
-
complex_t FormFactorSphereGaussianRadius::evaluate_for_q(
const cvector_t& q) const
{
diff --git a/Core/FormFactors/src/FormFactorSphereLogNormalRadius.cpp b/Core/FormFactors/src/FormFactorSphereLogNormalRadius.cpp
index 0a8c4a29c50255c94b44e463a5a65b418c292647..999e37ffc54684f8fa0249ef4f4d55d37f2a636a 100644
--- a/Core/FormFactors/src/FormFactorSphereLogNormalRadius.cpp
+++ b/Core/FormFactors/src/FormFactorSphereLogNormalRadius.cpp
@@ -44,11 +44,6 @@ FormFactorSphereLogNormalRadius::~FormFactorSphereLogNormalRadius()
delete mp_distribution;
}
-int FormFactorSphereLogNormalRadius::getNumberOfStochasticParameters() const
-{
- return 2;
-}
-
complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(
const cvector_t& q) const
{
diff --git a/Core/FormFactors/src/FormFactorSphereUniformRadius.cpp b/Core/FormFactors/src/FormFactorSphereUniformRadius.cpp
index d27527f3133949f6098317469d540d0264f8fc0f..53842c2f128476a6947f99faec34d8b60756c4bb 100644
--- a/Core/FormFactors/src/FormFactorSphereUniformRadius.cpp
+++ b/Core/FormFactors/src/FormFactorSphereUniformRadius.cpp
@@ -42,11 +42,6 @@ FormFactorSphereUniformRadius::~FormFactorSphereUniformRadius()
{
}
-int FormFactorSphereUniformRadius::getNumberOfStochasticParameters() const
-{
- return 2;
-}
-
complex_t FormFactorSphereUniformRadius::evaluate_for_q(
const cvector_t& q) const
{
diff --git a/Core/FormFactors/src/FormFactorWeighted.cpp b/Core/FormFactors/src/FormFactorWeighted.cpp
index 40258f2257fd9a49ea0141c13dcb03a867d41d51..685b352bfefd9c351fb7c561cc03b884f3341998 100644
--- a/Core/FormFactors/src/FormFactorWeighted.cpp
+++ b/Core/FormFactors/src/FormFactorWeighted.cpp
@@ -71,12 +71,3 @@ Eigen::Matrix2cd FormFactorWeighted::evaluatePol(const WavevectorInfo& wavevecto
return result;
}
-int FormFactorWeighted::getNumberOfStochasticParameters() const
-{
- int result=0;
- for (size_t index=0; index<m_form_factors.size(); ++index) {
- result += m_form_factors[index]->getNumberOfStochasticParameters();
- }
- return result;
-}
-
diff --git a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
index 09f1a2f6786bd0d35e2e716631f43387e6730b69..dd157066c1fcfeccd5fece66331a9e55866382e0 100644
--- a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
@@ -97,18 +97,6 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
return FormFactorAnisoPyramid::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorAnisoPyramid::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorAnisoPyramid::getNumberOfStochasticParameters( );
- }
-
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
@@ -458,17 +446,6 @@ void register_FormFactorAnisoPyramid_class(){
, getLength_function_type(&::FormFactorAnisoPyramid::getLength)
, default_getLength_function_type(&FormFactorAnisoPyramid_wrapper::default_getLength) );
- }
- { //::FormFactorAnisoPyramid::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorAnisoPyramid::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorAnisoPyramid_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorAnisoPyramid_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorAnisoPyramid::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorAnisoPyramid_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorAnisoPyramid::getWidth
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index 6e0a7378bca8ac748789adafa8ea3c2d478c22d4..81f651fb3c2a25e87c64350cd170811759dd93d6 100644
--- a/Core/PythonAPI/src/FormFactorBox.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
return FormFactorBox::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorBox::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorBox::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -362,17 +350,6 @@ void register_FormFactorBox_class(){
, getLength_function_type( &::FormFactorBox::getLength )
, "Returns length of Box." );
- }
- { //::FormFactorBox::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorBox::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorBox_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorBox_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorBox::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorBox_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorBox::getRadius
diff --git a/Core/PythonAPI/src/FormFactorCone.pypp.cpp b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
index e44a91049ecb7ac81477db2fb359bdef23eacb4c..78f1d80be1ccf1c7ad6f54e0792a993604515a8b 100644
--- a/Core/PythonAPI/src/FormFactorCone.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
@@ -85,18 +85,6 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
return FormFactorCone::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorCone::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorCone::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -411,17 +399,6 @@ void register_FormFactorCone_class(){
, getHeight_function_type(&::FormFactorCone::getHeight)
, default_getHeight_function_type(&FormFactorCone_wrapper::default_getHeight) );
- }
- { //::FormFactorCone::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorCone::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorCone_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorCone_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorCone::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorCone_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorCone::getRadius
diff --git a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
index 379fba3ce8d3b24b17e8be9a6fd63ff6a61232f0..c41b744e7122a1d9d97deee6387b8307ea2cdfd3 100644
--- a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
@@ -85,18 +85,6 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
return FormFactorCone6::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorCone6::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorCone6::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -411,17 +399,6 @@ void register_FormFactorCone6_class(){
, getHeight_function_type(&::FormFactorCone6::getHeight)
, default_getHeight_function_type(&FormFactorCone6_wrapper::default_getHeight) );
- }
- { //::FormFactorCone6::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorCone6::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorCone6_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorCone6_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorCone6::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorCone6_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorCone6::getRadius
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index cb673fe4d351b5b14b7d0cfa400872910472c330..8e0f3a25047245fa2349057dda95a19793a85ae9 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -181,18 +181,6 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
return IFormFactor::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->IFormFactor::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return IFormFactor::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -456,17 +444,6 @@ void register_FormFactorCrystal_class(){
, getHeight_function_type(&::IFormFactor::getHeight)
, default_getHeight_function_type(&FormFactorCrystal_wrapper::default_getHeight) );
- }
- { //::IFormFactor::getNumberOfStochasticParameters
-
- typedef int ( ::IFormFactor::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorCrystal_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorCrystal_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::IFormFactor::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorCrystal_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IFormFactor::getRadius
diff --git a/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
index 681d12c33dec93a68c49a52ddf671013f5160069..1030d3bc5a203d5fbc5ea968393359a525e015f0 100644
--- a/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
@@ -109,18 +109,6 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
return FormFactorCuboctahedron::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorCuboctahedron::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorCuboctahedron::getNumberOfStochasticParameters( );
- }
-
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
@@ -469,17 +457,6 @@ void register_FormFactorCuboctahedron_class(){
, getLength_function_type(&::FormFactorCuboctahedron::getLength)
, default_getLength_function_type(&FormFactorCuboctahedron_wrapper::default_getLength) );
- }
- { //::FormFactorCuboctahedron::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorCuboctahedron::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorCuboctahedron_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorCuboctahedron_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorCuboctahedron::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorCuboctahedron_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorCuboctahedron::setAlpha
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index 2331c88d6c1bf5a4d0bca23ed3317aa67856fb02..9561f283d1ee8da7b7e466297b163772b99afd03 100644
--- a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
return FormFactorCylinder::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorCylinder::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorCylinder::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -376,17 +364,6 @@ void register_FormFactorCylinder_class(){
, getHeight_function_type(&::FormFactorCylinder::getHeight)
, default_getHeight_function_type(&FormFactorCylinder_wrapper::default_getHeight) );
- }
- { //::FormFactorCylinder::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorCylinder::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorCylinder_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorCylinder_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorCylinder::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorCylinder_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorCylinder::getRadius
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index 52d24b8c2224902f09f9f72613fb027dc631a9c7..3ee17b7e058c40b56a70e761b58fb3a846c1943d 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -68,18 +68,6 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
return FormFactorDecoratorDebyeWaller::evaluate( boost::ref(wavevectors) );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
@@ -337,17 +325,6 @@ void register_FormFactorDecoratorDebyeWaller_class(){
, default_evaluate_function_type(&FormFactorDecoratorDebyeWaller_wrapper::default_evaluate)
, ( bp::arg("wavevectors") ) );
- }
- { //::FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorDecoratorDebyeWaller::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorDecoratorDebyeWaller_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorDecoratorDebyeWaller_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorDecoratorDebyeWaller_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
index 4a148eebea6ec30b0f643b2decc177adcdd7ac77..b2e3074ace1a693e8ef516f90d719d08d67394a5 100644
--- a/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
return FormFactorEllipsoidalCylinder::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters( );
- }
-
virtual double getRadiusB( ) const {
if( bp::override func_getRadiusB = this->get_override( "getRadiusB" ) )
return func_getRadiusB( );
@@ -400,17 +388,6 @@ void register_FormFactorEllipsoidalCylinder_class(){
, getHeight_function_type(&::FormFactorEllipsoidalCylinder::getHeight)
, default_getHeight_function_type(&FormFactorEllipsoidalCylinder_wrapper::default_getHeight) );
- }
- { //::FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorEllipsoidalCylinder::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorEllipsoidalCylinder_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorEllipsoidalCylinder_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorEllipsoidalCylinder_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorEllipsoidalCylinder::getRadiusA
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index 55c4c3aed8c8ca7aeeed8268118910d9b2f2b72e..6b7c811729b3796bf07f4a1cc5a97d49cea484a4 100644
--- a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
return FormFactorFullSphere::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorFullSphere::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorFullSphere::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -364,17 +352,6 @@ void register_FormFactorFullSphere_class(){
, getHeight_function_type(&::FormFactorFullSphere::getHeight)
, default_getHeight_function_type(&FormFactorFullSphere_wrapper::default_getHeight) );
- }
- { //::FormFactorFullSphere::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorFullSphere::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorFullSphere_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorFullSphere_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorFullSphere::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorFullSphere_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorFullSphere::getRadius
diff --git a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
index 7025b620febf4cfd81ba9fcbdef77e57d123a26d..d0fba7339d3887f295022a6e20669d00e12a5216 100644
--- a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
return FormFactorFullSpheroid::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorFullSpheroid::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorFullSpheroid::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -352,17 +340,6 @@ void register_FormFactorFullSpheroid_class(){
, getHeight_function_type(&::FormFactorFullSpheroid::getHeight)
, default_getHeight_function_type(&FormFactorFullSpheroid_wrapper::default_getHeight) );
- }
- { //::FormFactorFullSpheroid::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorFullSpheroid::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorFullSpheroid_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorFullSpheroid_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorFullSpheroid::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorFullSpheroid_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorFullSpheroid::getRadius
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index 8e2035c0a467c5b0c0cf3c5d75af44b88af0898e..3f90f726e7ccf369a547cadc6788c33e0f10fed4 100644
--- a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
@@ -80,18 +80,6 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
return FormFactorGauss::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorGauss::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorGauss::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -360,17 +348,6 @@ void register_FormFactorGauss_class(){
, getHeight_function_type(&::FormFactorGauss::getHeight)
, default_getHeight_function_type(&FormFactorGauss_wrapper::default_getHeight) );
- }
- { //::FormFactorGauss::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorGauss::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorGauss_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorGauss_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorGauss::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorGauss_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorGauss::getRadius
diff --git a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
index 68554c81379436969a60d12629d30a50ae40fc68..f784a91e00b1d1e28b580e41a7422c04ed8485bc 100644
--- a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
return FormFactorHemiEllipsoid::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorHemiEllipsoid::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorHemiEllipsoid::getNumberOfStochasticParameters( );
- }
-
virtual double getRadiusA( ) const {
if( bp::override func_getRadiusA = this->get_override( "getRadiusA" ) )
return func_getRadiusA( );
@@ -376,17 +364,6 @@ void register_FormFactorHemiEllipsoid_class(){
, getHeight_function_type(&::FormFactorHemiEllipsoid::getHeight)
, default_getHeight_function_type(&FormFactorHemiEllipsoid_wrapper::default_getHeight) );
- }
- { //::FormFactorHemiEllipsoid::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorHemiEllipsoid::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorHemiEllipsoid_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorHemiEllipsoid_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorHemiEllipsoid::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorHemiEllipsoid_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorHemiEllipsoid::getRadiusA
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index 8d0c0932f3821e8f9b21c12cb832b7bf2c23abf4..a94d1c6e261c16afa4c6bcc183536e433c360b47 100644
--- a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
@@ -68,18 +68,6 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
return FormFactorLorentz::evaluate_for_q( boost::ref(q) );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorLorentz::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorLorentz::getNumberOfStochasticParameters( );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
@@ -349,17 +337,6 @@ void register_FormFactorLorentz_class(){
, default_evaluate_for_q_function_type(&FormFactorLorentz_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) );
- }
- { //::FormFactorLorentz::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorLorentz::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorLorentz_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorLorentz_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorLorentz::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorLorentz_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index efb791c7ebad88fea1ae0b29a013d4750aa95922..d97e107e69e1151a8263714fcbedc3355b831a01 100644
--- a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
@@ -85,18 +85,6 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
return FormFactorPrism3::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorPrism3::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorPrism3::getNumberOfStochasticParameters( );
- }
-
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
@@ -399,17 +387,6 @@ void register_FormFactorPrism3_class(){
, getLength_function_type(&::FormFactorPrism3::getLength)
, default_getLength_function_type(&FormFactorPrism3_wrapper::default_getLength) );
- }
- { //::FormFactorPrism3::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorPrism3::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorPrism3_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorPrism3_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorPrism3::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorPrism3_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorPrism3::setHeight
diff --git a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
index d651ef13cefcd591f3e9ba408468eb6febf9db29..2ce7b38df82fe6557e78d2a59a7e58eaee12baca 100644
--- a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
return FormFactorPrism6::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorPrism6::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorPrism6::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -376,17 +364,6 @@ void register_FormFactorPrism6_class(){
, getHeight_function_type(&::FormFactorPrism6::getHeight)
, default_getHeight_function_type(&FormFactorPrism6_wrapper::default_getHeight) );
- }
- { //::FormFactorPrism6::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorPrism6::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorPrism6_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorPrism6_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorPrism6::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorPrism6_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorPrism6::getRadius
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index 8090127f580833150ce68e2a770859836421e51e..b7fed49240b1cc983798bad3d46e5911bd6ef287 100644
--- a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
@@ -97,18 +97,6 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
return FormFactorPyramid::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorPyramid::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorPyramid::getNumberOfStochasticParameters( );
- }
-
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
@@ -434,17 +422,6 @@ void register_FormFactorPyramid_class(){
, getLength_function_type(&::FormFactorPyramid::getLength)
, default_getLength_function_type(&FormFactorPyramid_wrapper::default_getLength) );
- }
- { //::FormFactorPyramid::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorPyramid::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorPyramid_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorPyramid_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorPyramid::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorPyramid_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorPyramid::setAlpha
diff --git a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
index 5055d8ba56c26b27a2e57a0616be9eda578003ed..59a9a63b866b70ca1d7e7c23f04f00d7387d0c46 100644
--- a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
@@ -85,18 +85,6 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
return FormFactorRipple1::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorRipple1::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorRipple1::getNumberOfStochasticParameters( );
- }
-
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
@@ -387,17 +375,6 @@ void register_FormFactorRipple1_class(){
, getLength_function_type(&::FormFactorRipple1::getLength)
, default_getLength_function_type(&FormFactorRipple1_wrapper::default_getLength) );
- }
- { //::FormFactorRipple1::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorRipple1::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorRipple1_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorRipple1_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorRipple1::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorRipple1_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorRipple1::getWidth
diff --git a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
index 522136d111c41e83f526efb5a1bf0a6a744c6f40..46cd50a66b2bc63bf37fc8243d7b2091b5f3a894 100644
--- a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
@@ -97,18 +97,6 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
return FormFactorRipple2::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorRipple2::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorRipple2::getNumberOfStochasticParameters( );
- }
-
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
@@ -410,17 +398,6 @@ void register_FormFactorRipple2_class(){
, getLength_function_type(&::FormFactorRipple2::getLength)
, default_getLength_function_type(&FormFactorRipple2_wrapper::default_getLength) );
- }
- { //::FormFactorRipple2::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorRipple2::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorRipple2_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorRipple2_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorRipple2::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorRipple2_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorRipple2::getWidth
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index ef437b0766ef320f0e9fb52ea7d05632b63eacf1..4f594687ba8d32087a9104ae9715d822fb763e3d 100644
--- a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
return FormFactorSphereGaussianRadius::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
@@ -352,17 +340,6 @@ void register_FormFactorSphereGaussianRadius_class(){
, getHeight_function_type(&::FormFactorSphereGaussianRadius::getHeight)
, default_getHeight_function_type(&FormFactorSphereGaussianRadius_wrapper::default_getHeight) );
- }
- { //::FormFactorSphereGaussianRadius::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorSphereGaussianRadius::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorSphereGaussianRadius_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorSphereGaussianRadius_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorSphereGaussianRadius::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorSphereGaussianRadius_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp
index 261bff5d83b0547da070f2d06a1e5a6f0282ee9e..b92c4a959b84ec452ef8f7864b93f330d9d1b218 100644
--- a/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorSphereLogNormalRadius_wrapper : FormFactorSphereLogNormalRadius
return FormFactorSphereLogNormalRadius::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorSphereLogNormalRadius::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorSphereLogNormalRadius::getNumberOfStochasticParameters( );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
@@ -352,17 +340,6 @@ void register_FormFactorSphereLogNormalRadius_class(){
, getHeight_function_type(&::FormFactorSphereLogNormalRadius::getHeight)
, default_getHeight_function_type(&FormFactorSphereLogNormalRadius_wrapper::default_getHeight) );
- }
- { //::FormFactorSphereLogNormalRadius::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorSphereLogNormalRadius::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorSphereLogNormalRadius_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorSphereLogNormalRadius_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorSphereLogNormalRadius::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorSphereLogNormalRadius_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
index c883759f31ab3ada811795154aff890a444ad34e..d8f3daf37d073affaeac779bb4096b7b40e177ad 100644
--- a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
@@ -73,18 +73,6 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
return FormFactorSphereUniformRadius::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorSphereUniformRadius::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorSphereUniformRadius::getNumberOfStochasticParameters( );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
@@ -352,17 +340,6 @@ void register_FormFactorSphereUniformRadius_class(){
, getHeight_function_type(&::FormFactorSphereUniformRadius::getHeight)
, default_getHeight_function_type(&FormFactorSphereUniformRadius_wrapper::default_getHeight) );
- }
- { //::FormFactorSphereUniformRadius::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorSphereUniformRadius::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorSphereUniformRadius_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorSphereUniformRadius_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorSphereUniformRadius::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorSphereUniformRadius_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp b/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
index 34cd22ca0d9e21e85e6e23cd5e01577c40a58674..501564b3f147acdb3392b204d38b8206d491a060 100644
--- a/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
@@ -97,18 +97,6 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
return FormFactorTetrahedron::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorTetrahedron::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorTetrahedron::getNumberOfStochasticParameters( );
- }
-
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
@@ -434,17 +422,6 @@ void register_FormFactorTetrahedron_class(){
, getLength_function_type(&::FormFactorTetrahedron::getLength)
, default_getLength_function_type(&FormFactorTetrahedron_wrapper::default_getLength) );
- }
- { //::FormFactorTetrahedron::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorTetrahedron::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorTetrahedron_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorTetrahedron_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorTetrahedron::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorTetrahedron_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorTetrahedron::setAlpha
diff --git a/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp b/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp
index 2022bce5a8f5834cb49e38cd878cc5cadfafc638..3f2cf1a4879346989afe2f39e8fcd15b7e565a75 100644
--- a/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp
@@ -61,18 +61,6 @@ struct FormFactorTrivial_wrapper : FormFactorTrivial, bp::wrapper< FormFactorTri
return FormFactorTrivial::evaluate_for_q( boost::ref(q) );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorTrivial::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorTrivial::getNumberOfStochasticParameters( );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
@@ -341,17 +329,6 @@ void register_FormFactorTrivial_class(){
, default_evaluate_for_q_function_type(&FormFactorTrivial_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) );
- }
- { //::FormFactorTrivial::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorTrivial::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorTrivial_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorTrivial_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorTrivial::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorTrivial_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp b/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp
index e35a56ff9c54812732d8a404c41eeb882e9a2a26..d2e021c5275d246b72140121d7dfb3d46a18e7ac 100644
--- a/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp
@@ -61,18 +61,6 @@ struct FormFactorTruncatedCube_wrapper : FormFactorTruncatedCube, bp::wrapper< F
return FormFactorTruncatedCube::getLength( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorTruncatedCube::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorTruncatedCube::getNumberOfStochasticParameters( );
- }
-
virtual double getRemovedLength( ) const {
if( bp::override func_getRemovedLength = this->get_override( "getRemovedLength" ) )
return func_getRemovedLength( );
@@ -376,17 +364,6 @@ void register_FormFactorTruncatedCube_class(){
, getLength_function_type(&::FormFactorTruncatedCube::getLength)
, default_getLength_function_type(&FormFactorTruncatedCube_wrapper::default_getLength) );
- }
- { //::FormFactorTruncatedCube::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorTruncatedCube::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorTruncatedCube_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorTruncatedCube_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorTruncatedCube::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorTruncatedCube_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorTruncatedCube::getRemovedLength
diff --git a/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp
index 0f5c6a6cdf4719069df44c2a37f9a0b1fbb15a16..c5b9b534d3e47011f7c7a4f76859810d5af2aad1 100644
--- a/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp
@@ -61,18 +61,6 @@ struct FormFactorTruncatedSphere_wrapper : FormFactorTruncatedSphere, bp::wrappe
return FormFactorTruncatedSphere::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorTruncatedSphere::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorTruncatedSphere::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -328,17 +316,6 @@ void register_FormFactorTruncatedSphere_class(){
, getHeight_function_type(&::FormFactorTruncatedSphere::getHeight)
, default_getHeight_function_type(&FormFactorTruncatedSphere_wrapper::default_getHeight) );
- }
- { //::FormFactorTruncatedSphere::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorTruncatedSphere::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorTruncatedSphere_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorTruncatedSphere_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorTruncatedSphere::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorTruncatedSphere_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorTruncatedSphere::getRadius
diff --git a/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp
index 7bd0da2382ab7edecf7b36a7f04447b3a8b64491..9071d45342d8b77ff0319d88cc6dbf3057fc4671 100644
--- a/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp
@@ -97,18 +97,6 @@ struct FormFactorTruncatedSpheroid_wrapper : FormFactorTruncatedSpheroid, bp::wr
return FormFactorTruncatedSpheroid::getHeightFullSpheroid( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorTruncatedSpheroid::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorTruncatedSpheroid::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -398,17 +386,6 @@ void register_FormFactorTruncatedSpheroid_class(){
, getHeightFullSpheroid_function_type(&::FormFactorTruncatedSpheroid::getHeightFullSpheroid)
, default_getHeightFullSpheroid_function_type(&FormFactorTruncatedSpheroid_wrapper::default_getHeightFullSpheroid) );
- }
- { //::FormFactorTruncatedSpheroid::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorTruncatedSpheroid::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorTruncatedSpheroid_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorTruncatedSpheroid_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorTruncatedSpheroid::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorTruncatedSpheroid_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorTruncatedSpheroid::getRadius
diff --git a/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp b/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp
index 6e305a5805de6bee057ee254f63da7eab7f38ea1..33cf0b3091d283623de5f8750f4af861d31fe9ff 100644
--- a/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp
@@ -61,18 +61,6 @@ struct FormFactorWeighted_wrapper : FormFactorWeighted, bp::wrapper< FormFactorW
return FormFactorWeighted::evaluate( boost::ref(wavevectors) );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->FormFactorWeighted::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return FormFactorWeighted::getNumberOfStochasticParameters( );
- }
-
virtual void setAmbientMaterial( ::IMaterial const & material ) {
if( bp::override func_setAmbientMaterial = this->get_override( "setAmbientMaterial" ) )
func_setAmbientMaterial( boost::ref(material) );
@@ -340,17 +328,6 @@ void register_FormFactorWeighted_class(){
, default_evaluate_function_type(&FormFactorWeighted_wrapper::default_evaluate)
, ( bp::arg("wavevectors") ) );
- }
- { //::FormFactorWeighted::getNumberOfStochasticParameters
-
- typedef int ( ::FormFactorWeighted::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( FormFactorWeighted_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- FormFactorWeighted_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::FormFactorWeighted::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&FormFactorWeighted_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::FormFactorWeighted::setAmbientMaterial
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index 3ebbf41bbbfe88004896c3318c0a0b404b1a5df6..fdd8ad787581f0b3a96a6e30a6d2dfb02026bcae 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -59,18 +59,6 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
return IFormFactor::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->IFormFactor::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return IFormFactor::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -323,17 +311,6 @@ void register_IFormFactor_class(){
, getHeight_function_type(&::IFormFactor::getHeight)
, default_getHeight_function_type(&IFormFactor_wrapper::default_getHeight) );
- }
- { //::IFormFactor::getNumberOfStochasticParameters
-
- typedef int ( ::IFormFactor::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( IFormFactor_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- IFormFactor_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::IFormFactor::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&IFormFactor_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IFormFactor::getRadius
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index c95be4cf07a11efa362723945068f18463991234..c8990603dc4d0b9509f970436f2cdef8640fdcef 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -167,18 +167,6 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
return IFormFactor::getHeight( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->IFormFactor::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return IFormFactor::getNumberOfStochasticParameters( );
- }
-
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
@@ -439,17 +427,6 @@ void register_IFormFactorBorn_class(){
, getHeight_function_type(&::IFormFactor::getHeight)
, default_getHeight_function_type(&IFormFactorBorn_wrapper::default_getHeight) );
- }
- { //::IFormFactor::getNumberOfStochasticParameters
-
- typedef int ( ::IFormFactor::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( IFormFactorBorn_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- IFormFactorBorn_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::IFormFactor::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&IFormFactorBorn_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IFormFactor::getRadius
diff --git a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
index 786ebb3f3b466e07ff1ba14f93f5630116884cfc..640f90b2a606b2c6eb414c32f44ab7ae6f339716 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -184,18 +184,6 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
return ISample::getCompositeSample( );
}
- virtual int getNumberOfStochasticParameters( ) const {
- if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
- return func_getNumberOfStochasticParameters( );
- else{
- return this->IFormFactor::getNumberOfStochasticParameters( );
- }
- }
-
- int default_getNumberOfStochasticParameters( ) const {
- return IFormFactor::getNumberOfStochasticParameters( );
- }
-
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
@@ -453,17 +441,6 @@ void register_IFormFactorDecorator_class(){
, default_getCompositeSample_function_type(&IFormFactorDecorator_wrapper::default_getCompositeSample)
, bp::return_value_policy< bp::reference_existing_object >() );
- }
- { //::IFormFactor::getNumberOfStochasticParameters
-
- typedef int ( ::IFormFactor::*getNumberOfStochasticParameters_function_type)( ) const;
- typedef int ( IFormFactorDecorator_wrapper::*default_getNumberOfStochasticParameters_function_type)( ) const;
-
- IFormFactorDecorator_exposer.def(
- "getNumberOfStochasticParameters"
- , getNumberOfStochasticParameters_function_type(&::IFormFactor::getNumberOfStochasticParameters)
- , default_getNumberOfStochasticParameters_function_type(&IFormFactorDecorator_wrapper::default_getNumberOfStochasticParameters) );
-
}
{ //::IParameterized::printParameters
diff --git a/Tests/UnitTests/TestCore/FormFactorTest.h b/Tests/UnitTests/TestCore/FormFactorTest.h
index 7a96422d7dbe3b03caea4ce55ca8386559095477..d8d69b91787c7a42f8c84acb4b6faa6cdfb8b547 100644
--- a/Tests/UnitTests/TestCore/FormFactorTest.h
+++ b/Tests/UnitTests/TestCore/FormFactorTest.h
@@ -48,7 +48,6 @@ TEST_F(FormFactorTest, AnisoPyramid)
EXPECT_EQ(14., anisopyramid.getWidth());
EXPECT_EQ(5., anisopyramid.getHeight());
EXPECT_EQ(0.8, anisopyramid.getAlpha());
- EXPECT_EQ((int)4, anisopyramid.getNumberOfStochasticParameters());
FormFactorAnisoPyramid *anisopyramidclone = anisopyramid.clone();
EXPECT_EQ("FormFactorAnisoPyramid",anisopyramidclone->getName());
@@ -57,7 +56,6 @@ TEST_F(FormFactorTest, AnisoPyramid)
EXPECT_EQ(14., anisopyramidclone->getWidth());
EXPECT_EQ(5., anisopyramidclone->getHeight());
EXPECT_EQ(0.8, anisopyramidclone->getAlpha());
- EXPECT_EQ((int)4, anisopyramidclone->getNumberOfStochasticParameters());
}
//Test form factor of an hemiellipsoid
@@ -76,7 +74,6 @@ TEST_F(FormFactorTest, HemiEllipsoid)
EXPECT_EQ(7., hemiellipsoid.getRadiusB());
EXPECT_EQ(5., hemiellipsoid.getHeight());
EXPECT_DOUBLE_EQ(volume, hemiellipsoid.getVolume());
- EXPECT_EQ((int)3, hemiellipsoid.getNumberOfStochasticParameters());
FormFactorHemiEllipsoid *hemiellipsoidclone = hemiellipsoid.clone();
EXPECT_EQ("FormFactorHemiEllipsoid",hemiellipsoidclone->getName());
@@ -84,7 +81,6 @@ TEST_F(FormFactorTest, HemiEllipsoid)
EXPECT_EQ(7., hemiellipsoidclone->getRadiusB());
EXPECT_EQ(5., hemiellipsoidclone->getHeight());
EXPECT_DOUBLE_EQ(volume, hemiellipsoidclone->getVolume());
- EXPECT_EQ((int)3, hemiellipsoidclone->getNumberOfStochasticParameters());
}
// Test form factor of a box
@@ -102,7 +98,6 @@ TEST_F(FormFactorTest, Box)
EXPECT_EQ(5., box.getHeight());
EXPECT_EQ(3., box.getRadius());
EXPECT_DOUBLE_EQ(volume, box.getVolume());
- EXPECT_EQ(3, box.getNumberOfStochasticParameters());
FormFactorBox *boxclone = box.clone();
EXPECT_EQ("FormFactorBox",boxclone->getName());
@@ -110,7 +105,6 @@ TEST_F(FormFactorTest, Box)
EXPECT_EQ(5., boxclone->getHeight());
EXPECT_EQ(3., boxclone->getRadius());
EXPECT_DOUBLE_EQ(volume, boxclone->getVolume());
- EXPECT_EQ(3, boxclone->getNumberOfStochasticParameters());
}
// Test form factor of a cone
@@ -131,7 +125,6 @@ TEST_F(FormFactorTest, Cone)
EXPECT_EQ(5., cone.getHeight());
EXPECT_EQ(0.8, cone.getAlpha());
EXPECT_DOUBLE_EQ(volume, cone.getVolume());
- EXPECT_EQ((int)3, cone.getNumberOfStochasticParameters());
FormFactorCone *coneclone = cone.clone();
EXPECT_EQ("FormFactorCone",coneclone->getName());
@@ -139,7 +132,6 @@ TEST_F(FormFactorTest, Cone)
EXPECT_EQ(5., coneclone->getHeight());
EXPECT_EQ(0.8, coneclone->getAlpha());
EXPECT_DOUBLE_EQ(volume, coneclone->getVolume());
- EXPECT_EQ((int)3, coneclone->getNumberOfStochasticParameters());
}
// Test form factor of a cone6
@@ -160,7 +152,6 @@ TEST_F(FormFactorTest, Cone6)
EXPECT_EQ(5., cone6.getHeight());
EXPECT_EQ(0.8, cone6.getAlpha());
EXPECT_DOUBLE_EQ(volume, cone6.getVolume());
- EXPECT_EQ((int)3, cone6.getNumberOfStochasticParameters());
FormFactorCone6 *cone6clone = cone6.clone();
EXPECT_EQ("FormFactorCone6",cone6clone->getName());
@@ -168,7 +159,6 @@ TEST_F(FormFactorTest, Cone6)
EXPECT_EQ(5., cone6clone->getHeight());
EXPECT_EQ(0.8, cone6clone->getAlpha());
EXPECT_DOUBLE_EQ(volume, cone6clone->getVolume());
- EXPECT_EQ((int)3, cone6clone->getNumberOfStochasticParameters());
}
// Test form factor of a cuboctahedron
@@ -195,7 +185,6 @@ TEST_F(FormFactorTest, Cuboctahedron)
EXPECT_EQ(1., cuboctahedron.getHeightRatio());
EXPECT_EQ(0.8, cuboctahedron.getAlpha());
EXPECT_DOUBLE_EQ(volume, cuboctahedron.getVolume());
- EXPECT_EQ((int)4, cuboctahedron.getNumberOfStochasticParameters());
FormFactorCuboctahedron *cuboctahedronclone = cuboctahedron.clone();
EXPECT_EQ("FormFactorCuboctahedron",cuboctahedronclone->getName());
@@ -204,8 +193,6 @@ TEST_F(FormFactorTest, Cuboctahedron)
EXPECT_EQ(1., cuboctahedronclone->getHeightRatio());
EXPECT_EQ(0.8, cuboctahedronclone->getAlpha());
EXPECT_DOUBLE_EQ(volume, cuboctahedron.getVolume());
- EXPECT_EQ((int)4, cuboctahedronclone->getNumberOfStochasticParameters());
-
}
// Test form factor of a cylinder
@@ -220,14 +207,12 @@ TEST_F(FormFactorTest, Cylinder)
EXPECT_EQ(5., cylinder.getHeight());
EXPECT_EQ(3., cylinder.getRadius());
EXPECT_DOUBLE_EQ(volume, cylinder.getVolume());
- EXPECT_EQ((int)2, cylinder.getNumberOfStochasticParameters());
FormFactorCylinder *cylinderclone = cylinder.clone();
EXPECT_EQ("FormFactorCylinder",cylinderclone->getName());
EXPECT_EQ(5., cylinderclone->getHeight());
EXPECT_EQ(3., cylinderclone-> getRadius());
EXPECT_DOUBLE_EQ(volume, cylinderclone-> getVolume());
- EXPECT_EQ((int)2, cylinderclone-> getNumberOfStochasticParameters());
}
// Test form factor of an ellipsoidal cylinder
@@ -245,7 +230,6 @@ TEST_F(FormFactorTest, EllipsoidalCylinder)
EXPECT_EQ(3., ellipscyl.getRadiusA());
EXPECT_EQ(5., ellipscyl.getRadiusB());
EXPECT_DOUBLE_EQ(volume, ellipscyl.getVolume());
- EXPECT_EQ((int)3, ellipscyl.getNumberOfStochasticParameters());
FormFactorEllipsoidalCylinder *ellipscylclone = ellipscyl.clone();
EXPECT_EQ("FormFactorEllipsoidalCylinder",ellipscylclone->getName());
@@ -253,7 +237,6 @@ TEST_F(FormFactorTest, EllipsoidalCylinder)
EXPECT_EQ(3., ellipscylclone->getRadiusA());
EXPECT_EQ(5., ellipscylclone->getRadiusB());
EXPECT_DOUBLE_EQ(volume, ellipscylclone->getVolume());
- EXPECT_EQ((int)3, ellipscylclone->getNumberOfStochasticParameters());
}
@@ -269,14 +252,12 @@ TEST_F(FormFactorTest, FullSphere)
EXPECT_EQ(5., fullsphere.getRadius());
EXPECT_EQ(2.*5., fullsphere.getHeight());
EXPECT_DOUBLE_EQ(volume, fullsphere.getVolume());
- EXPECT_EQ((int)1, fullsphere.getNumberOfStochasticParameters());
FormFactorFullSphere *fullsphereclone = fullsphere.clone();
EXPECT_EQ("FormFactorFullSphere",fullsphereclone->getName());
EXPECT_EQ(5., fullsphereclone->getRadius());
EXPECT_EQ(2.*5., fullsphereclone->getHeight());
EXPECT_DOUBLE_EQ(volume, fullsphereclone->getVolume());
- EXPECT_EQ((int)1, fullsphereclone->getNumberOfStochasticParameters());
}
// Test form factor of a full spheroid
@@ -292,14 +273,12 @@ TEST_F(FormFactorTest, FullSpheroid)
EXPECT_EQ(3., fullspheroid.getRadius());
EXPECT_EQ(5., fullspheroid.getHeight());
EXPECT_DOUBLE_EQ(volume, fullspheroid.getVolume());
- EXPECT_EQ((int)2, fullspheroid.getNumberOfStochasticParameters());
FormFactorFullSpheroid *fullspheroidclone = fullspheroid.clone();
EXPECT_EQ("FormFactorFullSpheroid",fullspheroidclone->getName());
EXPECT_EQ(3., fullspheroidclone->getRadius());
EXPECT_EQ(5, fullspheroidclone->getHeight());
EXPECT_DOUBLE_EQ(volume, fullspheroidclone->getVolume());
- EXPECT_EQ((int)2, fullspheroidclone->getNumberOfStochasticParameters());
}
// Test form factor of a prism3
@@ -315,7 +294,6 @@ TEST_F(FormFactorTest, Prism3)
EXPECT_EQ(4., prism3.getHeight());
EXPECT_EQ(6., prism3.getLength());
EXPECT_DOUBLE_EQ(volume, prism3.getVolume());
- EXPECT_EQ((int)2, prism3.getNumberOfStochasticParameters());
FormFactorPrism3 *prism3clone = prism3.clone();
@@ -323,7 +301,6 @@ TEST_F(FormFactorTest, Prism3)
EXPECT_EQ(4., prism3clone->getHeight());
EXPECT_EQ(6., prism3clone->getLength());
EXPECT_DOUBLE_EQ(volume, prism3clone->getVolume());
- EXPECT_EQ((int)2, prism3clone->getNumberOfStochasticParameters());
}
// Test form factor of a prism6
@@ -339,7 +316,6 @@ TEST_F(FormFactorTest, Prism6)
EXPECT_EQ(4., prism6.getHeight());
EXPECT_EQ(3., prism6.getRadius());
EXPECT_DOUBLE_EQ(volume, prism6.getVolume());
- EXPECT_EQ((int)2, prism6.getNumberOfStochasticParameters());
FormFactorPrism6 *prism6clone = prism6.clone();
@@ -347,7 +323,6 @@ TEST_F(FormFactorTest, Prism6)
EXPECT_EQ(4., prism6clone->getHeight());
EXPECT_EQ(3., prism6clone->getRadius());
EXPECT_DOUBLE_EQ(volume, prism6clone->getVolume());
- EXPECT_EQ((int)2, prism6clone->getNumberOfStochasticParameters());
}
// Test form factor of a pyramid
@@ -368,7 +343,6 @@ TEST_F(FormFactorTest, Pyramid)
EXPECT_EQ(10., pyramid.getLength());
EXPECT_EQ(0.8, pyramid.getAlpha());
EXPECT_DOUBLE_EQ(volume, pyramid.getVolume());
- EXPECT_EQ((int)3, pyramid.getNumberOfStochasticParameters());
FormFactorPyramid *pyramidclone = pyramid.clone();
EXPECT_EQ("FormFactorPyramid", pyramidclone->getName());
@@ -376,7 +350,6 @@ TEST_F(FormFactorTest, Pyramid)
EXPECT_EQ(10., pyramidclone->getLength());
EXPECT_EQ(0.8, pyramidclone->getAlpha());
EXPECT_DOUBLE_EQ(volume, pyramidclone->getVolume());
- EXPECT_EQ((int)3, pyramidclone->getNumberOfStochasticParameters());
}
// Test form factor of a truncated sphere
@@ -393,12 +366,10 @@ TEST_F(FormFactorTest, TruncatedSphere)
EXPECT_EQ("FormFactorTruncatedSphere", trsphere.getName());
EXPECT_EQ(3., trsphere.getHeight());
EXPECT_DOUBLE_EQ(volume, trsphere.getVolume());
- EXPECT_EQ((int)2, trsphere.getNumberOfStochasticParameters());
FormFactorTruncatedSphere *trsphereclone = trsphere.clone();
EXPECT_EQ("FormFactorTruncatedSphere", trsphereclone->getName());
EXPECT_DOUBLE_EQ(3., trsphereclone->getHeight());
- EXPECT_EQ((int)2, trsphereclone->getNumberOfStochasticParameters());
}
// Test form factor of a truncated spheroid
@@ -418,7 +389,6 @@ TEST_F(FormFactorTest, TruncatedSpheroid)
EXPECT_EQ(3., trspheroid.getRadius());
EXPECT_DOUBLE_EQ(total_height, trspheroid.getHeightFullSpheroid());
EXPECT_DOUBLE_EQ(volume, trspheroid.getVolume());
- EXPECT_EQ((int)3, trspheroid.getNumberOfStochasticParameters());
FormFactorTruncatedSpheroid *trspheroidclone = trspheroid.clone();
EXPECT_EQ("FormFactorTruncatedSpheroid", trspheroidclone->getName());
@@ -426,7 +396,6 @@ TEST_F(FormFactorTest, TruncatedSpheroid)
EXPECT_EQ(3., trspheroidclone->getRadius());
EXPECT_DOUBLE_EQ(total_height, trspheroidclone->getHeightFullSpheroid());
EXPECT_DOUBLE_EQ(volume, trspheroidclone->getVolume());
- EXPECT_EQ((int)3, trspheroidclone->getNumberOfStochasticParameters());
}
// Test form factor of a tetrahedron
@@ -447,7 +416,6 @@ TEST_F(FormFactorTest, Tetrahedron)
EXPECT_EQ(16., tetrahedron.getLength());
EXPECT_EQ(0.8, tetrahedron.getAlpha());
EXPECT_DOUBLE_EQ(volume, tetrahedron.getVolume());
- EXPECT_EQ((int)3, tetrahedron.getNumberOfStochasticParameters());
FormFactorTetrahedron *tetrahedronclone = tetrahedron.clone();
EXPECT_EQ("FormFactorTetrahedron", tetrahedronclone->getName());
@@ -455,7 +423,6 @@ TEST_F(FormFactorTest, Tetrahedron)
EXPECT_EQ(16., tetrahedronclone->getLength());
EXPECT_EQ(0.8, tetrahedronclone->getAlpha());
EXPECT_DOUBLE_EQ(volume, tetrahedronclone->getVolume());
- EXPECT_EQ((int)3, tetrahedronclone->getNumberOfStochasticParameters());
}
// Test form factor of a ripple2 (triangular)
@@ -472,12 +439,10 @@ TEST_F(FormFactorTest, Ripple2)
EXPECT_EQ("FormFactorRipple2", ripple2.getName());
EXPECT_EQ(4., ripple2.getHeight());
EXPECT_DOUBLE_EQ(volume, ripple2.getVolume());
- EXPECT_EQ((int)4, ripple2.getNumberOfStochasticParameters());
FormFactorRipple2 *ripple2clone = ripple2.clone();
EXPECT_EQ("FormFactorRipple2", ripple2clone->getName());
EXPECT_DOUBLE_EQ(4., ripple2clone->getHeight());
- EXPECT_EQ((int)4, ripple2clone->getNumberOfStochasticParameters());
}
// Test form factor of a ripple1 (cosine)
@@ -495,12 +460,10 @@ TEST_F(FormFactorTest, Ripple1)
EXPECT_EQ(20., ripple1.getWidth());
EXPECT_EQ(100., ripple1.getLength());
EXPECT_DOUBLE_EQ(volume, ripple1.getVolume());
- EXPECT_EQ((int)3, ripple1.getNumberOfStochasticParameters());
FormFactorRipple1 *ripple1clone = ripple1.clone();
EXPECT_EQ("FormFactorRipple1", ripple1clone->getName());
EXPECT_DOUBLE_EQ(4., ripple1clone->getHeight());
- EXPECT_EQ((int)3, ripple1clone->getNumberOfStochasticParameters());
EXPECT_EQ(20., ripple1clone->getWidth());
EXPECT_EQ(100., ripple1clone->getLength());
EXPECT_DOUBLE_EQ(volume, ripple1clone->getVolume());
@@ -520,14 +483,12 @@ TEST_F(FormFactorTest, TruncatedCube)
EXPECT_DOUBLE_EQ(t, trcube.getRemovedLength());
// length or length -2t
EXPECT_DOUBLE_EQ(trcube.getVolume(), volume);
- EXPECT_EQ(2, trcube.getNumberOfStochasticParameters());
FormFactorTruncatedCube *trcubeclone = trcube.clone();
EXPECT_EQ("FormFactorTruncatedCube", trcubeclone->getName());
EXPECT_EQ(length, trcubeclone->getLength());
EXPECT_EQ(t, trcubeclone->getRemovedLength());
EXPECT_EQ(trcubeclone->getVolume(), volume);
- EXPECT_EQ(2, trcubeclone->getNumberOfStochasticParameters());
}