Implemented turning on/off PD for specific agent types.

COBWEB-ca · May 9, 2018 · bc73f8b · bc73f8b
1 parent 223fcbc
commit bc73f8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/cobweb/cobweb2/plugins/pd/PDAgentParams.java b/src/main/java/org/cobweb/cobweb2/plugins/pd/PDAgentParams.java
@@ -10,6 +10,10 @@
 
 public class PDAgentParams implements ParameterSerializable {
 
+	@ConfDisplayName("PD Enabled")
+	@ConfXMLTag("pdEnabled")
+	public boolean pdEnabled = true;
+
 	/**
 	 * Use tit-for-tat strategy for prisoner's dilemma.
 	 */

diff --git a/src/main/java/org/cobweb/cobweb2/plugins/pd/PDMutator.java b/src/main/java/org/cobweb/cobweb2/plugins/pd/PDMutator.java
@@ -26,15 +26,15 @@ public void setParams(PDParams pdParams) {
 
 	@Override
 	public PDState stateForNewAgent(Agent agent) {
-		if (!params.enable)
+		if (!params.enable || !params.agentParams[agent.getType()].pdEnabled)
 			return null;
 
 		return new PDState(params.agentParams[agent.getType()].clone());
 	}
 
 	@Override
 	protected PDState stateFromParent(Agent agent, PDState parentState) {
-		if (!params.enable)
+		if (!params.enable || !params.agentParams[agent.getType()].pdEnabled)
 			return null;
 
 		return new PDState(parentState.agentParams.clone());