tboudreaux/libcomposition
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(CompositionDecorator): added composition decorator

Browse Source 
It is sometimes useful for callers to be able to create new composition objects without overloading all the required methods. The CompositionDecorator acts as a simple translation layer which will pass any calls to virtual methods down to the next level of the composition stack (other than those which may have been overloaded by the caller)
This commit is contained in:
Emily Boudreaux
2025-11-09 07:42:03 -05:00
parent 49bfb5eff1
commit 31407c91f7
4 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/composition/compositionTest.cpp
View File

@@ -8,6 +8,7 @@
#include "fourdst/composition/composition.h"
#include "fourdst/composition/exceptions/exceptions_composition.h"
#include "fourdst/composition/utils.h"
#include "fourdst/composition/composition_abstract.h"
#include "fourdst/config/config.h"
@@ -247,30 +248,28 @@ TEST_F(compositionTest, buildFromMassFractions) {
* - All CompositionAbstract children have the standard getter interface.
*/
TEST_F(compositionTest, abstractBase) {
class UnrestrictedComposition : public fourdst::composition::Composition {
private:
fourdst::atomic::Species m_species;
const Composition& m_composition;
class UnrestrictedComposition : public fourdst::composition::CompositionDecorator {
public:
UnrestrictedComposition(const Composition& base, const fourdst::atomic::Species& species):
Composition(base),
m_species(species),
m_composition(base)
UnrestrictedComposition(std::unique_ptr<CompositionAbstract> base, const fourdst::atomic::Species& species):
CompositionDecorator(std::move(base)),
m_species(species)
{}
double getMolarAbundance(const fourdst::atomic::Species &species) const override {
if (species == m_species) {
return 1.0;
}
return m_composition.getMolarAbundance(species);
return CompositionDecorator::getMolarAbundance(species);
}
private:
fourdst::atomic::Species m_species;
};
fourdst::composition::Composition comp;
comp.registerSymbol("H-1"); comp.registerSymbol("He-4"); comp.registerSymbol("O-16");
comp.setMolarAbundance("H-1", 0.6); comp.setMolarAbundance("He-4", 0.6);
const UnrestrictedComposition uComp(comp, fourdst::atomic::H_1);
const UnrestrictedComposition uComp(std::make_unique<fourdst::composition::Composition>(comp), fourdst::atomic::H_1);
ASSERT_DOUBLE_EQ(uComp.getMolarAbundance(fourdst::atomic::H_1), 1.0);
ASSERT_DOUBLE_EQ(uComp.getMassFraction("He-4"), comp.getMassFraction("He-4"));