[Jason-developers] SF.net SVN: jason:[1504] trunk/src

[<jom...@us...>]

Revision: 1504
          http://jason.svn.sourceforge.net/jason/?rev=1504&view=rev
Author:   jomifred
Date:     2009-08-04 12:15:54 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
simplify impl of askAll

Modified Paths:
--------------
    trunk/src/asl/kqmlPlans.asl
    trunk/src/jason/asSemantics/TransitionSystem.java

Modified: trunk/src/asl/kqmlPlans.asl
===================================================================
--- trunk/src/asl/kqmlPlans.asl	2009-07-22 15:51:02 UTC (rev 1503)
+++ trunk/src/asl/kqmlPlans.asl	2009-08-04 12:15:54 UTC (rev 1504)
@@ -82,11 +82,6 @@
 -!kqml_received(Sender, askOne, Content, MsgId)
    <- .send(Sender, untell, Content, MsgId).      
 
-@kqmlReceivedAskAll1
-+!kqml_received(Sender, askAll, Content, MsgId)
-   :  not Content
-   <- .send(Sender, untell, Content, MsgId).
-
 @kqmlReceivedAskAll2
 +!kqml_received(Sender, askAll, Content, MsgId)
    <- .findall(Content, Content, List); 

Modified: trunk/src/jason/asSemantics/TransitionSystem.java
===================================================================
--- trunk/src/jason/asSemantics/TransitionSystem.java	2009-07-22 15:51:02 UTC (rev 1503)
+++ trunk/src/jason/asSemantics/TransitionSystem.java	2009-08-04 12:15:54 UTC (rev 1504)
@@ -29,7 +29,6 @@
 import jason.asSyntax.ASSyntax;
 import jason.asSyntax.Atom;
 import jason.asSyntax.InternalActionLiteral;
-import jason.asSyntax.ListTermImpl;
 import jason.asSyntax.Literal;
 import jason.asSyntax.LiteralImpl;
 import jason.asSyntax.LogicalFormula;
@@ -176,12 +175,8 @@
                 // if the answer was tell 3, unifies X=3
                 // if the answer was untell 3, unifies X=false
                 Structure send = (Structure)intention.peek().removeCurrentStep();
-                if (m.isUnTell()) {
-                    if (send.getTerm(1).toString().equals("askOne")) {
-                        content = Literal.LFalse;
-                    } else { // the .send is askAll
-                        content = new ListTermImpl(); // the answer is an empty list
-                    }
+                if (m.isUnTell() && send.getTerm(1).toString().equals("askOne")) {
+                    content = Literal.LFalse;
                 }
                 if (intention.peek().getUnif().unifies(send.getTerm(3), content)) {
                     getC().addIntention(intention);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.