Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue1036 #70

Merged
merged 56 commits into from
Aug 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
d810744
Introduce past and future terminology.
ClemensBuechner May 10, 2023
55bd7ea
Fix basic progression of past landmarks.
ClemensBuechner May 10, 2023
5514517
Add use_obedient_reasonable option to reasonable orders factory.
ClemensBuechner May 10, 2023
9605cc4
Remove goal check which is no longer necessary.
ClemensBuechner May 11, 2023
20320bb
Introduce future landmarks and implement ordering progressions.
ClemensBuechner May 11, 2023
840dff1
Update landmark status correctly.
ClemensBuechner May 11, 2023
4b0f934
Add experiments.
ClemensBuechner May 11, 2023
a505fdf
Fix style.
ClemensBuechner May 11, 2023
e1214fe
Remove landmark status as detour to get to past and future information.
ClemensBuechner May 11, 2023
f5eb820
Add experiments v4.
ClemensBuechner May 11, 2023
6cdad46
Add comma.
ClemensBuechner May 12, 2023
ca0c8c3
Implement suggestions from code review.
ClemensBuechner May 12, 2023
b8802f9
Fix conditions for computing cost partitionings.
ClemensBuechner May 12, 2023
8970d66
Prettify and implement more review comments.
ClemensBuechner May 12, 2023
af13cd7
Clarify heuristic computation.
ClemensBuechner May 15, 2023
fc115f6
Consider only relevant landmarks and orderings when progressing.
ClemensBuechner May 15, 2023
ea174db
Change default for obedient-reasonable orderings.
ClemensBuechner May 15, 2023
e91c1c1
Fix greedy-necessary ordering progression.
ClemensBuechner May 15, 2023
bad208e
Add experiments v5.
ClemensBuechner May 15, 2023
0166af9
Fix style.
ClemensBuechner May 15, 2023
85e9687
Remove some tests.
ClemensBuechner May 16, 2023
07f55c1
Change IDs to pointers.
ClemensBuechner May 16, 2023
645297b
Append goal progression to basic progression.
ClemensBuechner May 17, 2023
3a9f03c
Expand comments and speed-up ordering progressions.
ClemensBuechner May 22, 2023
a3a2865
Add experiments.
ClemensBuechner May 22, 2023
83f7c23
Remove lm_is_p/f(id,state), instead add ConstBitsetView get_p/f_lms(s…
salome-eriksson Jun 13, 2023
c95b593
Add experiments v7.
salome-eriksson Jun 13, 2023
4151913
Update terminology.
ClemensBuechner Jun 13, 2023
b7fea6c
Fix style.
ClemensBuechner Jun 13, 2023
fcba1e2
Split basic and goal progression and make explicitly adding a require…
ClemensBuechner Jun 14, 2023
7e791a7
Add experiments.
ClemensBuechner Jun 14, 2023
d2c8587
Fix style.
ClemensBuechner Jun 14, 2023
8b3fae0
Allow reasonable orders for optimal planning.
ClemensBuechner Jun 14, 2023
fdae6cc
Add experiment for optimal configs.
ClemensBuechner Jun 14, 2023
4d426fa
Relax progression criterion again.
ClemensBuechner Jun 14, 2023
5e98f08
Add experiments.
ClemensBuechner Jun 14, 2023
9c96fb9
Fix goal progression condition.
ClemensBuechner Jun 16, 2023
2d44934
Add experiments.
ClemensBuechner Jun 16, 2023
d97fb70
Add base-optimal experiment.
ClemensBuechner Jun 20, 2023
5976a65
Clean up comments.
ClemensBuechner Jun 22, 2023
8ce827b
Write out future instead of fut.
ClemensBuechner Jul 9, 2023
a539730
Avoid redundant loop.
ClemensBuechner Jul 9, 2023
b01a757
Move comment.
ClemensBuechner Jul 9, 2023
49099be
Remove option for obedient-reasonable orderings.
ClemensBuechner Jul 9, 2023
0b1c9d0
Swap parameter ordering.
ClemensBuechner Jul 9, 2023
d09e915
Add page numbers to reference.
ClemensBuechner Jul 15, 2023
ffed417
Remove experiments.
ClemensBuechner Jul 17, 2023
daeb1b0
Fix style.
ClemensBuechner Jul 17, 2023
a368089
Implement more ideomatic way to deal with const bitset views.
ClemensBuechner Jul 21, 2023
7e2f02b
Clean up initial state progression.
ClemensBuechner Jul 21, 2023
d70f0ee
Rename progress_basic to progress_landmarks.
ClemensBuechner Jul 21, 2023
d408e28
Remove document note about obedient-reasonable orderings.
ClemensBuechner Jul 21, 2023
364c96d
Clarify initial state progression further.
ClemensBuechner Jul 21, 2023
8fe44d2
Clarify comment.
ClemensBuechner Jul 21, 2023
9a11e00
Merge branch 'main' into issue1036.
ClemensBuechner Jul 21, 2023
d3a1e1e
Merge branch 'main' into issue1036.
ClemensBuechner Aug 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/search/landmarks/landmark_status_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static vector<pair<LandmarkNode *, vector<LandmarkNode *>>> get_greedy_necessary
const LandmarkGraph &graph) {
vector<pair<LandmarkNode *, vector<LandmarkNode *>>> orderings;
for (auto &node : graph.get_nodes()) {
vector<LandmarkNode *> greedy_necessary_children{};
vector<LandmarkNode *> greedy_necessary_children;
for (auto &child : node->children) {
if (child.second == EdgeType::GREEDY_NECESSARY) {
greedy_necessary_children.push_back(child.first);
Expand All @@ -37,7 +37,7 @@ static vector<pair<LandmarkNode *, vector<LandmarkNode *>>> get_reasonable_paren
const LandmarkGraph &graph) {
vector<pair<LandmarkNode *, vector<LandmarkNode *>>> orderings;
for (auto &node : graph.get_nodes()) {
vector<LandmarkNode *> reasonable_parents{};
vector<LandmarkNode *> reasonable_parents;
for (auto &parent : node->parents) {
if (parent.second == EdgeType::REASONABLE) {
reasonable_parents.push_back(parent.first);
Expand All @@ -50,11 +50,6 @@ static vector<pair<LandmarkNode *, vector<LandmarkNode *>>> get_reasonable_paren
return orderings;
}

/*
By default we mark all landmarks past, since it is the neutral element for
set intersection which we emulate in the progression. Similarly, no landmarks
are future which is the neutral element for set union.
*/
LandmarkStatusManager::LandmarkStatusManager(
LandmarkGraph &graph,
bool progress_goals,
Expand All @@ -71,6 +66,11 @@ LandmarkStatusManager::LandmarkStatusManager(
progress_reasonable_orderings
? get_reasonable_parents(graph)
: vector<pair<LandmarkNode *, vector<LandmarkNode *>>>{}),
/*
By default we mark all landmarks past, since it is the neutral element
for set intersection which we emulate in the progression. Similarly, no
landmarks are future which is the neutral element for set union.
ClemensBuechner marked this conversation as resolved.
Show resolved Hide resolved
*/
past_landmarks(vector<bool>(graph.get_num_landmarks(), true)),
future_landmarks(vector<bool>(graph.get_num_landmarks(), false)) {
}
Expand Down