Migrated belief queries to SARL events

Mochalog Query object now wrapped in SARL BeliefQuery
event, to facilitate passing around of queries between
agents in a given space.

src/main/java/io/mochalog/sarl/beliefs/SelfBeliefs.java

@@ -16,9 +16,10 @@
 
 package io.mochalog.sarl.beliefs;
 
+import io.mochalog.sarl.beliefs.query.BeliefQuery;
+
 import io.mochalog.bridge.prolog.PrologContext;
 import io.mochalog.bridge.prolog.SandboxedPrologContext;
-import io.mochalog.bridge.prolog.query.Query;
 import io.mochalog.bridge.prolog.query.QuerySolution;
 import io.mochalog.bridge.prolog.query.QuerySolutionList;
 
@@ -51,14 +52,14 @@ public class SelfBeliefs extends Skill implements Beliefs
     private class EventBoundBeliefQuery<T extends Event> extends Behavior
     {
         // Query to perform
-        private Query query;
+        private BeliefQuery query;
 
         /**
          * Constructor.
          * @param agent Owner agent
          * @param query Query to perform
          */
-        public EventBoundBeliefQuery(Agent agent, Query query)
+        public EventBoundBeliefQuery(Agent agent, BeliefQuery query)
         {
             super(agent);
             setQuery(query);
@@ -80,7 +81,7 @@ public void onEventGuard(final T event, Collection<Runnable> handlers)
          * Set the Prolog query to perform on event
          * @param query Query to perform
          */
-        public void setQuery(Query query)
+        public void setQuery(BeliefQuery query)
         {
             this.query = query;
         }
@@ -162,9 +163,9 @@ public boolean believes(String query, Object... args)
     }
 
     @Override
-    public boolean believes(Query query)
+    public boolean believes(BeliefQuery query)
     {
-        return knowledgeBase.prove(query);
+        return knowledgeBase.prove(query.unboxedQuery);
     }
 
     @Override
@@ -174,9 +175,9 @@ public QuerySolution ask(String query, Object... args)
     }
 
     @Override
-    public QuerySolution ask(Query query)
+    public QuerySolution ask(BeliefQuery query)
     {
-        return knowledgeBase.askForSolution(query);
+        return knowledgeBase.askForSolution(query.unboxedQuery);
     }
 
     @Override
@@ -186,19 +187,19 @@ public QuerySolutionList askAll(String query, Object... args)
     }
 
     @Override
-    public QuerySolutionList askAll(Query query)
+    public QuerySolutionList askAll(BeliefQuery query)
     {
-        return knowledgeBase.askForAllSolutions(query);
+        return knowledgeBase.askForAllSolutions(query.unboxedQuery);
     }
 
     @Override
     public <T extends Event> void askOn(String query, Object... args)
     {
-        askOn(Query.format(query, args));
+        askOn(new BeliefQuery(query, args));
     }
 
     @Override
-    public <T extends Event> void askOn(Query query)
+    public <T extends Event> void askOn(BeliefQuery query)
     {
         // Bind the given event type to a belief query behavior
         Behavior eventBoundBeliefQuery = new EventBoundBeliefQuery<T>(getOwner(), query);

src/main/sarl/io/mochalog/sarl/beliefs/Beliefs.sarl

@@ -16,7 +16,8 @@
 
 package io.mochalog.sarl.beliefs
 
-import io.mochalog.bridge.prolog.query.Query
+import io.mochalog.sarl.beliefs.query.BeliefQuery
+
 import io.mochalog.bridge.prolog.query.QuerySolution
 import io.mochalog.bridge.prolog.query.QuerySolutionList
 import io.mochalog.bridge.prolog.query.exception.NoSuchSolutionException
@@ -80,7 +81,7 @@ capacity Beliefs
      * @param query Query to ask
      * @return True if query satisfied, false otherwise.
      */
-    def believes(query : Query) : boolean
+    def believes(query : BeliefQuery) : boolean
 
     /**
      * Ask for first belief which satisfies query
@@ -98,7 +99,7 @@ capacity Beliefs
      * @return Agent belief
      * @throws NoSuchSolutionException Query unsatisfied by agent knowledge base
      */
-    def ask(query : Query) : QuerySolution 
+    def ask(query : BeliefQuery) : QuerySolution 
         throws NoSuchSolutionException
 
     /**
@@ -114,7 +115,7 @@ capacity Beliefs
      * @param query Query to ask
      * @return Agent belief list
      */
-    def askAll(query : Query) : QuerySolutionList
+    def askAll(query : BeliefQuery) : QuerySolutionList
 
     /**
      * Compel agent to query its beliefs in response
@@ -131,5 +132,5 @@ capacity Beliefs
      * @param query Query to ask
      * @param <T> Event type to respond to
      */
-    def askOn(query : Query) with T extends Event
+    def askOn(query : BeliefQuery) with T extends Event
 }

src/main/sarl/io/mochalog/sarl/beliefs/query/BeliefQuery.sarl

@@ -0,0 +1,52 @@
+/**
+ * Copyright 2017 The Mochalog-SARL-Beliefs Authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.mochalog.sarl.beliefs.query
+
+import io.mochalog.bridge.prolog.query.Query
+
+/** 
+ * Event-compatible wrapper of the Mochalog Query
+ * object, allowing queries to be conveniently passed
+ * amongst agents
+ */
+public event BeliefQuery
+{
+    // Internal Prolog query to be asked of a given
+    // knowledge base
+    public val unboxedQuery : Query
+
+    /**
+     * Constructor.
+     * @param text Unformatted query text
+     * @param args Arguments to format query with
+     */
+    public new(text : String, args : Object*)
+    {
+        this(
+            Query.format(text, args)
+        )
+    }
+
+    /**
+     * Constructor.
+     * @param query Query to ask
+     */
+    public new(query : Query)
+    {
+        unboxedQuery = query
+    }
+}