Skip to content

Commit 7a58d24

Browse files
committed
Rename [vigir_bs_synthesizer] --> [vigir_ltl_synthesizer]
1 parent d9950e0 commit 7a58d24

File tree

11 files changed

+12
-12
lines changed

11 files changed

+12
-12
lines changed

vigir_bs_synthesizer/CMakeLists.txt vigir_ltl_synthesizer/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 2.8.3)
2-
project(vigir_bs_synthesizer)
2+
project(vigir_ltl_synthesizer)
33

44
find_package(catkin REQUIRED COMPONENTS message_generation)
55

vigir_bs_synthesizer/package.xml vigir_ltl_synthesizer/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package>
22

3-
<name>vigir_bs_synthesizer</name>
3+
<name>vigir_ltl_synthesizer</name>
44
<version>1.0.0</version>
55
<description>An interface between the Behavior Synthesis Manager and the LTL Synthesizer (slugs)</description>
66

vigir_bs_synthesizer/setup.py vigir_ltl_synthesizer/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from catkin_pkg.python_setup import generate_distutils_setup
55

66
d = generate_distutils_setup(
7-
packages = ['vigir_bs_synthesizer'],
7+
packages = ['vigir_ltl_synthesizer'],
88
package_dir = {'': 'src'}
99
)
1010

vigir_bs_synthesizer/src/vigir_bs_synthesizer/call_synthesizer.py vigir_ltl_synthesizer/src/vigir_bs_synthesizer/call_synthesizer.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import os, sys
44
import subprocess
55

6-
from vigir_bs_specification.atlas_specification import ControlModeSpecification
7-
from vigir_bs_synthesizer.StructuredSlugsParser.compiler import performConversion
6+
from vigir_ltl_specification.atlas_specification import ControlModeSpecification
7+
from vigir_ltl_synthesizer.StructuredSlugsParser.compiler import performConversion
88

99
vigir_repo = os.environ['VIGIR_ROOT_DIR']
1010

@@ -20,12 +20,12 @@
2020
# Add manipulate as a goal (system liveness requirement)
2121
my_mode_spec.add_control_mode_goal("manipulate")
2222

23-
# Write specification in .structuredslugs file in temp_bs_files folder
24-
specs_folder = os.path.join(vigir_repo, 'catkin_ws/src/vigir_behavior_synthesis/temp_bs_files')
23+
# Write specification in .structuredslugs file in synthesis_byproducts folder
24+
specs_folder = os.path.join(vigir_repo, 'catkin_ws/src/vigir_behavior_synthesis/synthesis_byproducts')
2525
structured_slugs_file, folder_path = my_mode_spec.write_structured_slugs_file(specs_folder)
2626

2727
# Prepare for conversion and synthesis using slugs
28-
# structured_parser_path = os.path.join(vigir_repo, 'catkin_ws/src/vigir_behavior_synthesis/vigir_bs_synthesizer', "StructuredSlugsParser")
28+
# structured_parser_path = os.path.join(vigir_repo, 'catkin_ws/src/vigir_behavior_synthesis/vigir_ltl_synthesizer', "StructuredSlugsParser")
2929
# sys.path.insert(0, structured_parser_path)
3030
# import conversion function from slugs' compiler.py
3131
# from compiler import performConversion

vigir_bs_synthesizer/src/vigir_bs_synthesizer/ltl_synthesis_server.py vigir_ltl_synthesizer/src/vigir_bs_synthesizer/ltl_synthesis_server.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import rospy
66
import json
77

8-
from vigir_bs_msgs.srv import LTLSynthesis, LTLSynthesisResponse
9-
from vigir_bs_msgs.msg import AutomatonState, SynthesizedAutomaton, BSErrorCodes
10-
from vigir_bs_synthesizer.StructuredSlugsParser import compiler as slugs_compiler
8+
from vigir_synthesis_msgs.srv import LTLSynthesis, LTLSynthesisResponse
9+
from vigir_synthesis_msgs.msg import AutomatonState, SynthesizedAutomaton, BSErrorCodes
10+
from vigir_ltl_synthesizer.StructuredSlugsParser import compiler as slugs_compiler
1111

1212
VIGIR_ROOT_DIR = os.environ['VIGIR_ROOT_DIR']
1313

@@ -140,7 +140,7 @@ def write_structured_slugs_from_msg(ltl_spec, name):
140140
'''...'''
141141

142142
# The directory where specs and automata are saved:
143-
specs_folder_path = os.path.join(VIGIR_ROOT_DIR, 'catkin_ws/src/vigir_behavior_synthesis/temp_bs_files')
143+
specs_folder_path = os.path.join(VIGIR_ROOT_DIR, 'catkin_ws/src/vigir_behavior_synthesis/synthesis_byproducts')
144144

145145
# The directory where this spec will be saved:
146146
this_folder_path = os.path.join(specs_folder_path, name)

0 commit comments

Comments
 (0)