|
From: <jom...@us...> - 2016-04-10 14:25:45
|
Revision: 1894
http://sourceforge.net/p/jason/svn/1894
Author: jomifred
Date: 2016-04-10 14:25:42 +0000 (Sun, 10 Apr 2016)
Log Message:
-----------
use specific wake (sense or act) instead of the general wake
Modified Paths:
--------------
trunk/src/jason/infra/centralised/CentralisedEnvironment.java
trunk/src/jason/stdlib/at.java
trunk/src/jason/stdlib/send.java
Modified: trunk/src/jason/infra/centralised/CentralisedEnvironment.java
===================================================================
--- trunk/src/jason/infra/centralised/CentralisedEnvironment.java 2016-04-10 14:20:44 UTC (rev 1893)
+++ trunk/src/jason/infra/centralised/CentralisedEnvironment.java 2016-04-10 14:25:42 UTC (rev 1894)
@@ -108,7 +108,7 @@
if (ag instanceof CentralisedAgArchAsynchronous) {
((CentralisedAgArchAsynchronous) ag.getTS().getUserAgArch()).wakeUpSense(false);
} else {
- ag.wake();
+ ag.wakeUpSense(false);
}
} else {
logger.log(Level.SEVERE, "Error sending message notification: agent " + agName + " does not exist!");
Modified: trunk/src/jason/stdlib/at.java
===================================================================
--- trunk/src/jason/stdlib/at.java 2016-04-10 14:20:44 UTC (rev 1893)
+++ trunk/src/jason/stdlib/at.java 2016-04-10 14:25:42 UTC (rev 1894)
@@ -24,7 +24,13 @@
package jason.stdlib;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
import jason.JasonException;
+import jason.asSemantics.Agent;
import jason.asSemantics.DefaultInternalAction;
import jason.asSemantics.Event;
import jason.asSemantics.Intention;
@@ -34,11 +40,6 @@
import jason.asSyntax.Term;
import jason.asSyntax.Trigger;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
/**
<p>Internal action: <b><code>.at</code></b>.
@@ -125,7 +126,7 @@
Trigger te = Trigger.tryToGetTrigger(args[1]);
- ts.getAg().getScheduler().schedule(new CheckDeadline(te, ts), deadline, TimeUnit.MILLISECONDS);
+ Agent.getScheduler().schedule(new CheckDeadline(te, ts), deadline, TimeUnit.MILLISECONDS);
return true;
}
Modified: trunk/src/jason/stdlib/send.java
===================================================================
--- trunk/src/jason/stdlib/send.java 2016-04-10 14:20:44 UTC (rev 1893)
+++ trunk/src/jason/stdlib/send.java 2016-04-10 14:25:42 UTC (rev 1894)
@@ -25,6 +25,7 @@
package jason.stdlib;
import jason.JasonException;
+import jason.asSemantics.Agent;
import jason.asSemantics.DefaultInternalAction;
import jason.asSemantics.Intention;
import jason.asSemantics.Message;
@@ -183,7 +184,7 @@
// get the timeout deadline
Term tto = args[4];
if (tto.isNumeric()) {
- ts.getAg().getScheduler().schedule( new Runnable() {
+ Agent.getScheduler().schedule( new Runnable() {
public void run() {
// if the intention is still in PI, brings it back to C.I with the timeout
Intention intention = ts.getC().removePendingIntention(m.getMsgId());
@@ -203,7 +204,7 @@
intention.peek().getUnif().unifies(send.getTerm(3), timeoutAns);
// add the intention back in C.I
ts.getC().resumeIntention(intention);
- ts.getUserAgArch().wake();
+ ts.getUserAgArch().wakeUpAct(false);
}
}
}, (long)((NumberTerm)tto).solve(), TimeUnit.MILLISECONDS);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|