Release/1.3.0

CMakeLists.txt

@@ -8,8 +8,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
 # Project configuration
 # ===========================================================================
 
-PROJECT(antaresXpansion VERSION 1.2.2)
-set(ANTARES_XPANSION_RC 0)
+PROJECT(antaresXpansion VERSION 1.3.0)
+set(ANTARES_XPANSION_RC 5)
 
 # ===========================================================================
 # Default parameters

antares-version.json

@@ -1,7 +1,7 @@
 {
   "antares_version": "8.8.3",
   "antares_version_executable": "8.8",
-  "antares_xpansion_version": "1.2.2",
+  "antares_xpansion_version": "1.3.0",
   "antares_deps_version": "2.0.7",
   "minizip_ng_version": "3.0.6"
 }

docs/changelog/CHANGELOG.md

@@ -1,6 +1,20 @@
 Antares-Xpansion changelog
 =================
 
+v1.3.0 (06/2024)
+--------------------------------------------------------
+
+### Features
+
+Embedding Mpi in Windows
+Allow sensitivity study to run unzipped study
+First Implementation of Benders Outer Loop
+### Bug Fixes
+
+Duplicate Xpress loading messages
+remove whitespace from Xpress path on Windows 
+fix truncated xpress path on linux
+
 v1.2.2 (02/2024)
 --------------------------------------------------------
 

sonar-project.properties

@@ -1,7 +1,7 @@
 sonar.projectName=antares-xpansion
 sonar.projectKey=AntaresSimulatorTeam_antares-xpansion
 sonar.organization=antaressimulatorteam
-sonar.projectVersion=1.2.2
+sonar.projectVersion=1.3.0
 
 # =====================================================
 #   Properties that will be shared amongst all modules

src/cpp/multisolver_interface/environment.cc

@@ -20,6 +20,7 @@
 #include <mutex>
 #include <sstream>
 #include <string>
+
 namespace LoadXpress {
 
 #define STRINGIFY2(X) #X
@@ -229,6 +230,8 @@ std::string XpressLoader::GetXpressVarFromEnvironmentVariables(
     // Get the value of the LIB environment variable.
     getenv_s(&requiredSize, xpress_home_from_env.data(), requiredSize,
              XPRESS_var);
+    xpress_home_from_env = xpress_home_from_env.substr(0, requiredSize - 1);
+
   } else {
     if (verbose) {
       msg.str("");

vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "antares-xpansion",
-  "version-string": "1.2.2",
-  "builtin-baseline": "9484a57dd560b89f0a583be08af6753611c57fd5",
+  "version-string": "1.3.0",
+  "builtin-baseline": "943c5ef1c8f6b5e6ced092b242c8299caae2ff01",
   "dependencies": [
     "jsoncpp",
     "gtest",