Merge branch 'master' of https://github.com/zake7749/Chatbot

kexiter · Dec 26, 2016 · d1ae4fa · d1ae4fa
2 parents ae4467d + 9b8541b
commit d1ae4fa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ __pycache__
 *.model
 *.log
 .DS_Store
-*log.txt
+*log.txt
+Taiba/
diff --git a/Chatbot/RuleMatcher/rule/alarm_rule.json b/Chatbot/RuleMatcher/rule/alarm_rule.json
@@ -15,7 +15,7 @@
   {
     "domain": "其他",
     "response": [
-      "鬧鐘要訂在今天幾點?"
+      "鬧鐘要訂在幾點?"
     ],
     "concepts": [
         "鬧鐘"

diff --git a/Chatbot/console.py b/Chatbot/console.py
@@ -177,7 +177,6 @@ def get_response(self, rule_id):
         """
         rule = self.rb.rules[rule_id]
         res_num = rule.has_response()
-
         if res_num == 0:
             return None
         else:

diff --git a/Chatbot/task_modules/module_switch.py b/Chatbot/task_modules/module_switch.py
@@ -24,8 +24,10 @@ def get_handler(self, domain):
             handler = medicine.MedicalListener(self.console)
         elif domain=="天氣":
             handler = Weather(self.console)
-        #elif domain=="股票":
-        #    handler = Stock(self.console)
+
+        elif domain=="股票":
+            handler = Stock(self.console)
+
         #elif domain=="購買":
         #    handler = purchase.PurchaseOperator(self.console)
         #elif domain=="吃喝玩樂":
@@ -34,5 +36,4 @@ def get_handler(self, domain):
         #    handler = hotel.HotelListener(self.console)
         else:
             pass
-            #print("[module_switch]: undefined module name '%s'" % domain)
         return handler