Merge pull request #54 from dfeen87/copilot/validate-cpp-subsystem-architecture

fix: resolve critical and minor issues from C++ subsystem validation

Author: dfeen87

CMakeLists.txt

@@ -0,0 +1,63 @@
+cmake_minimum_required(VERSION 3.14)
+project(CuraFrame VERSION 3.0.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# All constraint-bundle translation units
+set(BUNDLE_SOURCES
+    constraints/anti_infective/AntiInfectiveBundle.cpp
+    constraints/cardiac/CardiacBundle.cpp
+    constraints/cns/CNSBundle.cpp
+    constraints/formulation/FormulationBundle.cpp
+    constraints/hepatic/HepaticBundle.cpp
+    constraints/immunologic/ImmunologicBundle.cpp
+    constraints/metabolic/MetabolicBundle.cpp
+    constraints/oncology/OncologyBundle.cpp
+    constraints/pkpd/PKPDBundle.cpp
+    constraints/renal/RenalBundle.cpp
+    constraints/safety/SafetyBundle.cpp
+    constraints/systemic_exposure/SystemicExposureBundle.cpp
+)
+
+# Scoring subsystem translation units
+set(SCORING_SOURCES
+    scoring/WeightProfile.cpp
+    scoring/WeightedScoringEngine.cpp
+    scoring/ScoringPipeline.cpp
+)
+
+# Static library bundling all C++ constraint and scoring logic.
+# The repository root is exposed as the include root so that all relative
+# includes (e.g. "constraint_core/Candidate.hpp" or "../scoring/...") resolve
+# correctly regardless of which translation unit is being compiled.
+add_library(curaframe_cpp STATIC
+    ${BUNDLE_SOURCES}
+    ${SCORING_SOURCES}
+)
+
+target_include_directories(curaframe_cpp PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+target_compile_options(curaframe_cpp PRIVATE
+    $<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wall -Wextra -Wpedantic>
+    $<$<CXX_COMPILER_ID:MSVC>:/W4>
+)
+
+# NOTE: Each bundle uses the REGISTER_CONSTRAINT_BUNDLE self-registration macro,
+# which installs a static initialiser in its own translation unit.  When linking
+# this library into an executable, force the linker to include every object file
+# so that all initialisers run, even those with no externally referenced symbols:
+#
+#   GCC / Clang (Linux):
+#     target_link_libraries(my_app PRIVATE
+#         -Wl,--whole-archive curaframe_cpp -Wl,--no-whole-archive)
+#
+#   Clang (macOS):
+#     target_link_libraries(my_app PRIVATE
+#         -Wl,-force_load,$<TARGET_FILE:curaframe_cpp>)
+#
+#   MSVC:
+#     target_link_libraries(my_app PRIVATE /WHOLEARCHIVE:curaframe_cpp)

constraint_core/MultiBundleEvaluator.hpp

@@ -5,13 +5,14 @@
 #include "EvaluationReport.hpp"
 #include "ConstraintRegistry.hpp"
 #include "../scoring/ScoringPipeline.hpp"
+#include "../scoring/ScoringReport.hpp"
 #include "../scoring/WeightProfile.hpp"
 #include <sstream>
 
 // Unified Evaluation Layer
 class MultiBundleEvaluator {
 public:
-    EvaluationReport evaluate(const Candidate& candidate) {
+    EvaluationReport evaluate(const Candidate& candidate) const {
         EvaluationReport report;
         report.candidate_id = candidate.id;
 

constraints/anti_infective/AntiInfectiveBundle.cpp

@@ -1 +1,4 @@
 #include "AntiInfectiveBundle.hpp"
+#include "../../constraint_core/ConstraintRegistry.hpp"
+
+REGISTER_CONSTRAINT_BUNDLE("AntiInfective", AntiInfectiveBundle)

constraints/anti_infective/AntiInfectiveBundle.hpp

@@ -2,7 +2,6 @@
 #define CURAFRAME_ANTI_INFECTIVE_BUNDLE_HPP
 
 #include "../../constraint_core/ConstraintBundle.hpp"
-#include "../../constraint_core/ConstraintRegistry.hpp"
 #include <sstream>
 
 class AntiInfectiveBundle : public ConstraintBundle {
@@ -58,6 +57,4 @@ class AntiInfectiveBundle : public ConstraintBundle {
     std::string narrative_summary() const override { return summary; }
 };
 
-REGISTER_CONSTRAINT_BUNDLE("AntiInfective", AntiInfectiveBundle)
-
 #endif // CURAFRAME_ANTI_INFECTIVE_BUNDLE_HPP

constraints/cardiac/CardiacBundle.cpp

@@ -1 +1,4 @@
 #include "CardiacBundle.hpp"
+#include "../../constraint_core/ConstraintRegistry.hpp"
+
+REGISTER_CONSTRAINT_BUNDLE("Cardiac", CardiacBundle)

constraints/cardiac/CardiacBundle.hpp

@@ -2,7 +2,6 @@
 #define CURAFRAME_CARDIAC_BUNDLE_HPP
 
 #include "../../constraint_core/ConstraintBundle.hpp"
-#include "../../constraint_core/ConstraintRegistry.hpp"
 #include <sstream>
 
 class CardiacBundle : public ConstraintBundle {
@@ -59,6 +58,4 @@ class CardiacBundle : public ConstraintBundle {
     std::string narrative_summary() const override { return summary; }
 };
 
-REGISTER_CONSTRAINT_BUNDLE("Cardiac", CardiacBundle)
-
 #endif // CURAFRAME_CARDIAC_BUNDLE_HPP

constraints/cns/CNSBundle.cpp

@@ -1 +1,4 @@
 #include "CNSBundle.hpp"
+#include "../../constraint_core/ConstraintRegistry.hpp"
+
+REGISTER_CONSTRAINT_BUNDLE("CNS", CNSBundle)

constraints/cns/CNSBundle.hpp

@@ -2,7 +2,6 @@
 #define CURAFRAME_CNS_BUNDLE_HPP
 
 #include "../../constraint_core/ConstraintBundle.hpp"
-#include "../../constraint_core/ConstraintRegistry.hpp"
 #include <sstream>
 
 class CNSBundle : public ConstraintBundle {
@@ -59,6 +58,4 @@ class CNSBundle : public ConstraintBundle {
     std::string narrative_summary() const override { return summary; }
 };
 
-REGISTER_CONSTRAINT_BUNDLE("CNS", CNSBundle)
-
 #endif // CURAFRAME_CNS_BUNDLE_HPP

constraints/formulation/FormulationBundle.cpp

@@ -1 +1,4 @@
 #include "FormulationBundle.hpp"
+#include "../../constraint_core/ConstraintRegistry.hpp"
+
+REGISTER_CONSTRAINT_BUNDLE("Formulation", FormulationBundle)

constraints/formulation/FormulationBundle.hpp

@@ -2,7 +2,6 @@
 #define CURAFRAME_FORMULATION_BUNDLE_HPP
 
 #include "../../constraint_core/ConstraintBundle.hpp"
-#include "../../constraint_core/ConstraintRegistry.hpp"
 #include <sstream>
 
 class FormulationBundle : public ConstraintBundle {
@@ -57,6 +56,4 @@ class FormulationBundle : public ConstraintBundle {
     std::string narrative_summary() const override { return summary; }
 };
 
-REGISTER_CONSTRAINT_BUNDLE("Formulation", FormulationBundle)
-
 #endif // CURAFRAME_FORMULATION_BUNDLE_HPP