Skip to content

Commit 7268736

Browse files
committed
remove flip
1 parent 8875cc3 commit 7268736

7 files changed

Lines changed: 30 additions & 30 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ You should have a `pddl-examples` folder containing PDDL instances.
6969

7070
```python
7171
from jupyddl import AutomatedPlanner # takes some time because it has to instantiate the Julia interface
72-
apl = AutomatedPlanner("pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl)
72+
apl = AutomatedPlanner("pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl)
7373

7474
apl.initial_state
7575
<PyCall.jlwrap PDDL.State(Set(Julog.Term[row(r1), column(c3), row(r3), row(r2), column(c2), column(c1)]), Set(Julog.Term[white(r2, c1), white(r1, c2), white(r3, c2), white(r2, c3)]), Dict{Symbol,Any}())>
@@ -102,7 +102,7 @@ from jupyddl import DataAnalyst
102102
da = DataAnalyst()
103103
da.plot_astar() # plots complexity statistics for all the problem.pddl/domain.pddl couples in the pddl-examples/ folder
104104

105-
da.plot_astar(problem="pddl-examples/flip/problem.pddl", domain="pddl-examples/flip/domain.pddl") # scatter complexity statistics for the provided pddl
105+
da.plot_astar(problem="pddl-examples/dinner/problem.pddl", domain="pddl-examples/dinner/domain.pddl") # scatter complexity statistics for the provided pddl
106106

107107
da.plot_astar(heuristic_key="basic/zero") # use h=0 instead of goal_count for your computation
108108

jupyddl/data_analyst.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __get_all_pddl_from_data(self, max_pddl_instances=-1):
4242
return domains_problems
4343
return domains_problems
4444
return [
45-
("pddl-examples/flip/problem.pddl", "pddl-examples/flip/domain.pddl"),
45+
("pddl-examples/dinner/problem.pddl", "pddl-examples/dinner/domain.pddl"),
4646
("pddl-examples/dinner/problem.pddl", "pddl-examples/dinner/domain.pddl"),
4747
]
4848

tests/test_astar.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010

1111
def test_astar_basic():
1212
apla = AutomatedPlanner(
13-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
13+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
1414
)
1515
heuristic = BasicHeuristic(apla, "basic/goal_count")
1616
astar = AStarBestFirstSearch(apla, heuristic.compute)
1717
assert astar.init.h_cost == heuristic.compute(apla.initial_state)
1818

1919
def test_astar_delete_relaxation():
2020
apla = AutomatedPlanner(
21-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
21+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
2222
)
2323
heuristic = DeleteRelaxationHeuristic(apla, "delete_relaxation/h_max")
2424
astar = AStarBestFirstSearch(apla, heuristic.compute)
2525
assert astar.init.h_cost == heuristic.compute(apla.initial_state)
2626

2727
def test_astar_goal():
2828
apla = AutomatedPlanner(
29-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
29+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
3030
)
3131
heuristic = BasicHeuristic(apla, "basic/goal_count")
3232
astar = AStarBestFirstSearch(apla, heuristic.compute)
@@ -36,7 +36,7 @@ def test_astar_goal():
3636

3737
def test_astar_path_length():
3838
apla = AutomatedPlanner(
39-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
39+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
4040
)
4141
path, _, _ = apla.astar_best_first_search()
4242
assert len(path) > 0

tests/test_automated_planner.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99

1010
def test_parsing():
1111
apla = AutomatedPlanner(
12-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
12+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
1313
)
1414
assert str(apla.problem) != "" and str(apla.domain) != ""
1515

1616

1717
def test_available_actions():
1818
apla = AutomatedPlanner(
19-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
19+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
2020
)
2121
actions = apla.available_actions(apla.initial_state)
2222
assert len(actions) > 0
2323

2424

2525
def test_execute_action():
2626
apla = AutomatedPlanner(
27-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
27+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
2828
)
2929
actions = apla.available_actions(apla.initial_state)
3030
new_state = apla.transition(apla.initial_state, actions[0])
@@ -33,14 +33,14 @@ def test_execute_action():
3333

3434
def test_state_has_term():
3535
apla = AutomatedPlanner(
36-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
36+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
3737
)
3838
is_goal = apla.state_has_term(apla.initial_state, apla.goals[0])
3939
assert not is_goal
4040

4141

4242
def test_state_assertion():
4343
apla = AutomatedPlanner(
44-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
44+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
4545
)
4646
assert not apla.satisfies(apla.problem.goal, apla.initial_state)

tests/test_data_analyst.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,43 @@ def test_heuristics_comparer():
2020
def test_heuristics_comparer_single():
2121
da = DataAnalyst()
2222
da.comparative_astar_heuristic_plot(
23-
domain="pddl-examples/flip/domain.pddl",
24-
problem="pddl-examples/flip/problem.pddl",
23+
domain="pddl-examples/dinner/domain.pddl",
24+
problem="pddl-examples/dinner/problem.pddl",
2525
)
2626

2727

2828
def test_data_analyst_plot_dfs_one_pddl():
2929
da = DataAnalyst()
3030
da.plot_dfs(
31-
domain="pddl-examples/flip/domain.pddl",
32-
problem="pddl-examples/flip/problem.pddl",
31+
domain="pddl-examples/dinner/domain.pddl",
32+
problem="pddl-examples/dinner/problem.pddl",
3333
)
3434
assert True
3535

3636

3737
def test_data_analyst_plot_bfs_one_pddl():
3838
da = DataAnalyst()
3939
da.plot_bfs(
40-
domain="pddl-examples/flip/domain.pddl",
41-
problem="pddl-examples/flip/problem.pddl",
40+
domain="pddl-examples/dinner/domain.pddl",
41+
problem="pddl-examples/dinner/problem.pddl",
4242
)
4343
assert True
4444

4545

4646
def test_data_analyst_plot_dijkstra_one_pddl():
4747
da = DataAnalyst()
4848
da.plot_dijkstra(
49-
domain="pddl-examples/flip/domain.pddl",
50-
problem="pddl-examples/flip/problem.pddl",
49+
domain="pddl-examples/dinner/domain.pddl",
50+
problem="pddl-examples/dinner/problem.pddl",
5151
)
5252
assert True
5353

5454

5555
def test_data_analyst_plot_astar_h_goal_count_one_pddl():
5656
da = DataAnalyst()
5757
da.plot_astar(
58-
domain="pddl-examples/flip/domain.pddl",
59-
problem="pddl-examples/flip/problem.pddl",
58+
domain="pddl-examples/dinner/domain.pddl",
59+
problem="pddl-examples/dinner/problem.pddl",
6060
)
6161
assert True
6262

@@ -150,17 +150,17 @@ def test_comparative_one_pddl():
150150
da.comparative_data_plot(
151151
dfs=False,
152152
bfs=False,
153-
domain="pddl-examples/flip/domain.pddl",
154-
problem="pddl-examples/flip/problem.pddl",
153+
domain="pddl-examples/dinner/domain.pddl",
154+
problem="pddl-examples/dinner/problem.pddl",
155155
)
156156
assert True
157157

158158

159159
def test_comparative_use_data_json():
160160
da = DataAnalyst()
161161
da.comparative_data_plot(
162-
domain="pddl-examples/flip/domain.pddl",
163-
problem="pddl-examples/flip/problem.pddl",
162+
domain="pddl-examples/dinner/domain.pddl",
163+
problem="pddl-examples/dinner/problem.pddl",
164164
collect_new_data=False,
165165
)
166166
assert True
@@ -169,8 +169,8 @@ def test_comparative_use_data_json():
169169
def test_comparative_zero_h():
170170
da = DataAnalyst()
171171
da.comparative_data_plot(
172-
domain="pddl-examples/flip/domain.pddl",
173-
problem="pddl-examples/flip/problem.pddl",
172+
domain="pddl-examples/dinner/domain.pddl",
173+
problem="pddl-examples/dinner/problem.pddl",
174174
heuristic_key="zero",
175175
)
176176
assert True

tests/test_heuristics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
def test_zero_heuristic():
1818
apla = AutomatedPlanner(
19-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
19+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
2020
)
2121
heuristic = hs.BasicHeuristic(apla, "basic/zero")
2222
h = heuristic.compute(apla.initial_state)

tests/test_search.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_search_dfs():
2020

2121
def test_search_bfs():
2222
apla = AutomatedPlanner(
23-
"pddl-examples/flip/domain.pddl", "pddl-examples/flip/problem.pddl"
23+
"pddl-examples/dinner/domain.pddl", "pddl-examples/dinner/problem.pddl"
2424
)
2525
bfs = BreadthFirstSearch(apla)
2626
res = bfs.search() # Path, computation time, opened nodes

0 commit comments

Comments
 (0)