Merge pull request #524 from AmyAssist/rainTodayFix

fix will it rain today
AmyAssist · Sep 30, 2018 · dec24ef · dec24ef
2 parents 49cf905 + 8d0e188
commit dec24ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...src/main/java/de/unistuttgart/iaas/amyassist/amy/plugin/weather/WeatherSpeechCommand.java b/...src/main/java/de/unistuttgart/iaas/amyassist/amy/plugin/weather/WeatherSpeechCommand.java
@@ -279,7 +279,7 @@ private String stringifyRainCheck(double probability, String precipType, String
 			return "0% chance of rain " + suffix + "!";
 		}
 
-		return round(probability * 100) + chanceOf + precipType + suffix;
+		return round(probability * 100) + chanceOf + precipType + " " + suffix + "!";
 
 	}
 

diff --git a/plugins/weather/src/main/resources/WeatherSpeech.aim.xml b/plugins/weather/src/main/resources/WeatherSpeech.aim.xml
@@ -24,7 +24,7 @@
 				<gram>(today|tomorrow|on the weekend)</gram>
 			</EntityTemplate>
 			<EntityTemplate id="locationname" required="false">
-				<gram>*</gram>
+				<gram>+</gram>
 			</EntityTemplate>
 		</EntityTemplates>
 	</Intent>
@@ -49,4 +49,4 @@
 			</EntityTemplate>
 		</EntityTemplates>
 	</Intent>
-</AmyInteractionModel>
+</AmyInteractionModel>
-Original file line number
+Diff line change
@@ Expand Up @@
     			return "0% chance of rain " + suffix + "!";
     		}
-    		return round(probability * 100) + chanceOf + precipType + suffix;
+    		return round(probability * 100) + chanceOf + precipType + " " + suffix + "!";
     	}
@@ Expand Down @@