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

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

Revision: 1749
          http://sourceforge.net/p/jason/svn/1749
Author:   jomifred
Date:     2013-09-16 12:56:58 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
include test for bug detected by Francisco Grimaldo (related to lists)

Modified Paths:
--------------
    trunk/applications/as-unit-test/src/jason/tests/BugListReturnUnification.java
    trunk/build.xml
    trunk/examples/st-claus/jason_stclaus.mas2j
    trunk/examples/st-claus/secretary.asl
    trunk/examples/st-claus/worker.asl
    trunk/release-notes.txt

Modified: trunk/applications/as-unit-test/src/jason/tests/BugListReturnUnification.java
===================================================================
--- trunk/applications/as-unit-test/src/jason/tests/BugListReturnUnification.java	2013-09-09 00:53:39 UTC (rev 1748)
+++ trunk/applications/as-unit-test/src/jason/tests/BugListReturnUnification.java	2013-09-16 12:56:58 UTC (rev 1749)
@@ -26,7 +26,24 @@
                 
                 "+!test3 <- !a(Y)[x(Z), y]; jason.asunit.print(Y, Z). "+
                 "+!a(Y)[x(Z),kk]           <- Y=3; Z=4. "+          
-                "+!a(Y)[x(Z),source(self)] <- Y=1; Z=2. "       
+                "+!a(Y)[x(Z),source(self)] <- Y=1; Z=2. "+
+                
+                "+!test4 <- X = [a,b,c]; !deleteb(X,Y); jason.asunit.print(Y)."+
+                "+!test5 <- X = [a,b,c]; !deleteb2(X,Y); jason.asunit.print(Y)."+
+                
+                "+!deleteb([], [])."+
+                "+!deleteb([b|L1], L2)"+
+                "  <- !deleteb(L1, L2)."+
+                "+!deleteb([H|L1], [H|L2])"+
+                "  <- !deleteb(L1, L2)."+
+
+                "+!deleteb2([], [])."+
+                "+!deleteb2([b|L1], L2)"+
+                "  <- !deleteb2(L1, L2)."+
+                "+!deleteb2([H|L1], R)"+
+                "  <- !deleteb2(L1, L2);"+
+                "     R = [H|L2]."
+
         );
     }
     
@@ -43,4 +60,16 @@
         ag.addGoal("test3");
         ag.assertPrint("12", 10);
     }
+
+    @Test(timeout=2000)
+    public void testDelete1() {
+        ag.addGoal("test4");
+        ag.assertPrint("[a,c]", 10);
+    }
+    @Test(timeout=2000)
+    public void testDelete2() {
+        ag.addGoal("test5");
+        ag.assertPrint("[a,c]", 10);
+    }
+
 }

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2013-09-09 00:53:39 UTC (rev 1748)
+++ trunk/build.xml	2013-09-16 12:56:58 UTC (rev 1749)
@@ -12,7 +12,7 @@
 
     <property name="dist.properties" value="${basedir}/bin/dist.properties" />
     <property name="version" value="1" />
-    <property name="release" value="3.10" />
+    <property name="release" value="3.10a" />
     <property name="distDir" value="${env.HOME}/tmp/x/Jason-${version}.${release}" />
     <property name="distFile" value="${env.HOME}/Jason-${version}.${release}" />
 

Modified: trunk/examples/st-claus/jason_stclaus.mas2j
===================================================================
--- trunk/examples/st-claus/jason_stclaus.mas2j	2013-09-09 00:53:39 UTC (rev 1748)
+++ trunk/examples/st-claus/jason_stclaus.mas2j	2013-09-16 12:56:58 UTC (rev 1749)
@@ -28,13 +28,13 @@
 
 MAS jason_stclaus {
 
-	infrastructure: Centralised
+    infrastructure: Centralised
 
-	agents:
-	    santa;
-		edna     secretary.asl [beliefs="group_size(3,elf)"];
+    agents:
+        santa;
+        edna     secretary.asl [beliefs="group_size(3,elf)"];
         robin    secretary.asl [beliefs="group_size(9,reindeer)"];
-		elf      worker.asl    [beliefs="kind(elf),      secretary(edna)"]  #10;
+        elf      worker.asl    [beliefs="kind(elf),      secretary(edna)"]  #10;
         reindeer worker.asl    [beliefs="kind(reindeer), secretary(robin)"]  #9;
 
-}
\ No newline at end of file
+}

Modified: trunk/examples/st-claus/secretary.asl
===================================================================
--- trunk/examples/st-claus/secretary.asl	2013-09-09 00:53:39 UTC (rev 1748)
+++ trunk/examples/st-claus/secretary.asl	2013-09-16 12:56:58 UTC (rev 1749)
@@ -9,4 +9,4 @@
 @liam2[atomic]
 +!iamhere[source(A)] : group(Group) 
    <- -+group([A|Group]).
- 
\ No newline at end of file
+ 

Modified: trunk/examples/st-claus/worker.asl
===================================================================
--- trunk/examples/st-claus/worker.asl	2013-09-09 00:53:39 UTC (rev 1748)
+++ trunk/examples/st-claus/worker.asl	2013-09-16 12:56:58 UTC (rev 1749)
@@ -9,4 +9,4 @@
    <- .print(M); 
       .send(A,tell,done); 
       .wait( math.random(20)+10 );
-      !!start.
\ No newline at end of file
+      !!start.

Modified: trunk/release-notes.txt
===================================================================
--- trunk/release-notes.txt	2013-09-09 00:53:39 UTC (rev 1748)
+++ trunk/release-notes.txt	2013-09-16 12:56:58 UTC (rev 1749)
@@ -1,7 +1,7 @@
 ---------------------------
-version 1.3.10
+version 1.3.10a
 
-revision 1745 on SVN
+revision 1748 on SVN
 ---------------------------
 
 New features
@@ -14,6 +14,12 @@
    The intention will be suspended until the agent believes b(X) with X > 10. 
    Timeout and elapse time arguments can be used as previously. 
 
+
+New example:
+- Santa Claus: a classical benchmark for concurrent programming
+  http://www.cs.otago.ac.nz/staffpriv/ok/santa
+
+
 ---------------------------
 version 1.3.9
 

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