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

Merge pull request #72 from tboudreaux/hotfix/gcc/CompositionRefactor

Browse Source 
[Hotfix] updated to compile on gcc and clang
This commit is contained in:
Emily Boudreaux
2025-06-17 10:18:40 -04:00
committed by GitHub
parent aaed25c35f 7c854ea3d1
commit d2ef11b9cb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/composition/private/composition.cpp
View File

@@ -357,7 +357,7 @@ namespace serif::composition {
for (const auto& mass_fraction : mass_fractions) { for (const auto& mass_fraction : mass_fractions) {
sum += mass_fraction; sum += mass_fraction;
} }
for (int i = 0; i < mass_fractions.size(); ++i) { for (int i = 0; i < static_cast<int>(mass_fractions.size()); ++i) {
mass_fractions[i] /= sum; mass_fractions[i] /= sum;
} }
for (auto& [symbol, entry] : m_compositions) { for (auto& [symbol, entry] : m_compositions) {
@@ -594,10 +594,10 @@ namespace serif::composition {
throw std::runtime_error("Composition has not been finalized (Consider running .finalize())."); throw std::runtime_error("Composition has not been finalized (Consider running .finalize()).");
} }
CanonicalComposition canonicalComposition; CanonicalComposition canonicalComposition;
constexpr std::array<std::string, 7> canonicalH = { const std::array<std::string, 7> canonicalH = {
"H-1", "H-2", "H-3", "H-4", "H-5", "H-6", "H-7" "H-1", "H-2", "H-3", "H-4", "H-5", "H-6", "H-7"
}; };
constexpr std::array<std::string, 8> canonicalHe = { const std::array<std::string, 8> canonicalHe = {
"He-3", "He-4", "He-5", "He-6", "He-7", "He-8", "He-9", "He-10" "He-3", "He-4", "He-5", "He-6", "He-7", "He-8", "He-9", "He-10"
}; };
for (const auto& symbol : canonicalH) { for (const auto& symbol : canonicalH) {

4
tests/composition/compositionTest.cpp
View File

@@ -61,13 +61,13 @@ TEST_F(compositionTest, setGetComposition) {
EXPECT_THROW(comp.setMassFraction("He-3", 0.3), std::runtime_error); EXPECT_THROW(comp.setMassFraction("He-3", 0.3), std::runtime_error);
EXPECT_NO_THROW(comp.setMassFraction({"H-1", "He-4"}, {0.5, 0.5})); EXPECT_NO_THROW(comp.setMassFraction({"H-1", "He-4"}, {0.5, 0.5}));
EXPECT_THROW(comp.getComposition("H-1"), std::runtime_error); EXPECT_THROW(auto r = comp.getComposition("H-1"), std::runtime_error);
EXPECT_TRUE(comp.finalize()); EXPECT_TRUE(comp.finalize());
EXPECT_DOUBLE_EQ(comp.getComposition("H-1").first.mass_fraction(), 0.5); EXPECT_DOUBLE_EQ(comp.getComposition("H-1").first.mass_fraction(), 0.5);
EXPECT_NO_THROW(comp.setMassFraction({"H-1", "He-4"}, {0.6, 0.6})); EXPECT_NO_THROW(comp.setMassFraction({"H-1", "He-4"}, {0.6, 0.6}));
EXPECT_FALSE(comp.finalize()); EXPECT_FALSE(comp.finalize());
EXPECT_THROW(comp.getComposition("H-1"), std::runtime_error); EXPECT_THROW(auto r = comp.getComposition("H-1"), std::runtime_error);
} }
TEST_F(compositionTest, setGetNumberFraction) { TEST_F(compositionTest, setGetNumberFraction) {