Skip to content

Commit

Permalink
modify scenarios and env
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yirmandias
Yirmandias committed Oct 13, 2023
1 parent 06d6155 commit 679e467
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 16 deletions.
6 changes: 5 additions & 1 deletion simu/Scripts/Main.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,15 @@ func load_scenario(file_path : String):
output_machines.append(machine)
else:
machines.append(machine)

if !is_jobshop && scenario.has("jobshop"):
jobshop_path = scenario["jobshop"]
if jobshop_path != "":
is_jobshop = true

if is_jobshop:
#in that case load from the jobshop file specified
load_jobshop(machines, input_machines)


else:

Expand Down
34 changes: 33 additions & 1 deletion simu/environments/env_6_machines.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,33 @@
{"data":[[8,8,8,8,8,8,8,12,8,8,8,8,8,8,8,8,8,8,8],[8,3,3,3,3,3,3,11,11,11,11,11,11,3,3,3,3,3,8],[8,3,3,3,3,3,3,5,5,5,5,5,5,3,3,3,3,3,8],[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,8],[8,3,3,10,5,3,3,3,3,3,3,3,3,3,3,4,4,4,8],[8,3,3,10,5,3,3,3,3,3,5,5,3,3,3,4,4,4,8],[8,3,3,10,5,3,3,3,3,3,5,10,3,3,3,4,4,4,8],[8,3,3,9,3,3,3,3,3,3,5,10,3,3,3,4,4,4,8],[8,3,3,11,5,3,3,3,3,3,3,9,3,3,3,4,4,4,8],[8,3,3,11,5,3,3,3,3,11,11,11,3,3,3,4,4,4,8],[8,3,3,11,5,3,3,3,3,5,5,5,3,3,3,3,3,3,8],[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],[8,3,3,3,3,5,10,5,3,3,3,3,3,3,3,3,3,3,8],[8,3,3,3,3,5,10,5,3,3,3,3,3,3,3,3,3,3,8],[8,3,3,3,3,3,9,3,3,3,3,3,3,3,3,3,3,3,8],[8,3,3,3,3,5,11,5,3,3,3,3,3,3,3,3,3,3,8],[8,3,3,3,3,5,11,5,3,3,3,3,3,10,10,3,3,3,8],[8,3,3,3,3,5,11,5,3,3,3,3,3,10,5,3,3,3,8],[8,3,3,3,3,5,5,5,3,3,3,3,3,10,5,3,3,3,8],[8,3,3,3,3,3,3,3,3,3,3,3,3,9,3,3,3,3,8],[8,3,3,3,3,3,3,3,5,5,5,3,3,11,5,3,3,3,8],[8,3,10,10,5,3,3,3,5,10,5,3,3,11,5,3,5,5,8],[8,3,3,10,5,3,3,3,5,10,5,3,3,11,5,3,5,10,8],[8,3,3,10,5,3,3,3,5,10,5,3,3,3,3,3,5,10,8],[8,3,3,9,3,3,3,3,3,9,3,3,3,3,3,3,5,10,8],[8,3,3,11,5,3,3,3,3,11,5,3,3,3,3,3,5,10,8],[8,3,3,11,5,3,3,3,3,11,5,3,3,3,3,3,5,10,13],[8,3,3,11,5,3,3,3,3,11,5,3,3,3,3,3,5,5,8],[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],[8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8]],"offset":[0,0]}
{"data":[[8,8,8,8,8,8,8,12,8,8,8,8,8,8,8,8,8,8,8],
[8,3,3,3,3,3,3,11,11,11,11,11,11,3,3,3,3,3,8],
[8,3,3,3,3,3,3,5,5,5,5,5,5,3,3,3,3,3,8],
[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],
[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,8],
[8,3,3,10,5,3,3,3,3,3,3,3,3,3,3,4,4,4,8],
[8,3,3,10,5,3,3,3,3,3,5,5,3,3,3,4,4,4,8],
[8,3,3,10,5,3,3,3,3,3,5,10,3,3,3,4,4,4,8],
[8,3,3,9,3,3,3,3,3,3,5,10,3,3,3,4,4,4,8],
[8,3,3,11,5,3,3,3,3,3,3,9,3,3,3,4,4,4,8],
[8,3,3,11,5,3,3,3,3,11,11,11,3,3,3,4,4,4,8],
[8,3,3,11,5,3,3,3,3,5,5,5,3,3,3,3,3,3,8],
[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],
[8,3,3,3,3,5,10,5,3,3,3,3,3,3,3,3,3,3,8],
[8,3,3,3,3,5,10,5,3,3,3,3,3,3,3,3,3,3,8],
[8,3,3,3,3,3,9,3,3,3,3,3,3,3,3,3,3,3,8],
[8,3,3,3,3,5,11,5,3,3,3,3,3,3,3,3,3,3,8],
[8,3,3,3,3,5,11,5,3,3,3,3,3,10,10,3,3,3,8],
[8,3,3,3,3,5,11,5,3,3,3,3,3,10,5,3,3,3,8],
[8,3,3,3,3,5,5,5,3,3,3,3,3,10,5,3,3,3,8],
[8,3,3,3,3,3,3,3,3,3,3,3,3,9,3,3,3,3,8],
[8,3,3,3,3,3,3,3,5,5,5,3,3,11,5,3,3,3,8],
[8,3,10,10,5,3,3,3,5,10,5,3,3,11,5,3,5,5,8],
[8,3,3,10,5,3,3,3,5,10,5,3,3,11,5,3,5,10,8],
[8,3,3,10,5,3,3,3,5,10,5,3,3,3,3,3,5,10,8],
[8,3,3,9,3,3,3,3,3,9,3,3,3,3,3,3,5,10,8],
[8,3,3,11,5,3,3,3,3,11,5,3,3,3,3,3,5,10,8],
[8,3,3,11,5,3,3,3,3,11,5,3,3,3,3,3,5,10,13],
[8,3,3,11,5,3,3,3,3,11,5,3,3,3,3,3,5,5,8],
[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],
[8,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,8],
[8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8]],
"offset":[0,0]}
8 changes: 4 additions & 4 deletions simu/environments/new_environment.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
[8, 3, 3, 3, 3, 10, 5, 3, 3, 3, 3, 10, 10, 10, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 10, 5, 3, 3, 3, 3, 10, 3, 10, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 10, 3, 3, 3, 3, 3, 10, 3, 10, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 9, 3, 3, 3, 3, 3, 10, 3, 3, 3, 3, 3, 3, 3],
[8, 3, 3, 3, 3, 11, 5, 3, 3, 3, 3, 10, 3, 3, 3, 3, 3, 3, 3],
[8, 3, 3, 3, 3, 9, 3, 3, 3, 3, 3, 10, 3, 3, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 11, 5, 3, 3, 3, 3, 10, 3, 3, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 11, 5, 3, 3, 3, 3, 9, 3, 3, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 5, 5, 3, 3, 3, 3, 11, 3, 3, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 11, 3, 3, 3, 3, 3, 3, 8],
Expand All @@ -24,8 +24,8 @@
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 3, 3, 3, 4, 4, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 3, 4, 4, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 3, 4, 4, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8],
[8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8],
Expand Down
4 changes: 2 additions & 2 deletions simu/scenarios/new_scenario.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{"position":[7.8,16.5]}
],
"machines": [
{"position":[14,5],"possible_processes":[0,1,2]},
{"position":[17,10],"possible_processes": [2,3,4,5]}
{"possible_processes":[0,1,2]},
{"possible_processes": [2,3,4,5]}
],
"packages":[
[[0,10],[1,5]],
Expand Down
11 changes: 8 additions & 3 deletions simu/scenarios/new_scenario_multirobots.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
{"position":[7.8,16.5]},
{"position":[6.8,16.5]}
],
"environment": "res://environments/env_6_machines.json",


"packages":[
[[0,10],[1,5]],
[[0,1],[1,8],[2,6]],
[[2,3],[1,9]],
[[2,7],[0,12],
[5,4]]
],
"environment": "res://environments/env_6_machines.json"
}
10 changes: 7 additions & 3 deletions simu/scenarios/new_scenario_with_environment.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
{"position":[7.8,16.5]}
],
"machines": [
{"position":[14,5],"possible_processes":[0,1,2]},
{"position":[17,10],"possible_processes": [2,3,4,5]}
{"possible_processes":[0,1,2]},
{"possible_processes": [2,3,4,5]},
{"possible_processes":[0,1,2]},
{"possible_processes": [2,3,4,5]},
{"possible_processes":[0,1,2]},
{"possible_processes": [2,3,4,5]}
],
"packages":[
[[0,10],[1,5]],
[[0,1],[1,8],[2,6]],
[[2,3],[1,9]],
[[2,3],[1,9]],
[[2,7],[0,12],
[5,4]]
],
Expand Down
5 changes: 3 additions & 2 deletions simu/scenarios/new_scenario_with_two_robots.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
],
"machines": [
{"position":[14,5],"possible_processes":[0,1,2]},
{"position":[17,10],"possible_processes": [2,3,4,5]}
{"position":[16,11],"possible_processes": [2,3,4,5]}
],
"packages":[
[[0,10],[1,5]],
[[0,1],[1,8],[2,6]],
[[2,3],[1,9]],
[[2,7],[0,12],
[5,4]]
]
],
"environment": "res://environments/new_environment.json"
}

0 comments on commit 679e467

Please sign in to comment.