[issue559] Switch to Task-Independent Components.

driver/aliases.py

@@ -7,9 +7,9 @@
 
 ALIASES["seq-sat-fd-autotune-1"] = [
     "--search",
-    "let(hff, ff(transform=adapt_costs(one)),"
+    "let(hff, eval_modify_costs(ff(),cost_type=one),"
     "let(hcea, cea(),"
-    "let(hcg, cg(transform=adapt_costs(plusone)),"
+    "let(hcg, eval_modify_costs(cg(),cost_type=plusone),"
     "let(hgc, goalcount(),"
     "let(hAdd, add(),"
     """iterated([
@@ -51,9 +51,9 @@
 
 ALIASES["seq-sat-fd-autotune-2"] = [
     "--search",
-    "let(hcea, cea(transform=adapt_costs(plusone)),"
-    "let(hcg, cg(transform=adapt_costs(one)),"
-    "let(hgc, goalcount(transform=adapt_costs(plusone)),"
+    "let(hcea, eval_modify_costs(cea(),cost_type=plusone),"
+    "let(hcg, eval_modify_costs(cg(),cost_type=one),"
+    "let(hgc, eval_modify_costs(goalcount(),cost_type=plusone),"
     "let(hff, ff(),"
     """iterated([
 ehc(hcea,preferred=[hcea],preferred_usage=prune_by_preferred,cost_type=normal),
@@ -103,10 +103,10 @@ def _get_lama(pref):
             lazy_wastar([hff,hlm],preferred=[hff,hlm],w=1)
          ],repeat_last=true,continue_on_fail=true)))""",
         "--if-non-unit-cost",
-        f"let(hlm1, landmark_sum(lm_reasonable_orders_hps(lm_rhw()),transform=adapt_costs(one),pref={pref}),"
-        "let(hff1, ff(transform=adapt_costs(one)),"
-        f"let(hlm2, landmark_sum(lm_reasonable_orders_hps(lm_rhw()),transform=adapt_costs(plusone),pref={pref}),"
-        "let(hff2, ff(transform=adapt_costs(plusone)),"
+        f"let(hlm1, eval_modify_costs(landmark_sum(lm_reasonable_orders_hps(lm_rhw()),pref={pref}),cost_type=one),"
+        "let(hff1, eval_modify_costs(ff(),cost_type=one),"
+        f"let(hlm2, eval_modify_costs(landmark_sum(lm_reasonable_orders_hps(lm_rhw()),pref={pref}),cost_type=plusone),"
+        "let(hff2, eval_modify_costs(ff(),cost_type=plusone),"
         """iterated([
             lazy_greedy([hff1,hlm1],preferred=[hff1,hlm1],
                  cost_type=one,reopen_closed=false),
@@ -126,8 +126,8 @@ def _get_lama(pref):
 
 ALIASES["lama-first"] = [
     "--search",
-    "let(hlm, landmark_sum(lm_factory=lm_reasonable_orders_hps(lm_rhw()),transform=adapt_costs(one),pref=false),"
-    "let(hff, ff(transform=adapt_costs(one)),"
+    "let(hlm, eval_modify_costs(landmark_sum(lm_factory=lm_reasonable_orders_hps(lm_rhw()),pref=false),cost_type=one),"
+    "let(hff, eval_modify_costs(ff(),cost_type=one),"
     """lazy_greedy([hff,hlm],preferred=[hff,hlm],
                                cost_type=one,reopen_closed=false)))"""]
 

driver/portfolio_runner.py

@@ -28,14 +28,6 @@
 DEFAULT_TIMEOUT = 1800
 
 
-def adapt_heuristic_cost_type(arg, cost_type):
-    if cost_type == "normal":
-        transform = "no_transform()"
-    else:
-        transform = "adapt_costs({})".format(cost_type)
-    return arg.replace("H_COST_TRANSFORM", transform)
-
-
 def adapt_args(args, search_cost_type, heuristic_cost_type, plan_manager):
     g_bound = plan_manager.get_next_portfolio_cost_bound()
     plan_counter = plan_manager.get_plan_counter()
@@ -45,7 +37,7 @@ def adapt_args(args, search_cost_type, heuristic_cost_type, plan_manager):
     for index, arg in enumerate(args):
         if arg == "--evaluator" or arg == "--heuristic":
             heuristic = args[index + 1]
-            heuristic = adapt_heuristic_cost_type(heuristic, heuristic_cost_type)
+            heuristic = heuristic.replace("H_COST_TYPE", str(heuristic_cost_type))
             args[index + 1] = heuristic
         elif arg == "--search":
             search = args[index + 1]
@@ -56,9 +48,9 @@ def adapt_args(args, search_cost_type, heuristic_cost_type, plan_manager):
                     "See the FDSS portfolios for examples.")
             for name, value in [
                     ("BOUND", g_bound),
+                    ("H_COST_TYPE", heuristic_cost_type),
                     ("S_COST_TYPE", search_cost_type)]:
                 search = search.replace(name, str(value))
-            search = adapt_heuristic_cost_type(search, heuristic_cost_type)
             args[index + 1] = search
             break
 
@@ -109,7 +101,7 @@ def run_sat_config(configs, pos, search_cost_type, heuristic_cost_type,
 
 def run_sat(configs, executable, sas_file, plan_manager, final_config,
             final_config_builder, timeout, memory):
-    # If the configuration contains S_COST_TYPE or H_COST_TRANSFORM and the task
+    # If the configuration contains S_COST_TYPE or H_COST_TYPE and the task
     # has non-unit costs, we start by treating all costs as one. When we find
     # a solution, we rerun the successful config with real costs.
     heuristic_cost_type = "one"
@@ -182,7 +174,7 @@ def run_opt(configs, executable, sas_file, plan_manager, timeout, memory):
 
 
 def can_change_cost_type(args):
-    return any("S_COST_TYPE" in part or "H_COST_TRANSFORM" in part for part in args)
+    return any("S_COST_TYPE" in part or "H_COST_TYPE" in part for part in args)
 
 
 def get_portfolio_attributes(portfolio: Path):

driver/portfolios/seq_sat_fdss_1.py

@@ -3,73 +3,73 @@
 CONFIGS = [
     # alt_lazy_ff_cg
     (49, ["--search",
-          "let(hff, ff(transform=H_COST_TRANSFORM),"
-          "let(hcg, cg(transform=H_COST_TRANSFORM),"
+          "let(hff, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
+          "let(hcg, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "lazy_greedy([hff,hcg],preferred=[hff,hcg],cost_type=S_COST_TYPE,bound=BOUND)))"]),
     # lazy_greedy_ff_1
     (171, ["--search",
-           "let(h, ff(transform=H_COST_TRANSFORM),"
+           "let(h, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
            "lazy_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # alt_lazy_cea_cg
     (27, ["--search",
-          "let(hcea, cea(transform=H_COST_TRANSFORM),"
-          "let(hcg, cg(transform=H_COST_TRANSFORM),"
+          "let(hcea, eval_modify_costs(cea(),cost_type=H_COST_TYPE),"
+          "let(hcg, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "lazy_greedy([hcea,hcg],preferred=[hcea,hcg],cost_type=S_COST_TYPE,bound=BOUND)))"]),
     # lazy_wa3_ff_1
     (340, ["--search",
-           "let(h, ff(transform=H_COST_TRANSFORM),"
+           "let(h, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
            "lazy_wastar([h],w=3,preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # alt_eager_ff_cg
     (76, ["--search",
-          "let(hff, ff(transform=H_COST_TRANSFORM),"
-          "let(hcg, cg(transform=H_COST_TRANSFORM),"
+          "let(hff, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
+          "let(hcg, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "eager_greedy([hff,hcg],preferred=[hff,hcg],cost_type=S_COST_TYPE,bound=BOUND)))"]),
     # eager_greedy_ff_1
     (88, ["--search",
-          "let(h, ff(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
           "eager_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # alt_eager_ff_add
     (90, ["--search",
-          "let(hff, ff(transform=H_COST_TRANSFORM),"
-          "let(hadd, add(transform=H_COST_TRANSFORM),"
+          "let(hff, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
+          "let(hadd, eval_modify_costs(add(),cost_type=H_COST_TYPE),"
           "eager_greedy([hff,hadd],preferred=[hff,hadd],cost_type=S_COST_TYPE,bound=BOUND)))"]),
     # lazy_greedy_cea_1
     (56, ["--search",
-          "let(h, cea(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cea(),cost_type=H_COST_TYPE),"
           "lazy_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # alt_eager_ff_cea_cg
     (73, ["--search",
-          "let(hff, ff(transform=H_COST_TRANSFORM),"
-          "let(hcea, cea(transform=H_COST_TRANSFORM),"
-          "let(hcg, cg(transform=H_COST_TRANSFORM),"
+          "let(hff, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
+          "let(hcea, eval_modify_costs(cea(),cost_type=H_COST_TYPE),"
+          "let(hcg, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "eager_greedy([hff,hcea,hcg],preferred=[hff,hcea,hcg],cost_type=S_COST_TYPE,bound=BOUND))))"]),
     # lazy_wa3_add_1
     (50, ["--search",
-          "let(h, add(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(add(),cost_type=H_COST_TYPE),"
           "lazy_wastar([h],w=3,preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # eager_greedy_cea_1
     (84, ["--search",
-          "let(h, cea(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cea(),cost_type=H_COST_TYPE),"
           "eager_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # eager_wa3_add_1
     (166, ["--search",
-           "let(h, add(transform=H_COST_TRANSFORM),"
+           "let(h, eval_modify_costs(add(),cost_type=H_COST_TYPE),"
            "eager(single(sum([g(),weight(h,3)])),preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # eager_wa3_ff_1
     (87, ["--search",
-          "let(h, ff(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
           "eager(single(sum([g(),weight(h,3)])),preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # lazy_wa3_cg_1
     (73, ["--search",
-          "let(h, cg(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "lazy_wastar([h],w=3,preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # eager_wa3_cg_1
     (89, ["--search",
-          "let(h, cg(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "eager(single(sum([g(),weight(h,3)])),preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
      ]
 
 FINAL_CONFIG = [
     "--search",
-    "let(h, ff(transform=H_COST_TRANSFORM),"
+    "let(h, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
     "iterated([eager(single(sum([g(),weight(h,3)])),preferred=[h],cost_type=S_COST_TYPE,bound=BOUND)],bound=BOUND,repeat_last=true))"]

driver/portfolios/seq_sat_fdss_2.py

@@ -6,35 +6,35 @@
 CONFIGS = [
     # eager_greedy_ff
     (330, ["--search",
-          "let(h, ff(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
           "eager_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # lazy_greedy_ff
     (411, ["--search",
-          "let(h, ff(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(ff(),cost_type=H_COST_TYPE),"
           "lazy_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # eager_greedy_cea
     (213, ["--search",
-          "let(h, cea(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cea(),cost_type=H_COST_TYPE),"
           "eager_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # lazy_greedy_cea
     (57, ["--search",
-          "let(h, cea(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cea(),cost_type=H_COST_TYPE),"
           "lazy_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # eager_greedy_add
     (204, ["--search",
-          "let(h, add(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(add(),cost_type=H_COST_TYPE),"
           "eager_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # eager_greedy_cg
     (208, ["--search",
-          "let(h, cg(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "eager_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # lazy_greedy_cg
     (109, ["--search",
-          "let(h, cg(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(cg(),cost_type=H_COST_TYPE),"
           "lazy_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
     # lazy_greedy_add
     (63, ["--search",
-          "let(h, add(transform=H_COST_TRANSFORM),"
+          "let(h, eval_modify_costs(add(),cost_type=H_COST_TYPE),"
           "lazy_greedy([h],preferred=[h],cost_type=S_COST_TYPE,bound=BOUND))"]),
      ]