rm two pyc files

Author: sjdayday

.gitignore

@@ -2,3 +2,5 @@
 __pycache__/
 *.class
 
+*.pyc
+*.pyc

src/main/nluas/__init__.pyc

@@ -95,6 +95,7 @@ def solve(self, ntuple):
         else:
             self.ntuple = ntuple
             predicate_type = ntuple['predicate_type']
+            #print(predicate_type)
             try:
                 dispatch = getattr(self, "solve_%s" %predicate_type)
                 dispatch(ntuple)
@@ -114,7 +115,7 @@ def update_world(self, discovered=[]):
             self.world.append(item)
 
     def solve_command(self, ntuple):
-        self.route_event(ntuple['eventDescriptor'], "query")
+        self.route_event(ntuple['eventDescriptor'], "command")
         #self.decoder.pprint_ntuple(ntuple)
 
     def solve_query(self, ntuple):
@@ -171,7 +172,9 @@ def route_action(self, parameters, predicate):
                 if parameters['p_features']:
                     self.p_features = parameters['p_features']['processFeatures']
                 dispatch = getattr(self, "{}_{}".format(predicate, action))
-                return_value = dispatch(parameters)
+
+                #return_value = dispatch(parameters)
+                return_value = self.route_dispatch(dispatch, parameters)
                 self.history.insert(0, (parameters, True))
                 self.p_features = None
                 return return_value
@@ -182,15 +185,13 @@ def route_action(self, parameters, predicate):
                 self.history.insert(0, (parameters, False))
                 self.identification_failure(message)
 
+    def route_dispatch(self, dispatch_function, parameters):
+        """ Simply runs dispatch_function on PARAMETERS. """
+        return dispatch_function(parameters)
+
     def close(self):
         return
 
-    def solve_serial(self, parameters, predicate):
-        print(parameters)
-
-    def solve_serial(self, parameters, predicate):
-        print(parameters)
-
     def check_for_clarification(self, ntuple):
         """ Will need to be replaced by a process that checks whether ntuple needs clarification.
         Requires some sort of context/world model. """

src/main/nluas/app/core_solver.py

@@ -4,16 +4,6 @@
         "return_type": "error_descriptor",
         "eventDescriptor": null
     },
-    "conditional_declarative": {
-        "predicate_type": "conditional_declarative",
-        "return_type": "error_descriptor",
-        "eventDescriptor": null
-    },
-    "conditional_imperative": {
-        "predicate_type": "conditional_imperative",
-        "return_type": "error_descriptor",
-        "eventDescriptor": null
-    },
     "yn_question": {
         "predicate_type": "query",
         "return_type": "boolean",