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

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

Revision: 1373
          http://jason.svn.sourceforge.net/jason/?rev=1373&view=rev
Author:   jomifred
Date:     2008-09-16 17:43:27 +0000 (Tue, 16 Sep 2008)

Log Message:
-----------
add getLogger in Environmnet

Modified Paths:
--------------
    trunk/src/jason/asSyntax/ListTermImpl.java
    trunk/src/jason/environment/Environment.java
    trunk/src/jason/stdlib/substring.java
    trunk/src/test/StdLibTest.java

Modified: trunk/src/jason/asSyntax/ListTermImpl.java
===================================================================
--- trunk/src/jason/asSyntax/ListTermImpl.java	2008-09-14 14:54:57 UTC (rev 1372)
+++ trunk/src/jason/asSyntax/ListTermImpl.java	2008-09-16 17:43:27 UTC (rev 1373)
@@ -339,7 +339,7 @@
         ListTerm result = new ListTermImpl();
         ListTerm tail = result;
         for (Term t: set)
-            tail = tail.append((Term)t.clone());
+            tail = tail.append(t.clone());
         return result;
 
     }
@@ -524,7 +524,7 @@
             public Term next() {
                 last = pos;
                 pos++;
-                return get(last);
+                return get(last); // TODO: get complexity is O(n)! and sort uses this iterator.... it will be nice to have a get implementation with constant time.
             }
             public int nextIndex() {
                 return pos+1;

Modified: trunk/src/jason/environment/Environment.java
===================================================================
--- trunk/src/jason/environment/Environment.java	2008-09-14 14:54:57 UTC (rev 1372)
+++ trunk/src/jason/environment/Environment.java	2008-09-16 17:43:27 UTC (rev 1373)
@@ -118,6 +118,9 @@
 		return environmentInfraTier;
 	}
 
+    public Logger getLoger() {
+        return logger;
+    }
     
     public void informAgsEnvironmentChanged(Collection<String> agents) {
         if (environmentInfraTier != null) {
@@ -310,7 +313,7 @@
             public void run() {
                 try {
                     boolean success = executeAction(agName, action);
-                    environmentInfraTier.actionExecuted(agName, action, success, infraData);
+                    environmentInfraTier.actionExecuted(agName, action, success, infraData); // send the result of the execution to the agent
                 } catch (Exception ie) {
                     if (!(ie instanceof InterruptedException)) {
                         logger.log(Level.WARNING, "act error!",ie);

Modified: trunk/src/jason/stdlib/substring.java
===================================================================
--- trunk/src/jason/stdlib/substring.java	2008-09-14 14:54:57 UTC (rev 1372)
+++ trunk/src/jason/stdlib/substring.java	2008-09-16 17:43:27 UTC (rev 1373)
@@ -52,7 +52,7 @@
 		return singleton;
 	}
 
-    @Override public int getMinArgs() { return 3; }
+    @Override public int getMinArgs() { return 2; }
     @Override public int getMaxArgs() { return 3; }
 
     @Override

Modified: trunk/src/test/StdLibTest.java
===================================================================
--- trunk/src/test/StdLibTest.java	2008-09-14 14:54:57 UTC (rev 1372)
+++ trunk/src/test/StdLibTest.java	2008-09-16 17:43:27 UTC (rev 1373)
@@ -215,10 +215,6 @@
 
     }
 
-    public static void main(String[] a) {
-        new StdLibTest().testSubString();
-    }
-
     public void testConcat() {
         ListTerm l1 = ListTermImpl.parseList("[a,b,c]");
         ListTerm l2 = ListTermImpl.parseList("[d,e,f]");
@@ -248,7 +244,7 @@
     }
 
     @SuppressWarnings("unchecked")
-	public void testSubString() {
+	public void testSubString() throws Exception {
         StringTerm s1 = new StringTermImpl("a");
         StringTerm s2 = new StringTermImpl("bbacca");
 
@@ -258,22 +254,19 @@
         VarTerm X = new VarTerm("X");
 
         Unifier u = new Unifier();
-        try {
-            assertTrue((Boolean)new jason.stdlib.substring().execute(null, u, new Term[] { s1, s2 }));
-            Iterator<Unifier> i = (Iterator)new jason.stdlib.substring().execute(null, u, new Term[] { s1, s2 , X});
-            assertEquals(i.next().get("X").toString(), "2");
-            assertEquals(i.next().get("X").toString(), "5");
-            assertFalse(i.hasNext());
 
-            assertTrue((Boolean)new jason.stdlib.substring().execute(null, u, new Term[] { t1, t2}));
-            i = (Iterator)new jason.stdlib.substring().execute(null, new Unifier(), new Term[] { t1, t2, X});
-            assertTrue(i.hasNext());
-            assertEquals(i.next().get("X").toString(), "9");
-            assertFalse(i.hasNext());
+        assertTrue((Boolean)new jason.stdlib.substring().execute(null, u, new Term[] { s1, s2 }));
+        Iterator<Unifier> i = (Iterator)new jason.stdlib.substring().execute(null, u, new Term[] { s1, s2 , X});
+        assertEquals(i.next().get("X").toString(), "2");
+        assertEquals(i.next().get("X").toString(), "5");
+        assertFalse(i.hasNext());
 
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        assertTrue((Boolean)new jason.stdlib.substring().execute(null, u, new Term[] { t1, t2}));
+        i = (Iterator)new jason.stdlib.substring().execute(null, new Unifier(), new Term[] { t1, t2, X});
+        assertTrue(i.hasNext());
+        assertEquals(i.next().get("X").toString(), "9");
+        assertFalse(i.hasNext());
+
     }
     
     public void testDropGoal1() throws ParseException {


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