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

perf(hash): Hash caching

Browse Source 
added ability for composition to stash their own hash values
This commit is contained in:
Emily Boudreaux
2025-12-07 07:47:32 -05:00
parent 9541234a5f
commit 75ba6c8456
5 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/composition/include/fourdst/composition/composition.h
View File

@@ -112,6 +112,7 @@ namespace fourdst::composition {
std::optional<std::vector<atomic::Species>> sortedSpecies; ///< Cached vector of sorted species (by mass).
std::optional<std::vector<std::string>> sortedSymbols; ///< Cached vector of sorted species (by mass).
std::optional<double> Ye; ///< Cached electron abundance.
std::optional<std::size_t> hash;
/**
* @brief Clears all cached values.
@@ -124,6 +125,7 @@ namespace fourdst::composition {
sortedSymbols = std::nullopt;
sortedSpecies = std::nullopt;
Ye = std::nullopt;
hash = std::nullopt;
}
/**
@@ -133,7 +135,7 @@ namespace fourdst::composition {
[[nodiscard]] bool is_clear() const {
return !canonicalComp.has_value() && !massFractions.has_value() &&
!numberFractions.has_value() && !molarAbundances.has_value() && !sortedSymbols.has_value() &&
!Ye.has_value() && !sortedSpecies.has_value();
!Ye.has_value() && !sortedSpecies.has_value() && !hash.has_value();
}
};
private:
@@ -832,6 +834,8 @@ namespace fourdst::composition {
return m_molarAbundances.cend();
}
[[nodiscard]] std::size_t hash() const override;
};
inline bool operator==(const Composition& a, const Composition& b) noexcept {

2
src/composition/include/fourdst/composition/composition_abstract.h
View File

@@ -179,6 +179,8 @@ namespace fourdst::composition {
[[nodiscard]] virtual std::map<atomic::Species, double>::iterator end() = 0;
[[nodiscard]] virtual std::map<atomic::Species, double>::const_iterator begin() const = 0;
[[nodiscard]] virtual std::map<atomic::Species, double>::const_iterator end() const = 0;
[[nodiscard]] virtual std::size_t hash() const = 0;
};
// ReSharper disable once CppClassCanBeFinal

1
src/composition/include/fourdst/composition/decorators/composition_decorator_abstract.h
View File

@@ -36,6 +36,7 @@ namespace fourdst::composition {
[[nodiscard]] size_t getSpeciesIndex(const std::string& symbol) const override { return m_base_composition->getSpeciesIndex(symbol); };
[[nodiscard]] size_t getSpeciesIndex(const atomic::Species& species) const override { return m_base_composition->getSpeciesIndex(species); };
[[nodiscard]] atomic::Species getSpeciesAtIndex(const size_t index) const override { return m_base_composition->getSpeciesAtIndex(index); }
[[nodiscard]] size_t hash() const override { return m_base_composition->hash(); };
[[nodiscard]] std::map<atomic::Species, double>::iterator begin() override { return m_base_composition->begin(); };
[[nodiscard]] std::map<atomic::Species, double>::iterator end() override { return m_base_composition->end(); };

10
src/composition/lib/composition.cpp
View File

@@ -34,6 +34,7 @@
#include "fourdst/atomic/atomicSpecies.h"
#include "fourdst/atomic/species.h"
#include "fourdst/composition/composition.h"
#include "fourdst/composition/utils/composition_hash.h"
#include "fourdst/composition/utils.h"
#include "fourdst/composition/exceptions/exceptions_composition.h"
@@ -551,6 +552,15 @@ namespace fourdst::composition {
return std::make_unique<Composition>(*this);
}
std::size_t Composition::hash() const {
if (m_cache.hash.has_value()) {
return m_cache.hash.value();
}
std::size_t hash = utils::CompositionHash::hash_exact(*this);
m_cache.hash = hash;
return hash;
}
bool Composition::contains(
const atomic::Species &species
) const noexcept {