Skip to content

Commit

Permalink
Merge pull request #615 from AntaresSimulatorTeam/feature/ACL-simulator
Browse files Browse the repository at this point in the history 
Feature/acl simulator
  • Loading branch information
@JasonMarechal25
JasonMarechal25 authored Mar 3, 2023
2 parents f219e75 + 402edcc commit 8d8457e
Show file tree
Hide file tree
Showing 68 changed files with 1,157 additions and 273 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_centos7.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ jobs:
export PATH=/usr/lib64/openmpi/bin:$PATH
cmake3 --build _build --config Release -j8 --target install
- name: Running unit tests
timeout-minutes: 45
shell: bash
run: |
source /etc/profile.d/modules.sh
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ jobs:
run: |
cmake --build _build --config Release -j2 --target install
- name: Running unit tests
timeout-minutes: 45
shell: cmd
run: |
set PATH=%PATH%;C:\Program Files\Microsoft MPI\Bin
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/centos7-system.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ jobs:
path: ${{ steps.create-single-file.outputs.archive-path }}

- name: Running unit tests
timeout-minutes: 45
shell: bash
run: |
source /etc/profile.d/modules.sh
Expand Down
24 changes: 17 additions & 7 deletions .github/workflows/download-extract-precompiled-libraries-tgz/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,20 @@ runs:
- id: download-extract
shell: bash
run: |
wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v${{inputs.antares-deps-version}}/rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.tar.gz
tar -xvf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.tar.gz
rm -rf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.tar.gz
wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz
tar -xvf antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz -C rte-antares-deps-${{inputs.buildtype}} --strip-components=1
rm -rf antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz
export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
export PATH=/usr/lib64/openmpi/bin:$PATH
wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v${{inputs.antares-deps-version}}/rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.tar.gz
tar -xvf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.tar.gz
rm -rf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.tar.gz
wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz
tar -xvf antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz -C rte-antares-deps-${{inputs.buildtype}} --strip-components=1
rm -rf antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz
wget https://github.com/boostorg/boost/releases/download/boost-1.81.0/boost-1.81.0.tar.gz
tar xvf boost-1.81.0.tar.gz
cd boost-1.81.0
./bootstrap.sh --prefix=../rte-antares-deps-${{inputs.buildtype}}/ --with-libraries=serialization,program_options,mpi
echo "using mpi ;" >> project-config.jam
./b2 install
4 changes: 2 additions & 2 deletions data_test/mini_instance_LP/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
master x 0
SP1 x 0
SP2 x 0
SP1.mps x 0
SP2.mps x 0
4 changes: 2 additions & 2 deletions data_test/mini_instance_LP/structure_default_restart.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
master_default_restart x 0
SP1 x 0
SP2 x 0
SP1.mps x 0
SP2.mps x 0
4 changes: 2 additions & 2 deletions data_test/mini_instance_MIP/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
master x 0
SP1 x 0
SP2 x 0
SP1.mps x 0
SP2.mps x 0
4 changes: 2 additions & 2 deletions data_test/mini_instance_MIP/structure_default_restart.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
master_default_restart x 0
SP1 x 0
SP2 x 0
SP1.mps x 0
SP2.mps x 0
4 changes: 2 additions & 2 deletions data_test/mini_instance_UNBOUNDED/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
master x 0
SP1 x 0
SP2 x 0
SP1.mps x 0
SP2.mps x 0
4 changes: 2 additions & 2 deletions data_test/mini_network/slave_weights.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SP1 0.99
SP2 0.01
SP1.mps 0.99
SP2.mps 0.01
WEIGHT_SUM 1.0
8 changes: 4 additions & 4 deletions data_test/mini_network/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
master t 0
master p 1
SP1 t 0
SP1 p 1
SP2 t 0
SP2 p 1
SP1.mps t 0
SP1.mps p 1
SP2.mps t 0
SP2.mps p 1
8 changes: 4 additions & 4 deletions data_test/mini_network/structure_default_restart.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
master_default_restart t 0
master_default_restart p 1
SP1 t 0
SP1 p 1
SP2 t 0
SP2 p 1
SP1.mps t 0
SP1.mps p 1
SP2.mps t 0
SP2.mps p 1
8 changes: 4 additions & 4 deletions data_test/mini_network/structure_weights_restart.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
master_weights_restart t 0
master_weights_restart p 1
SP1 t 0
SP1 p 1
SP2 t 0
SP2 p 1
SP1.mps t 0
SP1.mps p 1
SP2.mps t 0
SP2.mps p 1
2 changes: 1 addition & 1 deletion data_test/tests_lpnamer/tests_integer/test_lpnamer_01/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
problem-1-1-20210713-163528.mps variables-1-1-20210713-163528.txt constraints-1-1-20210713-163528.txt
problem-1-1-20210713-163528.mps variables-1-1-20210713-163528.txt
10 changes: 5 additions & 5 deletions ...est/tests_lpnamer/tests_integer/test_lpnamer_01/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
master pv 2
master semibase 3
master transmission_line 4
problem-1-1-20210713-163528 battery 5547
problem-1-1-20210713-163528 peak 5545
problem-1-1-20210713-163528 pv 5548
problem-1-1-20210713-163528 semibase 5546
problem-1-1-20210713-163528 transmission_line 5544
problem-1-1-20210713-163528.mps battery 5547
problem-1-1-20210713-163528.mps peak 5545
problem-1-1-20210713-163528.mps pv 5548
problem-1-1-20210713-163528.mps semibase 5546
problem-1-1-20210713-163528.mps transmission_line 5544
2 changes: 1 addition & 1 deletion ...test/tests_lpnamer/tests_integer/test_one_link_one_candidate_1week/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
problem-1-1-20210720-102450.mps variables-1-1-20210720-102450.txt constraints-1-1-20210720-102450.txt
problem-1-1-20210720-102450.mps variables-1-1-20210720-102450.txt
2 changes: 1 addition & 1 deletion ...tests_integer/test_one_link_one_candidate_1week/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
master transmission_line 0
problem-1-1-20210720-102450 transmission_line 1848
problem-1-1-20210720-102450.mps transmission_line 1848
2 changes: 1 addition & 1 deletion ...est/tests_lpnamer/tests_integer/test_one_link_two_candidates_1week/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt constraints-1-1-20210721-145117.txt
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt
4 changes: 2 additions & 2 deletions ...ests_integer/test_one_link_two_candidates_1week/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
master transmission_line 0
master transmission_line_2 1
problem-1-1-20210721-145117 transmission_line 1848
problem-1-1-20210721-145117 transmission_line_2 1849
problem-1-1-20210721-145117.mps transmission_line 1848
problem-1-1-20210721-145117.mps transmission_line_2 1849
2 changes: 1 addition & 1 deletion ...sts_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt constraints-1-1-20210721-145117.txt
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt
4 changes: 2 additions & 2 deletions ...nteger/test_one_link_two_candidates_simple_prob/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
master transmission_line_1 0
master transmission_line_2 1
problem-1-1-20210721-145117 transmission_line_1 1
problem-1-1-20210721-145117 transmission_line_2 2
problem-1-1-20210721-145117.mps transmission_line_1 1
problem-1-1-20210721-145117.mps transmission_line_2 2
2 changes: 1 addition & 1 deletion ...tests_integer/test_one_link_two_candidates_simple_prob_hurdle_cost/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt constraints-1-1-20210721-145117.txt
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt
4 changes: 2 additions & 2 deletions ...one_link_two_candidates_simple_prob_hurdle_cost/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
master transmission_line_1 0
master transmission_line_2 1
problem-1-1-20210721-145117 transmission_line_1 3
problem-1-1-20210721-145117 transmission_line_2 4
problem-1-1-20210721-145117.mps transmission_line_1 3
problem-1-1-20210721-145117.mps transmission_line_2 4
2 changes: 1 addition & 1 deletion ...ests_integer/test_one_link_two_candidates_simple_prob_null_profile/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt constraints-1-1-20210721-145117.txt
problem-1-1-20210721-145117.mps variables-1-1-20210721-145117.txt
2 changes: 1 addition & 1 deletion ...ne_link_two_candidates_simple_prob_null_profile/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
master transmission_line_1 0
master transmission_line_2 1
problem-1-1-20210721-145117 transmission_line_1 1
problem-1-1-20210721-145117.mps transmission_line_1 1
8 changes: 4 additions & 4 deletions ...relaxed/SmallTestSixCandidatesWithAlreadyInstalledCapacity-relaxed/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
problem-1-1-20210720-143331.mps variables-1-1-20210720-143331.txt constraints-1-1-20210720-143331.txt
problem-1-2-20210720-143331.mps variables-1-2-20210720-143331.txt constraints-1-2-20210720-143331.txt
problem-1-3-20210720-143331.mps variables-1-3-20210720-143331.txt constraints-1-3-20210720-143331.txt
problem-1-4-20210720-143331.mps variables-1-4-20210720-143331.txt constraints-1-4-20210720-143331.txt
problem-1-1-20210720-143331.mps variables-1-1-20210720-143331.txt
problem-1-2-20210720-143331.mps variables-1-2-20210720-143331.txt
problem-1-3-20210720-143331.mps variables-1-3-20210720-143331.txt
problem-1-4-20210720-143331.mps variables-1-4-20210720-143331.txt
48 changes: 24 additions & 24 deletions ...xCandidatesWithAlreadyInstalledCapacity-relaxed/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
master pv 3
master semibase1 4
master semibase2 5
problem-1-1-20210720-143331 battery 6891
problem-1-1-20210720-143331 peak1 6888
problem-1-1-20210720-143331 peak2 6892
problem-1-1-20210720-143331 pv 6890
problem-1-1-20210720-143331 semibase1 6889
problem-1-1-20210720-143331 semibase2 6893
problem-1-2-20210720-143331 battery 6891
problem-1-2-20210720-143331 peak1 6888
problem-1-2-20210720-143331 peak2 6892
problem-1-2-20210720-143331 pv 6890
problem-1-2-20210720-143331 semibase1 6889
problem-1-2-20210720-143331 semibase2 6893
problem-1-3-20210720-143331 battery 6891
problem-1-3-20210720-143331 peak1 6888
problem-1-3-20210720-143331 peak2 6892
problem-1-3-20210720-143331 pv 6890
problem-1-3-20210720-143331 semibase1 6889
problem-1-3-20210720-143331 semibase2 6893
problem-1-4-20210720-143331 battery 6891
problem-1-4-20210720-143331 peak1 6888
problem-1-4-20210720-143331 peak2 6892
problem-1-4-20210720-143331 pv 6890
problem-1-4-20210720-143331 semibase1 6889
problem-1-4-20210720-143331 semibase2 6893
problem-1-1-20210720-143331.mps battery 6891
problem-1-1-20210720-143331.mps peak1 6888
problem-1-1-20210720-143331.mps peak2 6892
problem-1-1-20210720-143331.mps pv 6890
problem-1-1-20210720-143331.mps semibase1 6889
problem-1-1-20210720-143331.mps semibase2 6893
problem-1-2-20210720-143331.mps battery 6891
problem-1-2-20210720-143331.mps peak1 6888
problem-1-2-20210720-143331.mps peak2 6892
problem-1-2-20210720-143331.mps pv 6890
problem-1-2-20210720-143331.mps semibase1 6889
problem-1-2-20210720-143331.mps semibase2 6893
problem-1-3-20210720-143331.mps battery 6891
problem-1-3-20210720-143331.mps peak1 6888
problem-1-3-20210720-143331.mps peak2 6892
problem-1-3-20210720-143331.mps pv 6890
problem-1-3-20210720-143331.mps semibase1 6889
problem-1-3-20210720-143331.mps semibase2 6893
problem-1-4-20210720-143331.mps battery 6891
problem-1-4-20210720-143331.mps peak1 6888
problem-1-4-20210720-143331.mps peak2 6892
problem-1-4-20210720-143331.mps pv 6890
problem-1-4-20210720-143331.mps semibase1 6889
problem-1-4-20210720-143331.mps semibase2 6893
8 changes: 4 additions & 4 deletions ...st/tests_lpnamer/tests_relaxed/test_one_link_one_candidate-relaxed/output/economy/mps.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
problem-1-1-20210720-114739.mps variables-1-1-20210720-114739.txt constraints-1-1-20210720-114739.txt
problem-1-2-20210720-114739.mps variables-1-2-20210720-114739.txt constraints-1-2-20210720-114739.txt
problem-1-3-20210720-114739.mps variables-1-3-20210720-114739.txt constraints-1-3-20210720-114739.txt
problem-1-4-20210720-114739.mps variables-1-4-20210720-114739.txt constraints-1-4-20210720-114739.txt
problem-1-1-20210720-114739.mps variables-1-1-20210720-114739.txt
problem-1-2-20210720-114739.mps variables-1-2-20210720-114739.txt
problem-1-3-20210720-114739.mps variables-1-3-20210720-114739.txt
problem-1-4-20210720-114739.mps variables-1-4-20210720-114739.txt
8 changes: 4 additions & 4 deletions ...sts_relaxed/test_one_link_one_candidate-relaxed/output/economy/reference_lp/structure.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
master transmission_line 0
problem-1-1-20210720-114739 transmission_line 1848
problem-1-2-20210720-114739 transmission_line 1848
problem-1-3-20210720-114739 transmission_line 1848
problem-1-4-20210720-114739 transmission_line 1848
problem-1-1-20210720-114739.mps transmission_line 1848
problem-1-2-20210720-114739.mps transmission_line 1848
problem-1-3-20210720-114739.mps transmission_line 1848
problem-1-4-20210720-114739.mps transmission_line 1848
9 changes: 6 additions & 3 deletions docker/centos7-bare
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ RUN yum install -y epel-release

# Install requirements
RUN yum install -y git redhat-lsb-core gcc gcc-c++ make wget centos-release-scl scl-utils rpm-build &&\
yum install -y cmake3 devtoolset-9 &&\
yum install -y rh-git227-git
yum install -y cmake3 devtoolset-9

RUN yum -y remove git && \
yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm && \
yum -y install git

# Install xpansion requirements
RUN yum install -y jsoncpp-devel gtest-devel openmpi-devel boost-openmpi-devel doxygen graphviz boost-program-options environment-modules rpm-build zlib-devel
RUN yum install -y jsoncpp-devel gtest-devel openmpi-devel doxygen graphviz environment-modules rpm-build zlib-devel

# Install tbb. tbb is required for execution policy (parallelization c++) but the system version is too old.
RUN git clone https://github.com/wjakob/tbb.git && \
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/benders/benders_core/BendersBase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ std::string BendersBase::status_from_criterion() const {
*/
std::filesystem::path BendersBase::GetSubproblemPath(
std::string const &slave_name) const {
return std::filesystem::path(_options.INPUTROOT) / (slave_name + MPS_SUFFIX);
return std::filesystem::path(_options.INPUTROOT) / slave_name;
}

/*!
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/benders/merge_mps/MergeMPS.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void MergeMPS::launch() {

LOG(INFO) << "Merging problems..." << std::endl;
for (auto const &kvp : input) {
auto problem_name(inputRootDir / (kvp.first + MPS_SUFFIX));
auto problem_name(inputRootDir / (kvp.first));
SolverAbstract::Ptr solver_l = factory.create_solver(solver_to_use);
solver_l->init();
solver_l->set_output_log_level(_options.LOG_LEVEL);
Expand Down
7 changes: 4 additions & 3 deletions src/cpp/exe/lpnamer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ add_executable (lp_namer
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
)

target_link_libraries (lp_namer
PRIVATE
target_link_libraries (lp_namer
PRIVATE
${PROJECT_NAME}::problem_generation_main
${PROJECT_NAME}::lp_namer_helper)
${PROJECT_NAME}::lp_namer_helper
Boost::serialization)

install(TARGETS lp_namer DESTINATION bin)
Loading

0 comments on commit 8d8457e

Please sign in to comment.