refactor(network): updated network and network::approx8 to use composition module
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:
@@ -1,3 +1,4 @@
|
||||
species_weight_dep = declare_dependency(
|
||||
include_directories: include_directories('include'),
|
||||
)
|
||||
)
|
||||
message('✅ SERiF species_weight dependency declared')
|
||||
@@ -29,4 +29,4 @@ composition_dep = declare_dependency(
|
||||
)
|
||||
|
||||
# Make headers accessible
|
||||
install_headers(composition_headers, subdir : '4DSSE/composition')
|
||||
install_headers(composition_headers, subdir : 'SERiF/composition')
|
||||
@@ -333,7 +333,7 @@ namespace serif::composition {
|
||||
return old_number_fractions;
|
||||
}
|
||||
|
||||
bool Composition::finalize(bool norm) {
|
||||
bool Composition::finalize(const bool norm) {
|
||||
bool finalized = false;
|
||||
if (m_massFracMode) {
|
||||
finalized = finalizeMassFracMode(norm);
|
||||
|
||||
@@ -18,8 +18,7 @@
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// *********************************************************************** */
|
||||
#ifndef COMPOSITION_H
|
||||
#define COMPOSITION_H
|
||||
#pragma once
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
@@ -507,6 +506,4 @@ namespace serif::composition {
|
||||
Composition operator+(const Composition& other) const;
|
||||
|
||||
};
|
||||
}; // namespace serif::composition
|
||||
|
||||
#endif // COMPOSITION_H
|
||||
}; // namespace serif::composition
|
||||
Reference in New Issue
Block a user