From: Augustin Degomme <26892-adegomme@users.noreply.framagit.org>
Date: Tue, 28 Feb 2023 15:59:29 +0000 (+0000)
Subject: Merge branch 'udpor-phase3' into 'master'
X-Git-Tag: v3.34~422
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b6a2ada11480242c200660a273f4174151d0bf09?hp=-c

Merge branch 'udpor-phase3' into 'master'

Phase 2.5 of UDPOR Integration: Add Iterators for Subsets

See merge request simgrid/simgrid!134
---

b6a2ada11480242c200660a273f4174151d0bf09
diff --combined MANIFEST.in
index b77754eb8e,5a933a383b..65044786f6
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@@ -1676,9 -1676,6 +1676,9 @@@ include docs/source/app_smpi.rs
  include docs/source/application.rst
  include docs/source/community.rst
  include docs/source/conf.py
 +include docs/source/img/design-scheduling-parallel.svg
 +include docs/source/img/design-scheduling-simulatedtime.svg
 +include docs/source/img/design-scheduling-wallclock.svg
  include docs/source/img/eclipseScreenShot.png
  include docs/source/img/extlink.png
  include docs/source/img/extlink.svg
@@@ -2234,6 -2231,16 +2234,16 @@@ include src/mc/transition/TransitionRan
  include src/mc/transition/TransitionRandom.hpp
  include src/mc/transition/TransitionSynchro.cpp
  include src/mc/transition/TransitionSynchro.hpp
+ include src/mc/explo/udpor/Configuration.hpp
+ include src/mc/explo/udpor/Configuration.cpp
+ include src/mc/explo/udpor/EventSet.cpp
+ include src/mc/explo/udpor/EventSet.hpp
+ include src/mc/explo/udpor/History.cpp
+ include src/mc/explo/udpor/History.hpp
+ include src/mc/explo/udpor/UnfoldingEvent.cpp
+ include src/mc/explo/udpor/UnfoldingEvent.hpp
+ include src/mc/explo/udpor/Unfolding.cpp
+ include src/mc/explo/udpor/Unfolding.hpp
  include src/plugins/ProducerConsumer.cpp
  include src/plugins/chaos_monkey.cpp
  include src/plugins/file_system/s4u_FileSystem.cpp
@@@ -2508,6 -2515,11 +2518,11 @@@ include src/xbt/random_test.cp
  include src/xbt/snprintf.c
  include src/xbt/string.cpp
  include src/xbt/unit-tests_main.cpp
+ include src/xbt/utils/iter/subsets.hpp
+ include src/xbt/utils/iter/subsets_tests.cpp
+ include src/xbt/utils/iter/powerset.hpp
+ include src/xbt/utils/iter/LazyKSubsets.hpp
+ include src/xbt/utils/iter/LazyPowerset.hpp
  include src/xbt/xbt_log_appender_file.cpp
  include src/xbt/xbt_log_layout_format.cpp
  include src/xbt/xbt_log_layout_simple.cpp
diff --combined tools/cmake/DefinePackages.cmake
index 7219803b71,f8bdb6c8b3..f420c1cdeb
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -283,6 -283,10 +283,10 @@@ set(XBT_SR
    src/xbt/xbt_parse_units.cpp
    src/xbt/xbt_replay.cpp
    src/xbt/xbt_str.cpp
+   src/xbt/utils/iter/subsets.hpp
+   src/xbt/utils/iter/powerset.hpp
+   src/xbt/utils/iter/LazyKSubsets.hpp
+   src/xbt/utils/iter/LazyPowerset.hpp
    )
  
  if(HAVE_MMALLOC)
@@@ -793,9 -797,6 +797,9 @@@ set(DOC_SOURCE
    docs/source/_static/css/custom.css
    docs/source/_templates/breadcrumbs.html
  
 +  docs/source/img/design-scheduling-parallel.svg
 +  docs/source/img/design-scheduling-simulatedtime.svg
 +  docs/source/img/design-scheduling-wallclock.svg
    docs/source/img/eclipseScreenShot.png
    docs/source/img/extlink.png
    docs/source/img/extlink.svg