From 36fe843446640d34613255e8557c3fc64dfd281b Mon Sep 17 00:00:00 2001
From: Geir Horn <Geir.Horn@gmail.com>
Date: Wed, 10 Jan 2024 16:26:09 +0100
Subject: [PATCH] First release

- Added build script and AMPL license file
- Fixed merge errors for the makefile
- Extended the makefile header
- Added initial AMQ message topics
- Tested remote build
- Removed AMPL license file
- Validated build script
- Accepting the metric definition message from the EMS
- Execution control status messages + solver type command line option
- Executing solver component
- Added instructions on use to the Solver Component source file
- Explicit close of subscriptions in destrcutors if network active.
- Correct handling of metric list messages and subscriptions
- Adding correct message and connection properties
- Debugging message filtering with Fotis

Change-Id: I8940daac2fce3365c24a4262a0a1326353d7e97a
---
 .vscode/c_cpp_properties.json | 5 +++--
 AMPLSolver.cpp                | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 4717f0f..4395a9e 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -5,7 +5,7 @@
             "includePath": [
                 "/home/GHo/Documents/Code/CxxOpts/include",
                 "/home/GHo/Documents/Code/Theron++",
-                "/opt/AMPL/amplapi/include/ampl",
+                "/opt/AMPL/amplapi/include/",
                 "${workspaceFolder}/**",
                 "/usr/lib/gcc/x86_64-redhat-linux/13/../../../../include/c++/13"
             ],
@@ -17,7 +17,7 @@
                 "-std=c++23",
                 "-I/home/GHo/Documents/Code/Theron++",
                 "-I/home/GHo/Documents/Code/CxxOpts/include",
-                "-I/opt/AMPL/amplapi/include/ampl"
+                "-I/opt/AMPL/amplapi/include/"
             ],
             "cppStandard": "c++23",
             "mergeConfigurations": false,
@@ -26,6 +26,7 @@
                 "path": [
                     "/home/GHo/Documents/Code/Theron++",
                     "/home/GHo/Documents/Code/CxxOpts/include",
+                    "/opt/AMPL/amplapi/include/",
                     "/usr/lib/gcc/x86_64-redhat-linux/13/../../../../include/c++/13"
                 ],
                 "limitSymbolsToIncludedHeaders": false
diff --git a/AMPLSolver.cpp b/AMPLSolver.cpp
index f80a455..cd8a42f 100644
--- a/AMPLSolver.cpp
+++ b/AMPLSolver.cpp
@@ -98,7 +98,7 @@ void AMPLSolver::DefineProblem(const Solver::OptimisationProblem & TheProblem,
   Output << "AMPL Solver received the AMPL problem: " << TheProblem.dump(2)
          << std::endl;
 
-  ProblemDefinition.read( SaveFile( TheProblem ) );
+  //ProblemDefinition.read( SaveFile( TheProblem ) );
   Output << "Problem loaded!" << std::endl;
 }