Merge branch 'ml/standalone-header' into 'poet'

refactor: reorganize includes and forward declarations in PhreeqcKnobs and PhreeqcMatrix

See merge request naaice/iphreeqc!25

poet/include/PhreeqcKnobs.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Phreeqc.h"
 #include <cstdint>
 /**
  * @brief A struct to hold the parameters for PhreeqcKnobs.
@@ -18,6 +17,8 @@ struct PhreeqcKnobsParams {
   bool diagonal_scale;
 };
 
+class Phreeqc;
+
 /**
  * @class PhreeqcKnobs
  * @brief A class to manage and manipulate knobs (parameters) for a Phreeqc

poet/include/PhreeqcMatrix.hpp

@@ -6,9 +6,10 @@
 #include <string>
 #include <vector>
 
-#include "IPhreeqc.hpp"
 #include "PhreeqcKnobs.hpp"
 
+class IPhreeqc;
+
 /**
  * @brief Class for storing information from Phreeqc
  *

poet/src/Knobs.cpp

@@ -1,5 +1,7 @@
 #include "PhreeqcKnobs.hpp"
 
+#include <Phreeqc.h>
+
 PhreeqcKnobs::PhreeqcKnobs(Phreeqc *pqc_instance) {
   this->readKnobs(pqc_instance);
 }

poet/src/PhreeqcMatrix/Init.cpp

@@ -6,6 +6,7 @@
 #include "../Wrapper/SolutionWrapper.hpp"
 #include "../Wrapper/SurfaceWrapper.hpp"
 
+#include <IPhreeqc.hpp>
 #include <Phreeqc.h>
 #include <Solution.h>
 #include <cmath>

poet/src/PhreeqcMatrix/Misc.cpp

@@ -1,5 +1,7 @@
 #include "PhreeqcMatrix.hpp"
 
+#include <IPhreeqc.hpp>
+
 std::vector<int> PhreeqcMatrix::getIds() const {
   std::vector<int> ids;
   for (const auto &[id, _] : _m_map) {