Thread: [Jason-developers] SF.net SVN: jason: [1158] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1158
          http://jason.svn.sourceforge.net/jason/?rev=1158&view=rev
Author:   jomifred
Date:     2008-03-17 14:13:29 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
implement make makeVarsAnnots for annotations

Modified Paths:
--------------
    trunk/examples/gold-miners-II/asl/miner.asl
    trunk/src/jason/asSyntax/Atom.java
    trunk/src/jason/asSyntax/ListTermImpl.java
    trunk/src/jason/asSyntax/Literal.java
    trunk/src/jason/asSyntax/Pred.java
    trunk/src/jason/asSyntax/Structure.java
    trunk/src/test/TermTest.java

Modified: trunk/examples/gold-miners-II/asl/miner.asl
===================================================================

--- trunk/examples/gold-miners-II/asl/miner.asl	2008-03-17 19:13:28 UTC (rev 1157)
+++ trunk/examples/gold-miners-II/asl/miner.asl	2008-03-17 21:13:29 UTC (rev 1158)
@@ -59,7 +59,7 @@
     !change_to_fetch(NewG).
 
 +!choose_goal // there is no worth gold
- :  carrying.gold > 0
+ :  carrying_gold(NG) & NG > 0
  <- !change_to_goto_depot.
 
 +!choose_goal // not carrying gold, be free and search gold

Modified: trunk/src/jason/asSyntax/Atom.java
===================================================================
--- trunk/src/jason/asSyntax/Atom.java	2008-03-17 19:13:28 UTC (rev 1157)
+++ trunk/src/jason/asSyntax/Atom.java	2008-03-17 21:13:29 UTC (rev 1158)
@@ -33,9 +33,9 @@
 import java.util.logging.Logger;
 
 /**
- * Represents an atom (a structure with no arguments), it is an
+ * Represents an atom (a structure with no arguments, e.g. "tell", "a"), it is an
  * immutable object.  It extends Literal, so can be used in place of a
- * Literal, but does not allow operations on terms.
+ * Literal, but does not allow operations on terms/atoms and can not be negated.
  */
 public final class Atom extends Literal {
 
@@ -113,17 +113,27 @@
 		// an Atom as parameter
 		return new ArrayList<Term>(2);
 	}
-	
+
 	@Override
 	public Term[] getTermsArray() {
-	    return new Term[0];
+	    return emptyTermArray;
 	}
 	
+	@Override
+	public void setNegated(boolean b) {
+    	logger.log(Level.SEVERE, "You should not negate the atom "+this+"\n",new Exception());
+		super.setNegated(b);
+	}
+	
     @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (o == this) return true;
-        if (o instanceof Structure) return getFunctor().equals(((Structure)o).getFunctor());
+        if (o instanceof Structure) {
+        	Structure s = (Structure)o;
+        	if (!getFunctor().equals(s.getFunctor())) return false;
+        	return s.isAtom();
+        }
         return false;
     }
     

Modified: trunk/src/jason/asSyntax/ListTermImpl.java
===================================================================
--- trunk/src/jason/asSyntax/ListTermImpl.java	2008-03-17 19:13:28 UTC (rev 1157)
+++ trunk/src/jason/asSyntax/ListTermImpl.java	2008-03-17 21:13:29 UTC (rev 1158)
@@ -182,6 +182,11 @@
 		}
 	}
 	
+	@Override
+	public boolean isAtom() {
+		return false;
+	}
+
     @Override
     public boolean isList() {
 		return true;

Modified: trunk/src/jason/asSyntax/Literal.java
===================================================================
--- trunk/src/jason/asSyntax/Literal.java	2008-03-17 19:13:28 UTC (rev 1157)
+++ trunk/src/jason/asSyntax/Literal.java	2008-03-17 21:13:29 UTC (rev 1158)
@@ -85,7 +85,10 @@
 	public static Literal parseLiteral(String sLiteral) {
 		as2j parser = new as2j(new StringReader(sLiteral));
 		try {
-			return parser.literal();
+			Literal l = parser.literal();
+			if (l instanceof Atom) // force the result as literal
+				l = new Literal(l.getFunctor());
+			return l;
 		} catch (Exception e) {
 			logger.log(Level.SEVERE,"Error parsing literal " + sLiteral,e);
 			return null;
@@ -356,9 +359,9 @@
 
     
     @SuppressWarnings("serial")
-    static class TrueLiteral extends Literal {
+    static final class TrueLiteral extends Literal {
     	public TrueLiteral() {
-    		super("true",1);
+    		super("true",0);
 		}
 
     	@Override
@@ -373,9 +376,9 @@
     }
     
     @SuppressWarnings("serial")
-	static class FalseLiteral extends Literal {
+	static final class FalseLiteral extends Literal {
     	public FalseLiteral() {
-    		super("false",1);
+    		super("false",0);
 		}
 
     	@Override

Modified: trunk/src/jason/asSyntax/Pred.java
===================================================================
--- trunk/src/jason/asSyntax/Pred.java	2008-03-17 19:13:28 UTC (rev 1157)
+++ trunk/src/jason/asSyntax/Pred.java	2008-03-17 21:13:29 UTC (rev 1158)
@@ -404,7 +404,36 @@
         return false;
     }
 
+    
+    /**
+     * Replaces all variables of the term for unnamed variables (_).
+     * 
+     * @param changes is the map of replacements
+     */
     @Override
+    protected void makeVarsAnnon(Map<VarTerm,UnnamedVar> changes) {
+        if (annots != null) {
+        	Iterator<ListTerm> i = annots.listTermIterator();
+        	while (i.hasNext()) {
+        		ListTerm lt = i.next();
+        		Term ta = lt.getTerm();
+                if (ta.isVar()) {
+                	// replace ta to an unnamed var
+                	UnnamedVar uv = changes.get(ta);
+                	if (uv == null) {
+                		uv = new UnnamedVar();
+                		changes.put((VarTerm)ta, uv);
+                	}
+                	lt.setTerm(uv);
+                } else if (ta.isStructure()) {
+                	((Structure)ta).makeVarsAnnon(changes);
+                }
+            }
+        }
+        super.makeVarsAnnon(changes);
+    }
+    
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (o == this) return true;

Modified: trunk/src/jason/asSyntax/Structure.java
===================================================================
--- trunk/src/jason/asSyntax/Structure.java	2008-03-17 19:13:28 UTC (rev 1157)
+++ trunk/src/jason/asSyntax/Structure.java	2008-03-17 21:13:29 UTC (rev 1158)
@@ -48,6 +48,8 @@
 
 	private static final long serialVersionUID = 1L;
     private static Logger logger = Logger.getLogger(Structure.class.getName());
+    protected static final Term[] emptyTermArray = new Term[0]; // just to have a type for toArray in the getTermsArray method
+    
 
 	private final String functor; // immutable field
     private List<Term> terms;
@@ -237,11 +239,7 @@
      
     /** returns the i-th term (first term is 0) */
     public Term getTerm(int i) {
-        if (terms.size() > i) {
-            return terms.get(i);
-        } else {
-            return null;
-        }
+    	return terms.get(i);
     }
 
     public int getArity() {
@@ -264,8 +262,6 @@
     	return getArity() > 0; // should use getArity to work for list/atom
     }
     
-    private static final Term[] emptyTermArray = new Term[0]; // just to have a type for toArray in the getTermsArray method
-    
     public Term[] getTermsArray() {
         return terms.toArray(emptyTermArray);
     }
@@ -277,7 +273,7 @@
     
 	@Override
 	public boolean isAtom() {
-		return !hasTerm() && !isList();
+		return !hasTerm();
 	}
 
     public boolean isGround() {
@@ -300,7 +296,7 @@
      * 
      * @param changes is the map of replacements
      */
-    private void makeVarsAnnon(Map<VarTerm,UnnamedVar> changes) {
+    protected void makeVarsAnnon(Map<VarTerm,UnnamedVar> changes) {
         final int size = getArity();
         for (int i=0; i<size; i++) {
             Term ti = getTerm(i);

Modified: trunk/src/test/TermTest.java
===================================================================
--- trunk/src/test/TermTest.java	2008-03-17 19:13:28 UTC (rev 1157)
+++ trunk/src/test/TermTest.java	2008-03-17 21:13:29 UTC (rev 1158)
@@ -7,11 +7,11 @@
 import jason.asSyntax.ListTermImpl;
 import jason.asSyntax.Literal;
 import jason.asSyntax.NumberTermImpl;
+import jason.asSyntax.Plan;
 import jason.asSyntax.Pred;
 import jason.asSyntax.Structure;
 import jason.asSyntax.Term;
 import jason.asSyntax.Trigger;
-import jason.asSyntax.Plan;
 import jason.asSyntax.VarTerm;
 import jason.asSyntax.Trigger.TEOperator;
 import jason.asSyntax.Trigger.TEType;
@@ -19,6 +19,8 @@
 import jason.bb.BeliefBase;
 
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
@@ -72,8 +74,7 @@
 		
         Term tpos = new Atom("pos");
 		assertFalse(l3.equals(tpos));
-		assertTrue(tpos.equals(l3));
-		assertTrue(new Atom("pos").equals(l3));
+		assertFalse(tpos.equals(l3));
 		//System.out.println(new Term("pos")+"="+l3+" --> "+new Term("pos").equals(l3));
 
 		assertFalse(new Pred("pos").equals(l3));
@@ -581,6 +582,15 @@
         assertEquals(l1.toString(), "calc(32,33,33)");
     }
 
+    public void testMakeVarAnnon3() {
+    	Literal l1 = Literal.parseLiteral("calc(AgY,X)[vl(X),source(AgY),bla(Y),X]");
+    	l1.makeVarsAnnon();
+    	Map<VarTerm, Integer> v = new HashMap<VarTerm, Integer>();
+    	l1.countVars(v);
+    	assertEquals(3, v.size());
+    	assertEquals("vl("+l1.getTerm(1)+")",l1.getAnnots("vl").get(0).toString());
+    }
+
     public void testAddAnnots() {
     	Literal p1 = Literal.parseLiteral("p1");
     	Literal p2 = Literal.parseLiteral("p2[a1,a2]");


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




Thread: [Jason-developers] SF.net SVN: jason: [1158] trunk

jason-developers