Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1909] trunk
|
From: <jom...@us...> - 2016-04-26 19:21:39
|
Revision: 1909
http://sourceforge.net/p/jason/svn/1909
Author: jomifred
Date: 2016-04-26 19:21:37 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
improve sleep of test ag arch
Modified Paths:
--------------
trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java
trunk/applications/as-unit-test/src/jason/asunit/TestArch.java
trunk/build.xml
trunk/src/asl/kqmlPlans.asl
trunk/src/jason/asSemantics/Agent.java
trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc
trunk/src/jason/mas2j/parser/mas2jTokenManager.java
Modified: trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java
===================================================================
--- trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java 2016-04-26 17:39:06 UTC (rev 1908)
+++ trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java 2016-04-26 19:21:37 UTC (rev 1909)
@@ -33,8 +33,7 @@
public void testPerception1() {
ag.addGoal("start"); // add a new goal for the agent
ag.assertBel("info",20);
- System.out.println(ag.getBB());
- ag.assertBel("info[source(second_source), source(percept)]",20); // the agent should believe in info with two sources
+ ag.assertBel("info[source(second_source), source(percept)]",10); // the agent should believe in info with two sources
}
@Test(timeout=2000)
public void testPerception2() {
Modified: trunk/applications/as-unit-test/src/jason/asunit/TestArch.java
===================================================================
--- trunk/applications/as-unit-test/src/jason/asunit/TestArch.java 2016-04-26 17:39:06 UTC (rev 1908)
+++ trunk/applications/as-unit-test/src/jason/asunit/TestArch.java 2016-04-26 19:21:37 UTC (rev 1909)
@@ -53,6 +53,12 @@
while (condition.test(this)) {
cycle++;
getTS().reasoningCycle();
+ if (getTS().canSleep())
+ try {
+ Thread.sleep(50);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
condition.notifyAll();
}
@@ -71,7 +77,8 @@
@Override
public Collection<Literal> perceive() {
- if (getEnvInfraTier() != null)
+ //System.out.println(super.perceive()+"*"+getEnvInfraTier());
+ if (getEnvInfraTier() != null)
return super.perceive();
else
return null;
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2016-04-26 17:39:06 UTC (rev 1908)
+++ trunk/build.xml 2016-04-26 19:21:37 UTC (rev 1909)
@@ -172,7 +172,7 @@
<attribute name="Main-Class" value="jason.util.ConfigGUI"/>
</manifest>
</jar>
- <!--copy file="${jasonJar}" todir="${jarRepo}" failonerror="false" quiet="true" /-->
+ <copy file="${jasonJar}" tofile="lib/jason.jar" />
</target>
<target name="jar-core" depends="jar">
Modified: trunk/src/asl/kqmlPlans.asl
===================================================================
--- trunk/src/asl/kqmlPlans.asl 2016-04-26 17:39:06 UTC (rev 1908)
+++ trunk/src/asl/kqmlPlans.asl 2016-04-26 19:21:37 UTC (rev 1909)
@@ -14,7 +14,7 @@
+!kqml_received(Sender, tell, NS::Content, _)
: .literal(Content) &
.ground(Content) &
- not .list(Content) &
+ not .list(Content) &
.add_nested_source(Content, Sender, CA)
<- +NS::CA.
@kqmlReceivedTellList
Modified: trunk/src/jason/asSemantics/Agent.java
===================================================================
--- trunk/src/jason/asSemantics/Agent.java 2016-04-26 17:39:06 UTC (rev 1908)
+++ trunk/src/jason/asSemantics/Agent.java 2016-04-26 19:21:37 UTC (rev 1909)
@@ -722,7 +722,6 @@
* @return the number of changes (add + dels)
*/
public int buf(Collection<Literal> percepts) {
-
/*
// complexity 3n
Modified: trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc
===================================================================
--- trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc 2016-04-26 17:39:06 UTC (rev 1908)
+++ trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc 2016-04-26 19:21:37 UTC (rev 1909)
@@ -102,7 +102,7 @@
| "\t"
| "\n"
| "\r"
-| <"//" (~["\n","\r"])* ("\n" | "\r" | "\r\n")>
+| <"//" (~["\n","\r"])* ("\n" | "\r" | "\r\n")? >
| <"/*" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/">
}
Modified: trunk/src/jason/mas2j/parser/mas2jTokenManager.java
===================================================================
--- trunk/src/jason/mas2j/parser/mas2jTokenManager.java 2016-04-26 17:39:06 UTC (rev 1908)
+++ trunk/src/jason/mas2j/parser/mas2jTokenManager.java 2016-04-26 19:21:37 UTC (rev 1909)
@@ -1059,12 +1059,18 @@
jjAddStates(5, 6);
break;
case 64:
- if (curChar == 47)
- jjCheckNAddStates(14, 16);
+ if (curChar != 47)
+ break;
+ if (kind > 5)
+ kind = 5;
+ jjCheckNAddStates(14, 16);
break;
case 65:
- if ((0xffffffffffffdbffL & l) != 0L)
- jjCheckNAddStates(14, 16);
+ if ((0xffffffffffffdbffL & l) == 0L)
+ break;
+ if (kind > 5)
+ kind = 5;
+ jjCheckNAddStates(14, 16);
break;
case 66:
if ((0x2400L & l) != 0L && kind > 5)
@@ -1493,6 +1499,8 @@
jjstateSet[jjnewStateCnt++] = 61;
break;
case 65:
+ if (kind > 5)
+ kind = 5;
jjAddStates(14, 16);
break;
case 70:
@@ -1547,8 +1555,11 @@
jjAddStates(7, 9);
break;
case 65:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(14, 16);
+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
+ break;
+ if (kind > 5)
+ kind = 5;
+ jjAddStates(14, 16);
break;
case 70:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
