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

refactor(network): updated network and network::approx8 to use composition module

Browse Source 
This is a very basic wrapper implimentation currently. This is sufficient to lock the interface down so that other code can target it. However, internally there is just a "convert" function. Eventually we should rework the code itself to use the composition module more directly.
This commit is contained in:
Emily Boudreaux
2025-06-17 09:43:43 -04:00
parent 36a3f832f7
commit 6d517d937e
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/static/atomic/meson.build
View File

@@ -1,3 +1,4 @@
species_weight_dep = declare_dependency( species_weight_dep = declare_dependency(
include_directories: include_directories('include'), include_directories: include_directories('include'),
) )
message('✅ SERiF species_weight dependency declared')

2
src/composition/meson.build
View File

@@ -29,4 +29,4 @@ composition_dep = declare_dependency(
) )
# Make headers accessible # Make headers accessible
install_headers(composition_headers, subdir : '4DSSE/composition') install_headers(composition_headers, subdir : 'SERiF/composition')

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

@@ -333,7 +333,7 @@ namespace serif::composition {
return old_number_fractions; return old_number_fractions;
} }
bool Composition::finalize(bool norm) { bool Composition::finalize(const bool norm) {
bool finalized = false; bool finalized = false;
if (m_massFracMode) { if (m_massFracMode) {
finalized = finalizeMassFracMode(norm); finalized = finalizeMassFracMode(norm);

7
src/composition/public/composition.h
View File

@@ -18,8 +18,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// *********************************************************************** */ // *********************************************************************** */
#ifndef COMPOSITION_H #pragma once
#define COMPOSITION_H
#include <iostream> #include <iostream>
#include <string> #include <string>
@@ -507,6 +506,4 @@ namespace serif::composition {
Composition operator+(const Composition& other) const; Composition operator+(const Composition& other) const;
}; };
}; // namespace serif::composition }; // namespace serif::composition
#endif // COMPOSITION_H