From e735886219d578b7958adf3ab2ec6c89d1520c50 Mon Sep 17 00:00:00 2001
From: Celine Durniak <c.durniak@fz-juelich.de>
Date: Wed, 11 Dec 2013 13:45:34 +0100
Subject: [PATCH] Problem with failure of unit test form factor fixed.
EllipsoidalCylinder and HemiEllipsoid commented out in StandardSamples.cpp
---
App/src/StandardSamples.cpp | 92 +++++++++++------------
Tests/UnitTests/TestCore/FormFactorTest.h | 28 +++----
2 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/App/src/StandardSamples.cpp b/App/src/StandardSamples.cpp
index 7774abd1b08..41a42498de8 100644
--- a/App/src/StandardSamples.cpp
+++ b/App/src/StandardSamples.cpp
@@ -534,29 +534,29 @@ ISample *StandardSamples::MesoCrystal1()
// Functional test: Formfactor of an ellipsoidal cylinder.
-ISample *StandardSamples::FormFactor_EllipsoidalCylinder()
-{
- MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_air(1.0, 0.0);
- complex_t n_substrate(1.0-6e-6, 2e-8);
- complex_t n_particle(1.0-6e-4, 2e-8);
- const IMaterial *p_air_material =
- MaterialManager::getHomogeneousMaterial("Air", n_air);
- const IMaterial *p_substrate_material =
- MaterialManager::getHomogeneousMaterial("Substrate", n_substrate);
- const IMaterial *particle_material =
- MaterialManager::getHomogeneousMaterial("Particle", n_particle);
- Layer air_layer;
- air_layer.setMaterial(p_air_material);
- Layer substrate_layer;
- substrate_layer.setMaterial(p_substrate_material);
- ParticleDecoration particle_decoration
- (new Particle(particle_material,
- new FormFactorEllipsoidalCylinder(5*Units::nanometer,
- 5*Units::nanometer,
- 5*Units::nanometer)));
- particle_decoration.addInterferenceFunction
- (new InterferenceFunctionNone());
+//ISample *StandardSamples::FormFactor_EllipsoidalCylinder()
+//{
+// MultiLayer *p_multi_layer = new MultiLayer();
+// complex_t n_air(1.0, 0.0);
+// complex_t n_substrate(1.0-6e-6, 2e-8);
+// complex_t n_particle(1.0-6e-4, 2e-8);
+// const IMaterial *p_air_material =
+// MaterialManager::getHomogeneousMaterial("Air", n_air);
+// const IMaterial *p_substrate_material =
+// MaterialManager::getHomogeneousMaterial("Substrate", n_substrate);
+// const IMaterial *particle_material =
+// MaterialManager::getHomogeneousMaterial("Particle", n_particle);
+// Layer air_layer;
+// air_layer.setMaterial(p_air_material);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(p_substrate_material);
+// ParticleDecoration particle_decoration
+// (new Particle(particle_material,
+// new FormFactorEllipsoidalCylinder(5*Units::nanometer,
+// 5*Units::nanometer,
+// 5*Units::nanometer)));
+// particle_decoration.addInterferenceFunction
+// (new InterferenceFunctionNone());
// air_layer.setDecoration(particle_decoration);
@@ -599,30 +599,30 @@ ISample *StandardSamples::FormFactor_EllipsoidalCylinder()
////! Functional test: Formfactor of a hemi spheroid.
-ISample *StandardSamples::FormFactor_HemiEllipsoid()
-{
- MultiLayer *p_multi_layer = new MultiLayer();
- complex_t n_air(1.0, 0.0);
- complex_t n_substrate(1.0-6e-7, 2e-8);
- complex_t n_particle(1.0-6e-5, 2e-8);
- const IMaterial *p_air_material =
- MaterialManager::getHomogeneousMaterial("Air", n_air);
- const IMaterial *p_substrate_material =
- MaterialManager::getHomogeneousMaterial("Substrate", n_substrate);
- const IMaterial *particle_material =
- MaterialManager::getHomogeneousMaterial("Particle", n_particle);
+//ISample *StandardSamples::FormFactor_HemiEllipsoid()
+//{
+// MultiLayer *p_multi_layer = new MultiLayer();
+// complex_t n_air(1.0, 0.0);
+// complex_t n_substrate(1.0-6e-7, 2e-8);
+// complex_t n_particle(1.0-6e-5, 2e-8);
+// const IMaterial *p_air_material =
+// MaterialManager::getHomogeneousMaterial("Air", n_air);
+// const IMaterial *p_substrate_material =
+// MaterialManager::getHomogeneousMaterial("Substrate", n_substrate);
+// const IMaterial *particle_material =
+// MaterialManager::getHomogeneousMaterial("Particle", n_particle);
- Layer air_layer;
- air_layer.setMaterial(p_air_material);
- Layer substrate_layer;
- substrate_layer.setMaterial(p_substrate_material);
- ParticleDecoration particle_decoration
- (new Particle(particle_material,
- new FormFactorHemiEllipsoid(5*Units::nanometer,
- 4*Units::nanometer,
- 2*Units::nanometer)));
- particle_decoration.addInterferenceFunction
- (new InterferenceFunctionNone());
+// Layer air_layer;
+// air_layer.setMaterial(p_air_material);
+// Layer substrate_layer;
+// substrate_layer.setMaterial(p_substrate_material);
+// ParticleDecoration particle_decoration
+// (new Particle(particle_material,
+// new FormFactorHemiEllipsoid(5*Units::nanometer,
+// 4*Units::nanometer,
+// 2*Units::nanometer)));
+// particle_decoration.addInterferenceFunction
+// (new InterferenceFunctionNone());
// air_layer.setDecoration(particle_decoration);
diff --git a/Tests/UnitTests/TestCore/FormFactorTest.h b/Tests/UnitTests/TestCore/FormFactorTest.h
index d867719f5f5..6edce40d67f 100644
--- a/Tests/UnitTests/TestCore/FormFactorTest.h
+++ b/Tests/UnitTests/TestCore/FormFactorTest.h
@@ -144,7 +144,7 @@ TEST_F(FormFactorTest, Cone)
EXPECT_EQ("FormFactorCone",cone.getName());
EXPECT_EQ(6., cone.getRadius());
EXPECT_EQ(5., cone.getHeight());
- EXPECT_EQ(0.5, cone.getAlpha());
+ EXPECT_EQ(0.8, cone.getAlpha());
EXPECT_DOUBLE_EQ(volume, cone.getVolume());
EXPECT_EQ((int)3, cone.getNumberOfStochasticParameters());
@@ -152,7 +152,7 @@ TEST_F(FormFactorTest, Cone)
EXPECT_EQ("FormFactorCone",coneclone->getName());
EXPECT_EQ(6., coneclone->getRadius());
EXPECT_EQ(5., coneclone->getHeight());
- EXPECT_EQ(0.5, coneclone->getAlpha());
+ EXPECT_EQ(0.8, coneclone->getAlpha());
EXPECT_DOUBLE_EQ(volume, coneclone->getVolume());
EXPECT_EQ((int)3, coneclone->getNumberOfStochasticParameters());
}
@@ -173,7 +173,7 @@ TEST_F(FormFactorTest, Cone6)
EXPECT_EQ("FormFactorCone6",cone6.getName());
EXPECT_EQ(6., cone6.getRadius());
EXPECT_EQ(5., cone6.getHeight());
- EXPECT_EQ(0.5, cone6.getAlpha());
+ EXPECT_EQ(0.8, cone6.getAlpha());
EXPECT_DOUBLE_EQ(volume, cone6.getVolume());
EXPECT_EQ((int)3, cone6.getNumberOfStochasticParameters());
@@ -181,7 +181,7 @@ TEST_F(FormFactorTest, Cone6)
EXPECT_EQ("FormFactorCone6",cone6clone->getName());
EXPECT_EQ(6., cone6clone->getRadius());
EXPECT_EQ(5., cone6clone->getHeight());
- EXPECT_EQ(0.5, cone6clone->getAlpha());
+ EXPECT_EQ(0.8, cone6clone->getAlpha());
EXPECT_DOUBLE_EQ(volume, cone6clone->getVolume());
EXPECT_EQ((int)3, cone6clone->getNumberOfStochasticParameters());
}
@@ -404,16 +404,16 @@ TEST_F(FormFactorTest, Pyramid)
EXPECT_EQ("FormFactorPyramid", pyramid.getName());
EXPECT_EQ(4., pyramid.getHeight());
- EXPECT_EQ(3., pyramid.getHalfSide());
- EXPECT_EQ(0.5, pyramid.getAlpha());
+ EXPECT_EQ(5., pyramid.getHalfSide());
+ 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());
EXPECT_EQ(4., pyramidclone->getHeight());
- EXPECT_EQ(3., pyramidclone->getHalfSide());
- EXPECT_EQ(0.5, pyramidclone->getAlpha());
+ EXPECT_EQ(5., pyramidclone->getHalfSide());
+ EXPECT_EQ(0.8, pyramidclone->getAlpha());
EXPECT_DOUBLE_EQ(volume, pyramidclone->getVolume());
EXPECT_EQ((int)3, pyramidclone->getNumberOfStochasticParameters());
}
@@ -481,17 +481,17 @@ TEST_F(FormFactorTest, Tetrahedron)
FormFactorTetrahedron tetrahedron(half_side, height, alpha);
EXPECT_EQ("FormFactorTetrahedron", tetrahedron.getName());
- EXPECT_EQ(5., tetrahedron.getHeight());
- EXPECT_EQ(3., tetrahedron.getHalfSide());
- EXPECT_EQ(0.5, tetrahedron.getAlpha());
+ EXPECT_EQ(4., tetrahedron.getHeight());
+ EXPECT_EQ(8., tetrahedron.getHalfSide());
+ 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());
- EXPECT_EQ(5., tetrahedronclone->getHeight());
- EXPECT_EQ(3., tetrahedronclone->getHalfSide());
- EXPECT_EQ(0.5, tetrahedronclone->getAlpha());
+ EXPECT_EQ(4., tetrahedronclone->getHeight());
+ EXPECT_EQ(8., tetrahedronclone->getHalfSide());
+ EXPECT_EQ(0.8, tetrahedronclone->getAlpha());
EXPECT_DOUBLE_EQ(volume, tetrahedronclone->getVolume());
EXPECT_EQ((int)3, tetrahedronclone->getNumberOfStochasticParameters());
}
--
GitLab