Details
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/AnomalyDetectionCapability.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/AnomalyDetectionCapability.java
index 87a62ee..b5bc5ef 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/AnomalyDetectionCapability.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/AnomalyDetectionCapability.java
@@ -30,7 +30,6 @@ import bdi4jade.belief.Belief;
import bdi4jade.belief.BeliefSet;
import bdi4jade.belief.Predicate;
import bdi4jade.belief.TransientBeliefSet;
-import bdi4jade.core.Capability;
import bdi4jade.core.GoalUpdateSet;
import bdi4jade.event.GoalEvent;
import bdi4jade.event.GoalListener;
@@ -44,6 +43,7 @@ import bdi4jade.plan.Plan;
import bdi4jade.plan.Plan.EndState;
import bdi4jade.plan.planbody.BeliefGoalPlanBody;
import bdi4jade.reasoning.BeliefRevisionStrategy;
+import bdi4jade.reasoning.DeliberationFunction;
import bdi4jade.reasoning.OptionGenerationFunction;
import br.ufrgs.inf.bdinetr.agent.belief.AnomalousUsageBelief;
import br.ufrgs.inf.bdinetr.domain.AnomalyDetection;
@@ -274,6 +274,11 @@ public class AnomalyDetectionCapability extends RouterAgentCapability implements
}
@Override
+ protected Class<?> getLowPriorityGoal() {
+ return Benign.class;
+ }
+
+ @Override
public Role getRole() {
return Role.ANOMALY_DETECTION;
}
@@ -308,12 +313,4 @@ public class AnomalyDetectionCapability extends RouterAgentCapability implements
}
}
- @Override
- public void setCapability(Capability capability) {
- if (!this.equals(capability)) {
- throw new IllegalArgumentException(
- "This reasoning strategy is already associated with another capability.");
- }
- }
-
}
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/ClassifierCapability.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/ClassifierCapability.java
index 01db029..955fd13 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/ClassifierCapability.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/ClassifierCapability.java
@@ -28,7 +28,6 @@ import bdi4jade.annotation.Parameter;
import bdi4jade.annotation.Parameter.Direction;
import bdi4jade.belief.Belief;
import bdi4jade.belief.Predicate;
-import bdi4jade.core.Capability;
import bdi4jade.core.GoalUpdateSet;
import bdi4jade.event.GoalEvent;
import bdi4jade.goal.BeliefGoal;
@@ -205,12 +204,4 @@ public class ClassifierCapability extends RouterAgentCapability implements
}
}
- @Override
- public void setCapability(Capability capability) {
- if (!this.equals(capability)) {
- throw new IllegalArgumentException(
- "This reasoning strategy is already associated with another capability.");
- }
- }
-
}
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalRequestPlan.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalRequestPlan.java
index 4adad51..b1fdd25 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalRequestPlan.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalRequestPlan.java
@@ -77,7 +77,7 @@ public class GoalRequestPlan extends DefaultPlan {
ACLMessage reply = myAgent.receive(mt);
if (reply != null) {
if (ACLMessage.INFORM == reply.getPerformative()) {
- log.info("Goal " + getGoal() + " achieved.");
+ log.debug("Goal " + getGoal() + " achieved.");
if (getGoal() instanceof BeliefGoal) {
GoalResponse<?> response = (GoalResponse<?>) myAgent
.getContentManager().extractContent(reply);
@@ -162,13 +162,14 @@ public class GoalRequestPlan extends DefaultPlan {
private void receiveResponse() {
ACLMessage reply = myAgent.receive(mt);
if (reply != null) {
+ log.debug("Goal: " + getGoal());
this.answers++;
if (ACLMessage.PROPOSE == reply.getPerformative()) {
- log.info("Agent " + reply.getSender().getLocalName()
+ log.debug("Agent " + reply.getSender().getLocalName()
+ " sent a proposal.");
positiveAnswers.add(reply);
} else {
- log.info("Agent " + reply.getSender().getLocalName()
+ log.debug("Agent " + reply.getSender().getLocalName()
+ " refused the request.");
}
} else {
@@ -183,6 +184,7 @@ public class GoalRequestPlan extends DefaultPlan {
}
private void request() throws Exception {
+ log.debug("Goal: " + getGoal());
this.requestTime = System.currentTimeMillis();
ACLMessage msg = new ACLMessage(ACLMessage.CFP);
@@ -197,7 +199,7 @@ public class GoalRequestPlan extends DefaultPlan {
msg.addReceiver(agentDesc.getName());
}
}
- log.info("Number of requests: " + receivers.size());
+ log.debug("Number of requests: " + receivers.size());
GoalRequest request = new GoalRequest();
if (getGoal() instanceof BeliefPresentGoal) {
@@ -226,8 +228,9 @@ public class GoalRequestPlan extends DefaultPlan {
}
private void selectProposal() throws Exception {
+ log.debug("Goal: " + getGoal());
if (positiveAnswers.isEmpty()) {
- log.info("No positive answers");
+ log.debug("No positive answers");
setEndState(EndState.FAILED);
this.state = State.Ended;
return;
@@ -252,11 +255,11 @@ public class GoalRequestPlan extends DefaultPlan {
MessageTemplate.MatchConversationId(reply
.getConversationId()), MessageTemplate
.MatchInReplyTo(reply.getReplyWith()));
- log.info("Accepted proposal of agent: "
+ log.debug("Accepted proposal of agent: "
+ answer.getSender().getLocalName());
} else {
reply.setPerformative(ACLMessage.REJECT_PROPOSAL);
- log.info("Rejected proposal of agent: "
+ log.debug("Rejected proposal of agent: "
+ answer.getSender().getLocalName());
}
this.myAgent.send(reply);
@@ -293,12 +296,12 @@ public class GoalRequestPlan extends DefaultPlan {
assert capability.getBeliefBase().getBelief(
response.getPredicate()) == predicate;
if (response.getValue() != null) {
- log.info(predicate);
predicate.setValue(response.getValue());
+ log.debug("Predicate updated: " + predicate);
((BDIAgent) myAgent).restart();
} else {
- log.info("Predicate removed: " + predicate);
// capability.getBeliefBase().removeBelief(predicate.getName());
+ log.debug("Predicate removed: " + predicate);
this.done = true;
}
}
@@ -333,7 +336,7 @@ public class GoalRequestPlan extends DefaultPlan {
AchievingGoal, Ended, ReceivingResponses, Resquesting, Selecting;
}
- public static final int ANSWER_TIME_OUT = 15000;
+ public static final int ANSWER_TIME_OUT = 60000;
private static final Log log = LogFactory.getLog(GoalRequestPlan.class);
public static final int MSG_TIME_OUT = 10000;
private Map<GoalTemplate, RequestDescription> requestDescriptions;
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalResponsePlan.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalResponsePlan.java
index e4af606..197dbd2 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalResponsePlan.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/GoalResponsePlan.java
@@ -76,7 +76,7 @@ public class GoalResponsePlan extends DefaultPlan {
if (event == null)
return;
- log.info(goal + " finished: " + event.getStatus());
+ log.debug(goal + " finished: " + event.getStatus());
ACLMessage reply = acceptProposalMsg.createReply();
if (GoalStatus.ACHIEVED.equals(event.getStatus())) {
reply.setPerformative(ACLMessage.INFORM);
@@ -146,6 +146,7 @@ public class GoalResponsePlan extends DefaultPlan {
myAgent.getContentManager()
.fillContent(reply, response);
this.myAgent.send(reply);
+ log.debug("Sending update (belief removed): " + goal);
} catch (Exception exc) {
log.error(exc);
exc.printStackTrace();
@@ -170,6 +171,7 @@ public class GoalResponsePlan extends DefaultPlan {
.fillContent(reply, response);
this.myAgent.send(reply);
this.lastValue = currentValue;
+ log.debug("Goal: " + goal);
} catch (Exception exc) {
log.error(exc);
exc.printStackTrace();
@@ -186,13 +188,15 @@ public class GoalResponsePlan extends DefaultPlan {
private void receiveReply() {
ACLMessage reply = myAgent.receive(mt);
if (reply != null) {
+ log.debug("Goal: " + goal);
if (ACLMessage.ACCEPT_PROPOSAL == reply.getPerformative()) {
dispatchSubgoalAndListen(goal);
this.acceptProposalMsg = reply;
+ log.debug("Proposal accepted");
this.state = State.AchievingBeliefGoal;
} else {
setEndState(EndState.SUCCESSFUL);
- log.info("Proposal rejected");
+ log.debug("Proposal rejected");
this.state = State.Ended;
return;
}
@@ -200,7 +204,7 @@ public class GoalResponsePlan extends DefaultPlan {
long timeElapsed = System.currentTimeMillis() - responseTime;
if (timeElapsed >= ANSWER_TIME_OUT) {
setEndState(EndState.SUCCESSFUL);
- log.info("No answer received... ending plan.");
+ log.debug("No answer received... ending plan.");
} else {
block(ANSWER_TIME_OUT);
}
@@ -208,9 +212,9 @@ public class GoalResponsePlan extends DefaultPlan {
}
private void sendResponse() throws Exception {
+ log.debug(beliefGoalMsg.getContent());
this.responseTime = System.currentTimeMillis();
- log.info(beliefGoalMsg.getContent());
this.request = (GoalRequest<?>) myAgent.getContentManager()
.extractContent(beliefGoalMsg);
if (request.getBeliefGoal()) {
@@ -245,8 +249,8 @@ public class GoalResponsePlan extends DefaultPlan {
myAgent.send(reply);
- log.info("Agent " + myAgent.getLocalName() + " can achieve " + goal
- + ": " + canAchieve);
+ log.debug("Agent " + myAgent.getLocalName() + " can achieve "
+ + goal + ": " + canAchieve);
this.mt = MessageTemplate.and(MessageTemplate
.MatchConversationId(reply.getConversationId()),
@@ -266,7 +270,7 @@ public class GoalResponsePlan extends DefaultPlan {
}
private static final Log log = LogFactory.getLog(GoalResponsePlan.class);
- public static final int ANSWER_TIME_OUT = 15000;
+ public static final int ANSWER_TIME_OUT = 60000;
public GoalResponsePlan() {
super(new MessageTemplate(new MatchExpression() {
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java
index 66b159c..eff3b80 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java
@@ -28,7 +28,6 @@ import bdi4jade.annotation.Parameter;
import bdi4jade.annotation.Parameter.Direction;
import bdi4jade.belief.Belief;
import bdi4jade.belief.Predicate;
-import bdi4jade.core.Capability;
import bdi4jade.core.GoalUpdateSet;
import bdi4jade.event.GoalEvent;
import bdi4jade.event.GoalListener;
@@ -231,6 +230,11 @@ public class LinkMonitorCapability extends RouterAgentCapability implements
}
@Override
+ protected Class<?> getLowPriorityGoal() {
+ return AnomalousUsage.class;
+ }
+
+ @Override
public Role getRole() {
return Role.LINK_MONITOR;
}
@@ -263,14 +267,6 @@ public class LinkMonitorCapability extends RouterAgentCapability implements
}
@Override
- public void setCapability(Capability capability) {
- if (!this.equals(capability)) {
- throw new IllegalArgumentException(
- "This reasoning strategy is already associated with another capability.");
- }
- }
-
- @Override
public void update(Object o, Object arg) {
synchronized (linkEvents) {
this.linkEvents.add((Link) arg);
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgent.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgent.java
index 8849110..9380ab7 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgent.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgent.java
@@ -114,6 +114,7 @@ public class RouterAgent extends SingleCapabilityAgent implements
new FlowExporterCapability((FlowExporter) router
.getRole(Role.FLOW_EXPORTER)));
}
+
setPlanSelectionStrategy(this);
}
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgentCapability.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgentCapability.java
index e3e2d14..1e3ecf9 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgentCapability.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/RouterAgentCapability.java
@@ -21,6 +21,9 @@
//----------------------------------------------------------------------------
package br.ufrgs.inf.bdinetr.agent;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,23 +32,32 @@ import bdi4jade.belief.Predicate;
import bdi4jade.belief.TransientPredicate;
import bdi4jade.core.Capability;
import bdi4jade.core.GoalUpdateSet;
+import bdi4jade.core.GoalUpdateSet.GoalDescription;
import bdi4jade.event.GoalListener;
+import bdi4jade.goal.BeliefGoal;
import bdi4jade.goal.BeliefNotPresentGoal;
import bdi4jade.goal.BeliefPresentGoal;
import bdi4jade.goal.Goal;
+import bdi4jade.goal.GoalStatus;
import bdi4jade.goal.PredicateGoal;
+import bdi4jade.reasoning.DeliberationFunction;
import br.ufrgs.inf.bdinetr.domain.Role;
/**
* @author Ingrid Nunes
*/
-public abstract class RouterAgentCapability extends Capability {
+public abstract class RouterAgentCapability extends Capability implements
+ DeliberationFunction {
public static final String ROLE_BELIEF = "role";
private static final long serialVersionUID = -3491170777812144486L;
protected final Log log = LogFactory.getLog(getClass());
+ public RouterAgentCapability() {
+ setDeliberationFunction(this);
+ }
+
protected void addBelief(Belief<?, ?> belief) {
getBeliefBase().addOrUpdateBelief(belief);
log.debug("belief added or updated: " + belief);
@@ -64,6 +76,36 @@ public abstract class RouterAgentCapability extends Capability {
}
}
+ @Override
+ public Set<Goal> filter(Set<GoalDescription> goals) {
+ Set<Goal> priorityGoals = new HashSet<>();
+ Set<Goal> nonpriorityGoals = new HashSet<>();
+
+ if (getLowPriorityGoal() == null) {
+ for (GoalDescription goalDescription : goals) {
+ priorityGoals.add(goalDescription.getGoal());
+ }
+ } else {
+ for (GoalDescription goalDescription : goals) {
+ if (isNonPriorityGoal(goalDescription)) {
+ nonpriorityGoals.add(goalDescription.getGoal());
+ } else {
+ priorityGoals.add(goalDescription.getGoal());
+ }
+ }
+ }
+
+ if (!priorityGoals.isEmpty()) {
+ return priorityGoals;
+ } else {
+ return nonpriorityGoals;
+ }
+ }
+
+ protected Class<?> getLowPriorityGoal() {
+ return null;
+ }
+
public abstract Role getRole();
protected void goal(GoalUpdateSet goalUpdateSet, Object proposition) {
@@ -102,9 +144,28 @@ public abstract class RouterAgentCapability extends Capability {
}
}
+ private boolean isNonPriorityGoal(GoalDescription goalDesc) {
+ if (GoalStatus.WAITING.equals(goalDesc.getStatus())) {
+ if (goalDesc.getGoal() instanceof BeliefGoal) {
+ BeliefGoal<?> bg = (BeliefGoal<?>) goalDesc.getGoal();
+ return bg.getBeliefName().getClass()
+ .equals(getLowPriorityGoal());
+ }
+ }
+ return false;
+ }
+
protected void removeBelief(Belief<?, ?> belief) {
getBeliefBase().removeBelief(belief.getName());
log.debug("belief removed: " + belief);
}
+ @Override
+ public void setCapability(Capability capability) {
+ if (!this.equals(capability)) {
+ throw new IllegalArgumentException(
+ "This reasoning strategy is already associated with another capability.");
+ }
+ }
+
}
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java b/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
index 75b920b..d81cb91 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
@@ -79,7 +79,7 @@ public class BDINetRApp {
routers.add(new Router(new Ip("RouterAD"), Role.ANOMALY_DETECTION
.getId()));
routers.add(new Router(new Ip("RouterCL"), Role.CLASSIFIER.getId()));
- routers.add(new Router(new Ip("RouterEX"), Role.FLOW_EXPORTER.getId()));
+ routers.add(new Router(new Ip("RouterFE"), Role.FLOW_EXPORTER.getId()));
Link affectedLink = new Link("AFFECTED_LINK");
