Update antares deps (update minizip)

AntaresSimulatorTeam · Nov 20, 2023 · b9b8713 · b9b8713
1 parent c0c7cef
commit b9b8713
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "antares-deps"]
 	path = antares-deps
 	url = https://github.com/AntaresSimulatorTeam/antares-deps.git
-	branch = v2.0.5
+	branch = v3.0.0-tests
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
diff --git a/antares-version.json b/antares-version.json
@@ -2,6 +2,6 @@
   "antares_version": "8.8.0-rc2",
   "antares_version_executable": "8.8",
   "antares_xpansion_version": "1.2.0",
-  "antares_deps_version": "2.0.7",
-  "minizip_ng_version": "3.0.6"
+  "antares_deps_version": "3.0.0-tests",
+  "minizip_ng_version": "4.0.1"
 }
diff --git a/examples/SmallTestFiveCandidates/user/expansion/candidates.ini b/examples/SmallTestFiveCandidates/user/expansion/candidates.ini
@@ -17,20 +17,21 @@ name = pv
 link = area2 - pv
 annual-cost-per-mw = 55400
 max-investment = 1000
-link-profile = capa_pv.ini
+direct-link-profile = direct_capa_pv.ini
+indirect-link-profile = direct_capa_pv.ini
 
 [4]
 name = battery
 link = area2 - flex
 annual-cost-per-mw = 60000
 max-investment = 1000
 
-
 [5]
 name = transmission_line
 link = area1 - area2
 annual-cost-per-mw = 10000
 unit-size = 400
 max-units = 8
-link-profile = 04_fr-05_fr.txt
+direct-link-profile = direct_04_fr-05_fr.txt
+indirect-link-profile = indirect_04_fr-05_fr.txt
 
diff --git a/src/cpp/helpers/ArchiveReader.cpp b/src/cpp/helpers/ArchiveReader.cpp
@@ -15,7 +15,7 @@ ArchiveReader::ArchiveReader(const std::filesystem::path& archivePath)
 ArchiveReader::ArchiveReader() : ArchiveIO() { Create(); }
 void ArchiveReader::Create() {
   std::unique_lock lock(mutex_);
-  mz_zip_reader_create(&pmz_zip_reader_instance_);
+  pmz_zip_reader_instance_ = mz_zip_reader_create();
 }
 
 int32_t ArchiveReader::Open() {

diff --git a/src/cpp/helpers/ArchiveWriter.cpp b/src/cpp/helpers/ArchiveWriter.cpp
@@ -18,7 +18,7 @@ ArchiveWriter::ArchiveWriter() : ArchiveIO() {
 
 void ArchiveWriter::Create() {
   std::unique_lock lock(mutex_);
-  mz_zip_writer_create(&pmz_zip_writer_instance_);
+  pmz_zip_writer_instance_ = mz_zip_writer_create();
 }
 void ArchiveWriter::InitFileInfo() {
   fileInfo_.compression_method = MZ_COMPRESS_METHOD_DEFLATE;

diff --git a/tests/cpp/zip_mps/zip_mps_lib_tests.cpp b/tests/cpp/zip_mps/zip_mps_lib_tests.cpp
@@ -134,9 +134,9 @@ FileBufferVector GetBufferVectorOfFilesInDir(const std::filesystem::path& dir) {
 void compareArchiveAndDir(const std::filesystem::path& archivePath,
                           const std::filesystem::path& dirPath,
                           const std::filesystem::path& tmpDir) {
-  void* reader = NULL;
+  void* reader = nullptr;
 
-  mz_zip_reader_create(&reader);
+  reader = mz_zip_reader_create();
   const auto& archive_path_str = archivePath.string();
   auto archive_path_c_str = archive_path_str.c_str();
   assert(mz_zip_reader_open_file(reader, archive_path_c_str) == MZ_OK);