Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(14585)

Issue 5311065: issue232

Can't Edit
Can't Publish+Mail
Start Review
Created:
12 years, 5 months ago by Moritz
Modified:
11 years, 6 months ago
Visibility:
Public.

Patch Set 1 #

Patch Set 2 : some small fixes #

Patch Set 3 : removed debugging messages #

Total comments: 14
Unified diffs Side-by-side diffs Delta from patch set Stats (+1531 lines, -431 lines) Patch
A new-scripts/auto_doc.py View 1 1 chunk +183 lines, -0 lines 0 comments Download
M new-scripts/external/txt2tags.py View 1 chunk +8 lines, -5 lines 0 comments Download
M src/search/Makefile View 1 chunk +1 line, -0 lines 0 comments Download
M src/search/additive_heuristic.cc View 2 chunks +15 lines, -2 lines 0 comments Download
M src/search/blind_search_heuristic.cc View 2 chunks +14 lines, -2 lines 0 comments Download
M src/search/cea_heuristic.cc View 2 chunks +15 lines, -2 lines 0 comments Download
M src/search/cg_heuristic.cc View 2 chunks +15 lines, -2 lines 0 comments Download
M src/search/eager_search.cc View 4 chunks +57 lines, -20 lines 0 comments Download
M src/search/enforced_hill_climbing_search.cc View 1 chunk +9 lines, -9 lines 0 comments Download
M src/search/ff_heuristic.cc View 2 chunks +15 lines, -2 lines 0 comments Download
M src/search/g_evaluator.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M src/search/goal_count_heuristic.cc View 2 chunks +11 lines, -2 lines 0 comments Download
M src/search/heuristic.cc View 1 chunk +16 lines, -1 line 0 comments Download
M src/search/hm_heuristic.cc View 2 chunks +19 lines, -3 lines 0 comments Download
M src/search/ipc_max_heuristic.cc View 2 chunks +4 lines, -2 lines 0 comments Download
M src/search/iterated_search.cc View 1 chunk +36 lines, -11 lines 0 comments Download
M src/search/landmarks/h_m_landmarks.cc View 1 chunk +9 lines, -1 line 0 comments Download
M src/search/landmarks/lama_ff_synergy.cc View 2 chunks +14 lines, -5 lines 0 comments Download
M src/search/landmarks/landmark_count_heuristic.cc View 1 2 chunks +47 lines, -7 lines 2 comments Download
M src/search/landmarks/landmark_factory_rpg_exhaust.cc View 1 chunk +7 lines, -0 lines 0 comments Download
M src/search/landmarks/landmark_factory_rpg_sasp.cc View 1 chunk +8 lines, -0 lines 0 comments Download
M src/search/landmarks/landmark_factory_zhu_givan.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M src/search/landmarks/landmark_graph.cc View 1 chunk +12 lines, -12 lines 0 comments Download
M src/search/landmarks/landmark_graph_merged.cc View 1 chunk +14 lines, -0 lines 0 comments Download
M src/search/lazy_search.cc View 3 chunks +47 lines, -18 lines 2 comments Download
M src/search/learning/selective_max_heuristic.cc View 1 2 chunks +35 lines, -15 lines 2 comments Download
M src/search/lm_cut_heuristic.cc View 2 chunks +11 lines, -2 lines 0 comments Download
M src/search/max_heuristic.cc View 2 chunks +15 lines, -2 lines 0 comments Download
M src/search/merge_and_shrink/merge_and_shrink_heuristic.cc View 1 3 chunks +58 lines, -12 lines 0 comments Download
M src/search/merge_and_shrink/shrink_bisimulation.cc View 1 2 chunks +9 lines, -5 lines 0 comments Download
M src/search/merge_and_shrink/shrink_fh.cc View 1 chunk +8 lines, -2 lines 0 comments Download
M src/search/merge_and_shrink/shrink_random.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M src/search/merge_and_shrink/shrink_strategy.cc View 1 1 chunk +4 lines, -4 lines 0 comments Download
M src/search/open_lists/alternation_open_list.cc View 1 chunk +27 lines, -3 lines 2 comments Download
M src/search/open_lists/open_list_buckets.cc View 2 chunks +8 lines, -6 lines 2 comments Download
M src/search/open_lists/pareto_open_list.cc View 1 chunk +16 lines, -6 lines 0 comments Download
M src/search/open_lists/standard_scalar_open_list.cc View 2 chunks +8 lines, -9 lines 0 comments Download
M src/search/open_lists/tiebreaking_open_list.cc View 1 chunk +7 lines, -5 lines 0 comments Download
M src/search/option_parser.h View 1 2 5 chunks +113 lines, -115 lines 0 comments Download
M src/search/option_parser.cc View 1 2 10 chunks +75 lines, -44 lines 0 comments Download
M src/search/option_parser_util.h View 4 chunks +168 lines, -51 lines 0 comments Download
A src/search/option_parser_util.cc View 1 chunk +314 lines, -0 lines 0 comments Download
M src/search/pdbs/canonical_pdbs_heuristic.cc View 2 chunks +3 lines, -2 lines 0 comments Download
M src/search/pdbs/pattern_generation_edelkamp.cc View 2 chunks +10 lines, -7 lines 0 comments Download
M src/search/pdbs/pattern_generation_haslum.cc View 2 chunks +12 lines, -9 lines 2 comments Download
M src/search/pdbs/pdb_heuristic.cc View 2 chunks +7 lines, -4 lines 0 comments Download
M src/search/pdbs/util.cc View 1 chunk +3 lines, -1 line 0 comments Download
M src/search/pdbs/zero_one_pdbs_heuristic.cc View 2 chunks +3 lines, -2 lines 0 comments Download
M src/search/plugin.h View 1 chunk +0 lines, -9 lines 0 comments Download
M src/search/pref_evaluator.cc View 1 chunk +3 lines, -1 line 0 comments Download
M src/search/search_engine.cc View 1 chunk +16 lines, -5 lines 2 comments Download
M src/search/sum_evaluator.cc View 1 chunk +5 lines, -1 line 0 comments Download
M src/search/weighted_evaluator.cc View 2 chunks +6 lines, -3 lines 0 comments Download

Messages

Total messages: 3
Moritz
12 years, 5 months ago (2011-10-27 14:49:11 UTC) #1
karpase
Looks good to me. I just had a few very minor comments. Cheers, Erez. http://codereview.appspot.com/5311065/diff/56/src/search/landmarks/landmark_count_heuristic.cc ...
11 years, 6 months ago (2012-10-24 13:49:19 UTC) #2
malte.helmert
11 years, 6 months ago (2012-10-24 16:50:11 UTC) #3
Everything dealt with and pushed, but not yet integrated to the default branch.
I'll wait for Florian's experiments with that. Thanks again!

http://codereview.appspot.com/5311065/diff/56/src/search/landmarks/landmark_c...
File src/search/landmarks/landmark_count_heuristic.cc (right):

http://codereview.appspot.com/5311065/diff/56/src/search/landmarks/landmark_c...
src/search/landmarks/landmark_count_heuristic.cc:286: "supported if
`admissible=false` (but may behave stupidly and unsave)");
On 2012/10/24 13:49:19, karpase wrote:
> unsave = lead to an unsafe heuristic

Changed.

http://codereview.appspot.com/5311065/diff/56/src/search/lazy_search.cc
File src/search/lazy_search.cc (left):

http://codereview.appspot.com/5311065/diff/56/src/search/lazy_search.cc#oldco...
src/search/lazy_search.cc:273: parser.add_list_option<ScalarEvaluator
*>("evals");
On 2012/10/24 13:49:19, karpase wrote:
> Shouldn't there be a second parameter saying "Scalar Evaluators"?

Yes, I think so. Added.

http://codereview.appspot.com/5311065/diff/56/src/search/learning/selective_m...
File src/search/learning/selective_max_heuristic.cc (left):

http://codereview.appspot.com/5311065/diff/56/src/search/learning/selective_m...
src/search/learning/selective_max_heuristic.cc:576:
sample_types.push_back("PDB");
On 2012/10/24 13:49:19, karpase wrote:
> Can you add descriptions for these?
> Probe = stochastic hill-climbing probes of Karpas & Domshlak, IJCAI 2009
> ProbAStar = Probabilistic A* sampling
> PDB = Sampling method of Haslum et. al., AAAI 2007

I've added these following the example of the cost_type enum in heuristic.cc.

http://codereview.appspot.com/5311065/diff/56/src/search/open_lists/alternati...
File src/search/open_lists/alternation_open_list.cc (right):

http://codereview.appspot.com/5311065/diff/56/src/search/open_lists/alternati...
src/search/open_lists/alternation_open_list.cc:23: "or at least one reliable
open list considers is a dead end. "
On 2012/10/24 13:49:19, karpase wrote:
> is -> it

Done.

http://codereview.appspot.com/5311065/diff/56/src/search/open_lists/open_list...
File src/search/open_lists/open_list_buckets.cc (right):

http://codereview.appspot.com/5311065/diff/56/src/search/open_lists/open_list...
src/search/open_lists/open_list_buckets.cc:25: parser.add_option<ScalarEvaluator
*>("eval", "scalar evaluator");
On 2012/10/24 13:49:19, karpase wrote:
> Did evals change to eval on purpose?

Definitely looks intentional. It's been years since I understood all the details
of our evaluators machinery, but I think we should see in our tests if anything
breaks (e.g. because we're passing in a list on the command line).

http://codereview.appspot.com/5311065/diff/56/src/search/pdbs/pattern_generat...
File src/search/pdbs/pattern_generation_haslum.cc (right):

http://codereview.appspot.com/5311065/diff/56/src/search/pdbs/pattern_generat...
src/search/pdbs/pattern_generation_haslum.cc:275:
parser.document_synopsis("Improvement(?) PDB", "");
On 2012/10/24 13:49:19, karpase wrote:
> This is from Haslum et. al, AAAI 2007.
> I don't know what to call it either.

Stands for "incremental PDB", I think, but it was only an internal name until we
recently mentioned it in our SoCS paper on PDB implementations. Probably more
people understand it as "iPDB" than "incremental PDB", so I've left it at "iPDB"
and added literature references to the Haslum et al. paper and the SoCS paper.

http://codereview.appspot.com/5311065/diff/56/src/search/search_engine.cc
File src/search/search_engine.cc (right):

http://codereview.appspot.com/5311065/diff/56/src/search/search_engine.cc#new...
src/search/search_engine.cc:76: "all actions are accounted for with their real
cost");
On 2012/10/24 13:49:19, karpase wrote:
> This is duplicated.
> It might be worthwhile to put this in a central place (globals?)

Good catch! I've unified it in operator_cost.cc. The two main callers of this
(heuristics and search engines) now use common code, which required rephrasing
the documentation a bit since it was different in the two cases, but I think the
new phrasing is fine.

The third piece of related code is the lm_cost_type option of landmark
factories. I've only added a TODO there since that option should be going away
after further cleanup anyway.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b