Moved getRefractiveIndex to IMaterial (no more dynamic_cast needed)

Core/FormFactors/inc/FormFactorBox.h

@@ -19,7 +19,7 @@
 #include "IFormFactorBorn.h"
 #include "IStochasticParameter.h"
 
-//! ?
+//! The form factor for a rectangular box
 
 class FormFactorBox : public IFormFactorBorn
 {

Core/FormFactors/inc/FormFactorDecoratorRefractiveIndex.h

@@ -68,11 +68,9 @@ inline FormFactorDecoratorRefractiveIndex* FormFactorDecoratorRefractiveIndex::c
 inline void FormFactorDecoratorRefractiveIndex::setAmbientMaterial(
         const IMaterial *p_material)
 {
-    const HomogeneousMaterial *p_hom_mat =
-            dynamic_cast<const HomogeneousMaterial *>(p_material);
     complex_t ambient_refractive_index(1.0, 0.0);
-    if (p_hom_mat) {
-        ambient_refractive_index = p_hom_mat->getRefractiveIndex();
+    if (p_material) {
+        ambient_refractive_index = p_material->getRefractiveIndex();
     }
     m_factor = getRefractiveIndexFactor(ambient_refractive_index, m_refractive_index);
 }

Core/Samples/inc/HomogeneousMaterial.h

@@ -41,7 +41,7 @@ public:
     virtual ~HomogeneousMaterial() {}
 
     //! Return refractive index.
-    complex_t getRefractiveIndex() const { return m_refractive_index; }
+    virtual complex_t getRefractiveIndex() const { return m_refractive_index; }
 
     //! Set refractive index.
     void setRefractiveIndex(const complex_t &refractive_index)

Core/Samples/inc/IMaterial.h

@@ -45,6 +45,9 @@ public:
     friend std::ostream &operator<<(std::ostream &ostr, const IMaterial &m)
     { m.print(ostr); return ostr; }
 
+    //! Return refractive index.
+    virtual complex_t getRefractiveIndex() const { return 1.0; }
+
 #ifndef GCCXML_SKIP_THIS
     //! Get the scattering matrix from the refractive index
     //! and a given wavevector

Core/Samples/inc/Layer.h

@@ -93,8 +93,8 @@ class BA_CORE_API_ Layer : public ICompositeSample
 
 inline complex_t Layer::getRefractiveIndex() const
 {
-    const HomogeneousMaterial *material = dynamic_cast<const HomogeneousMaterial *>(mp_material);
-    return (material ? material->getRefractiveIndex() : complex_t(0,0));
+    return (mp_material ? mp_material->getRefractiveIndex()
+                        : complex_t(1.0,0.0));
 }
 
 inline double Layer::getTotalParticleSurfaceDensity() const

Core/Samples/inc/Particle.h

@@ -107,8 +107,7 @@ inline IFormFactor* Particle::createFormFactor() const
 
 inline complex_t Particle::getRefractiveIndex() const
 {
-    const HomogeneousMaterial *material = dynamic_cast<const HomogeneousMaterial *>(mp_material);
-    return (material ? material->getRefractiveIndex() : complex_t(0,0));
+    return (mp_material ? mp_material->getRefractiveIndex() : complex_t(0,0));
 }
 
 inline bool Particle::hasDistributedFormFactor() const

Core/Samples/src/ParticleCoreShell.cpp

@@ -43,13 +43,7 @@ IFormFactor *ParticleCoreShell::createFormFactor() const
             mp_shell->getRefractiveIndex());
     ff_shell.setAmbientMaterial(mp_ambient_material);
     p_result->addFormFactor(ff_shell, 1.0);
-    const HomogeneousMaterial *p_hom_mat =
-            dynamic_cast<const HomogeneousMaterial *>(mp_ambient_material);
-    if (!p_hom_mat) {
-        throw NotImplementedException("ParticleCoreShell::createFormFactor:"
-                " ambient material must be homogeneous");
-    }
-    complex_t ambient_index = p_hom_mat->getRefractiveIndex();
+    complex_t ambient_index = mp_ambient_material->getRefractiveIndex();
     complex_t core_index = std::sqrt(mp_core->getRefractiveIndex()*mp_core->getRefractiveIndex()
             - mp_shell->getRefractiveIndex()*mp_shell->getRefractiveIndex()
             + ambient_index*ambient_index);

Tests/UnitTests/TestCore/LayerTest.h

@@ -24,7 +24,7 @@ TEST_F(LayerTest, LayerInitialState)
     EXPECT_EQ(NULL, layer.getDecoration());
     EXPECT_EQ(0, layer.getThickness());
     EXPECT_FALSE(layer.hasDWBASimulation());
-    EXPECT_EQ(complex_t(0,0), layer.getRefractiveIndex());
+    EXPECT_EQ(complex_t(1.0, 0.0), layer.getRefractiveIndex());
     EXPECT_EQ(0.0, layer.getTotalParticleSurfaceDensity());
     EXPECT_EQ("Layer", layer.getName());
     EXPECT_EQ(NULL, layer.createDWBASimulation());
@@ -35,7 +35,7 @@ TEST_F(LayerTest, LayerInitialState)
     EXPECT_EQ(NULL, new_layer->getDecoration());
     EXPECT_EQ(0, new_layer->getThickness());
     EXPECT_FALSE(new_layer->hasDWBASimulation());
-    EXPECT_EQ(complex_t(0,0), new_layer->getRefractiveIndex());
+    EXPECT_EQ(complex_t(1.0, 0.0), new_layer->getRefractiveIndex());
     EXPECT_EQ(0.0, new_layer->getTotalParticleSurfaceDensity());
     EXPECT_EQ("Layer", new_layer->getName());
     EXPECT_EQ(NULL, new_layer->createDWBASimulation());