mirror of
https://github.com/Mobile-Robotics-W20-Team-9/UMICH-NCLT-SLAP.git
synced 2025-09-08 04:03:14 +00:00
tweaked buildings model for improved performance and added flags to chabot to allow for emergency stop, completion notification, and start nav flags to be sent to main (sending to main functionality pending
This commit is contained in:
Binary file not shown.
@@ -21,6 +21,9 @@ buildingsIntents = json.loads(open('intents/buildingIntents.json').read())
|
|||||||
building_words = pickle.load(open('pickles/building_words.pkl','rb'))
|
building_words = pickle.load(open('pickles/building_words.pkl','rb'))
|
||||||
buildings = pickle.load(open('pickles/buildings.pkl','rb'))
|
buildings = pickle.load(open('pickles/buildings.pkl','rb'))
|
||||||
confirmation = 0
|
confirmation = 0
|
||||||
|
startNav = 0 #TODO: START CONVERSION TO GPS COORDINATES
|
||||||
|
completedNav = 0 #TODO: Add response once complete
|
||||||
|
emergencyExit = 0 #TODO: OPTIONAL STOP EVERYTHING
|
||||||
|
|
||||||
def clean_up_sentence(sentence):
|
def clean_up_sentence(sentence):
|
||||||
# tokenize the pattern - splitting words into array
|
# tokenize the pattern - splitting words into array
|
||||||
@@ -116,14 +119,19 @@ def send():
|
|||||||
|
|
||||||
ints = predict_class(msg)
|
ints = predict_class(msg)
|
||||||
global confirmation
|
global confirmation
|
||||||
if (ints[0]['intent'] == "yes" or ints[0]['intent'] == "no") and confirmation == 1:
|
global startNav
|
||||||
|
global emergencyExit
|
||||||
|
# adds rule based chatbot to confirm navigation
|
||||||
|
if (ints[0]['intent'] == "yes" or ints[0]['intent'] == "no") and confirmation == 1 and startNav == 0:
|
||||||
|
emergencyExit = 0
|
||||||
if ints[0]['intent'] == "yes":
|
if ints[0]['intent'] == "yes":
|
||||||
res = "Starting navigation. Please wait for process to complete. This may take a couple minutes."
|
res = "Starting navigation. Please wait for process to complete. This may take a couple minutes."
|
||||||
|
startNav = 1
|
||||||
elif ints[0]['intent'] == "no":
|
elif ints[0]['intent'] == "no":
|
||||||
res = "Cancelled operation"
|
res = "Cancelled operation"
|
||||||
confirmation = 0
|
confirmation = 0
|
||||||
#TODO: START CONVERSION TO GPS COORDINATES
|
elif ints[0]['intent'] == "navigation" and startNav == 0:
|
||||||
elif ints[0]['intent'] == "navigation":
|
emergencyExit = 0
|
||||||
currbuilding = getBuildingInfo(msgClean)
|
currbuilding = getBuildingInfo(msgClean)
|
||||||
if currbuilding[0] == 'random location':
|
if currbuilding[0] == 'random location':
|
||||||
currbuilding[0] = buildings[random.randint(0, len(buildings)-1)]
|
currbuilding[0] = buildings[random.randint(0, len(buildings)-1)]
|
||||||
@@ -135,12 +143,17 @@ def send():
|
|||||||
currbuilding[1] = buildings[random.randint(0, len(buildings)-1)]
|
currbuilding[1] = buildings[random.randint(0, len(buildings)-1)]
|
||||||
fromBuild = predict_building(currbuilding[0])
|
fromBuild = predict_building(currbuilding[0])
|
||||||
toBuild = predict_building(currbuilding[1])
|
toBuild = predict_building(currbuilding[1])
|
||||||
res = "You chose navigating to " + toBuild[0]['buildingIntents'] + " building from " + fromBuild[0]['buildingIntents'] + " builing. Is this correct?"
|
res = "You chose navigating to " + toBuild[0]['buildingIntents'] + " building from " + fromBuild[0]['buildingIntents'] + " building. Is this correct?"
|
||||||
confirmation = 1
|
confirmation = 1
|
||||||
elif ints[0]['intent'] == "exit":
|
elif ints[0]['intent'] == "exit":
|
||||||
res = getResponse(ints, intents)
|
res = getResponse(ints, intents)
|
||||||
#TODO: OPTIONAL STOP EVERYTHING
|
startNav = 0
|
||||||
|
emergencyExit = 1
|
||||||
|
elif startNav == 1:
|
||||||
|
emergencyExit = 0
|
||||||
|
res = "Please wait while the navigation is processing"
|
||||||
else:
|
else:
|
||||||
|
emergencyExit = 0
|
||||||
res = getResponse(ints, intents)
|
res = getResponse(ints, intents)
|
||||||
ChatBox.insert(END, "Belatrix: " + res + '\n\n')
|
ChatBox.insert(END, "Belatrix: " + res + '\n\n')
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user