Updated MC with recent AORTA changes

ajpf2014/jpf.properties

@@ -192,7 +192,8 @@ vm.gc = true
 # threshold after which number of allocations to perform a garbage collection                                  
 # (even within the same transition, to avoid lots of short living objects)                                     
 # -1 means never                                                                                               
-vm.max_alloc_gc = -1
+#vm.max_alloc_gc = -1
+vm.max_alloc_gc = 100
 
 # do we run finalizers on collected objects (only makes sense with garbage collection)                         
 vm.finalize = false

ajpf2014/src/classes/ail/mas/ActionScheduler.java

@@ -31,6 +31,8 @@
 import ajpf.PerceptListener;
 import ajpf.MCAPLScheduler;
 import ajpf.MCAPLJobber;
+import java.util.Collection;
+import java.util.Set;
 
 
 /**

ajpf2014/src/classes/ail/semantics/AILAgent.java

@@ -1604,7 +1604,7 @@ public boolean goalEntails(Event e, Plan p, Unifier un) {
 	}
 
 	//---------------------- REASON
-
+	String lastPrint = "";
 	/**
 	 * Call the reasoning cycle.  This method relies heavily on the implementation
 	 * of the reasoning cycle and OSRule interface.  While the Reasoning Cycle does
@@ -1615,6 +1615,11 @@ public boolean goalEntails(Event e, Plan p, Unifier un) {
 	 * cycle.  
 	 */
 	public void reason() {
+//		String print = "[" + fAgName + "] " + getGoalBase();
+//		if (!print.equals(lastPrint)) {
+//			lastPrint = print;
+//			System.out.println(lastPrint);
+//		}
 		if (RC.not_interrupted()) {
 		RC.setStopandCheck(false);
 

ajpf2014/src/classes/ajpf/MCAPLcontroller.java

@@ -201,7 +201,7 @@ public void begin() {
 
 	public MCAPLJobber scheduling() {
 		List<MCAPLJobber> activeJobs = scheduler.getActiveJobbers();
-		//AJPFLogger.info("ajpf.MCAPLcontroller", "About to pick job");
+		AJPFLogger.fine("ajpf.MCAPLcontroller", "About to pick job from " + activeJobs);
 		if (!activeJobs.isEmpty()) {
 			a = null;
 			int job_num = pickJob(activeJobs.size());

examples/2apl/auctionhouse/nbproject/project.properties

@@ -56,8 +56,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
+javac.source=1.7
+javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

framework/src/java/aorta/AgentState.java

@@ -29,22 +29,21 @@ public class AgentState extends State {
 
 	private static final Logger logger = Logger.getLogger(AgentState.class.getName());
 
+	@FilterField
 	private AortaAgent agent;
 
 	@FilterField
 	private List<ReasoningRule> rules;
 
+	@FilterField
 	private Queue<OutgoingOrganizationalMessage> out;
 
 	@FilterField
 	private ExternalAgent externalAgent;
 
 	@FilterField
 	private AortaBridge bridge;
-
-	@FilterField
-	private List<Var> bindings;
-
+
 	public AgentState(AortaAgent agent, MentalState mentalState, Metamodel metamodel, List<ReasoningRule> rules) {
 		super(mentalState, metamodel);
 		this.agent = agent;
@@ -53,8 +52,6 @@ public AgentState(AortaAgent agent, MentalState mentalState, Metamodel metamodel
 		out = new LinkedList<>();
 
 		externalAgent = new ExternalAgent();
-
-		bindings = new ArrayList<>();
 	}
 
 	public void setBridge(AortaBridge bridge) {
@@ -111,7 +108,7 @@ public void insertMessage(IncomingOrganizationalMessage msg) {
 
 		if (insert) {
 			getMentalState().insert(contents);
-			logger.fine("insertMessage(" + msg + ")");
+			logger.finer("insertMessage(" + msg + ")");
 			setChanged(true);
 		}
 	}
@@ -137,7 +134,7 @@ public void removeTerm(Struct term, KBType type) {
 
 	public void sendMessage(OutgoingOrganizationalMessage msg) {
 		out.add(msg);	
-		logger.fine("sendMessage(" + msg + ")");
+		logger.finer("sendMessage(" + msg + ")");
 		setChanged(true);
 	}
 

framework/src/java/aorta/AortaAgent.java

@@ -1,6 +1,9 @@
 package aorta;
 
+import alice.tuprolog.NoSolutionException;
+import alice.tuprolog.SolveInfo;
 import alice.tuprolog.Struct;
+import alice.tuprolog.Var;
 import aorta.kr.KBType;
 import java.util.List;
 
@@ -16,7 +19,8 @@
 import aorta.organization.AortaArtifactAgent;
 import aorta.reasoning.MessageFunction;
 import aorta.reasoning.ReasoningRule;
-import aorta.tracer.ExecutionTrace;
+import aorta.tracer.ConsoleTrace;
+import aorta.tracer.StateListener;
 import aorta.tracer.Tracer;
 import aorta.ts.strategy.AgentStrategy;
 import cartago.ArtifactId;
@@ -28,7 +32,6 @@
 
 public class AortaAgent {
 
-	@FilterField
 	private int cycle;
 
 	public static final Logger logger = Logger.getLogger(AortaAgent.class.getName());
@@ -51,7 +54,7 @@ public class AortaAgent {
     private String lastTrace;
 
 	@FilterField
-	private final ExecutionTrace trace;
+	private final StateListener trace;
 
 	private boolean lastCycleChangedState = true;
 
@@ -61,8 +64,8 @@ public AortaAgent(String name, MentalState mentalState, Metamodel metamodel, Lis
 
 		state = new AgentState(this, mentalState, metamodel, rules);
 
-		trace = new ExecutionTrace(name);
-		state.addStateListener(trace);
+		trace = new ConsoleTrace(name);
+//		state.addStateListener(trace);
 
 		setup();
 	}
@@ -133,8 +136,18 @@ public Aorta getAorta() {
 	public void newCycle() throws StrategyFailedException {
 		cycle++;
 
+		String goals = "";
+		List<SolveInfo> infos = state.getMentalState().findAll(new Struct("goal", new Var("G")));
+		for (SolveInfo info : infos) {
+			if (info.isSuccess()) {
+				try {
+					goals += info.getVarValue("G") + ";";
+				} catch (NoSolutionException ex) {}
+			}
+		}
+
 		long start = System.currentTimeMillis();
-		logger.log(Level.FINEST, "(" + getName() + ") New AORTA cycle [" + cycle + "]. Strategy: " + strategy.getClass().getName());
+		logger.log(Level.FINE, "(" + getName() + ") New AORTA cycle [" + cycle + "]. Goals: " + goals);
 
 		if (cycle == 1) {
 			state.notifyNewState();
@@ -146,7 +159,7 @@ public void newCycle() throws StrategyFailedException {
 		lastCycleChangedState = state.hasChanged();
 
 		if (!state.getOut().isEmpty()) {
-			logger.log(Level.FINEST, "(" + getName() + ") Sending " + state.getOut().size() + " messages.");
+			logger.log(Level.FINE, "(" + getName() + ") Sending " + state.getOut().size() + " messages.");
 			Iterator<OutgoingOrganizationalMessage> it = state.getOut().iterator();
 			while (it.hasNext()) {
 				OutgoingOrganizationalMessage msg = it.next();
@@ -160,11 +173,7 @@ public void newCycle() throws StrategyFailedException {
         lastTrace = Tracer.printTrace(name);
 
 		state.notifyNewState();
-		logger.log(Level.FINEST, "(" + getName() + ") Cycle done [" + cycle + "] (time: " + (System.currentTimeMillis() - start) + " ms)");
-	}
-
-	public ExecutionTrace getExecutionTrace() {
-		return trace;
+		logger.log(Level.FINE, "(" + getName() + ") Cycle done [" + cycle + "] (time: " + (System.currentTimeMillis() - start) + " ms)");
 	}
 
     public String getLastTrace() {

framework/src/java/aorta/reasoning/action/CommitAction.java

@@ -33,10 +33,10 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 
 		MentalState ms = state.getMentalState();
 
-		final Term clonedObjTerm = Term.createTerm(objective.toString());
+		Term clonedObjTerm = Term.createTerm(objective.toString());
 
 		String bef = clonedObjTerm.toString();
-		ms.unify(clonedObjTerm, state.getBindings());
+		clonedObjTerm = ms.unify(clonedObjTerm, state.getBindings());
 
 		Term belTerm = FormulaQualifier.qualifyTerm(clonedObjTerm, KBType.BELIEF);
 		Term goalTerm = FormulaQualifier.qualifyTerm(clonedObjTerm, KBType.GOAL);
@@ -49,7 +49,7 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 		if (result.isSuccess()) {
 			state.addBindings(result);
 
-			ms.unify(clonedObjTerm, state.getBindings());
+			clonedObjTerm = ms.unify(clonedObjTerm, state.getBindings());
 
 			Struct asStruct;
 			if (clonedObjTerm instanceof Var) {
@@ -61,7 +61,7 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 			ActionExecution tr = new ActionExecution();
 			tr.add(newState, asStruct, KBType.GOAL);
 
-			logger.fine("[" + state.getAgent().getName() + "/" + state.getAgent().getCycle() + "] Executing action: commit(" + asStruct + ")");
+			logger.finer("[" + state.getAgent().getName() + "/" + state.getAgent().getCycle() + "] Executing action: commit(" + asStruct + ")");
 			Tracer.queue(state.getAgent().getName(), "commit(" + asStruct + ")");
 		} else {
 			return null;

framework/src/java/aorta/reasoning/action/DeactAction.java

@@ -51,7 +51,7 @@ protected AgentState executeAction(Term option, AgentState state)
 			state.addBindings(result);
 
 			Term qualified = FormulaQualifier.qualifyTerm(reaDef, KBType.ORGANIZATION.getType());
-			ms.unify(qualified, state.getBindings());
+			qualified = ms.unify(qualified, state.getBindings());
 
 			if (!qualified.isGround()) {
 				throw new AORTAException("Cannot execute action: term '" + qualified + "' is not ground.");
@@ -74,7 +74,7 @@ protected AgentState executeAction(Term option, AgentState state)
 					ActionExecution tr = new ActionExecution();
 					tr.remove(newState, (Struct) qualified);
 
-					logger.fine("[" + state.getAgent().getName() + "] Executing action: deact(" + qualified + ")");
+					logger.finer("[" + state.getAgent().getName() + "] Executing action: deact(" + qualified + ")");
 					Tracer.queue(state.getAgent().getName(), "deact(" + qualified + ")");
 				}
 			} else {

framework/src/java/aorta/reasoning/action/DropAction.java

@@ -31,7 +31,7 @@ public Term getObjective() {
 	protected AgentState executeAction(Term option, AgentState state) throws AORTAException {
 		AgentState newState = state;
 
-		final Term clonedObjTerm = Term.createTerm(objective.toString());
+		Term clonedObjTerm = Term.createTerm(objective.toString());
 
 		// Check that it is already a goal
 		Term goalTerm = FormulaQualifier.qualifyTerm(clonedObjTerm, KBType.GOAL.getType(), true);
@@ -42,7 +42,7 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 		if (result.isSuccess()) {
 			state.addBindings(result);
 
-			ms.unify(clonedObjTerm, state.getBindings());
+			clonedObjTerm = ms.unify(clonedObjTerm, state.getBindings());
 
 			if (!clonedObjTerm.isGround()) {
 				throw new AORTAException("Cannot execute action: term '" + clonedObjTerm + "' is not ground.");
@@ -56,7 +56,7 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 
 				ActionExecution tr = new ActionExecution();
 				tr.remove(newState, asStruct, KBType.GOAL);
-				logger.fine("[" + state.getAgent().getName() + "] Executing action: drop(" + asStruct + ")");
+				logger.finer("[" + state.getAgent().getName() + "] Executing action: drop(" + asStruct + ")");
 				Tracer.queue(state.getAgent().getName(), "drop(" + asStruct + ")");
 			}
 		} else {

framework/src/java/aorta/reasoning/action/EnactAction.java

@@ -46,7 +46,7 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 		Term t2 = FormulaQualifier.qualifyTerm(reaDef, KBType.ORGANIZATION.getType());
 
 		Term test = Term.createTerm(t1 + ", \\+ " + t2);
-		ms.unify(test, state.getBindings());
+		test = ms.unify(test, state.getBindings());
 
 		SolveInfo result = ms.solve(test);
 
@@ -55,7 +55,7 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 			state.addBindings(result);
 
 			Term qualified = FormulaQualifier.qualifyTerm(reaDef, KBType.ORGANIZATION.getType());
-			ms.unify(qualified, state.getBindings());
+			qualified = ms.unify(qualified, state.getBindings());
 
 			if (!qualified.isGround()) {
 				throw new AORTAException("Cannot execute action: term '" + qualified + "' is not ground.");
@@ -85,7 +85,7 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 				Struct send = ml.send(Term.TRUE, new Struct("tell"), qualified);
 				tr.add(newState, FormulaQualifier.qualifyStruct(send, KBType.OPTION));
 
-				logger.fine("[" + state.getAgent().getName() + "] Executing action: enact(" + qualified + ")");
+				logger.finer("[" + state.getAgent().getName() + "] Executing action: enact(" + qualified + ")");
 				Tracer.queue(state.getAgent().getName(), "enact(" + qualified + ")");
 
 			} else {

framework/src/java/aorta/reasoning/action/SendAction.java

@@ -57,11 +57,11 @@ protected AgentState executeAction(Term option, AgentState state) throws AORTAEx
 
 		MentalState ms = state.getMentalState();
 
-		final Term clonedMsgTerm = Term.createTerm(message.toString());		
-		ms.unify(clonedMsgTerm, state.getBindings());
+		Term clonedMsgTerm = Term.createTerm(message.toString());		
+		clonedMsgTerm = ms.unify(clonedMsgTerm, state.getBindings());
 
 		Term recipientsTerm = Term.createTerm(recipients.toString());
-		ms.unify(recipientsTerm, state.getBindings());
+		recipientsTerm = ms.unify(recipientsTerm, state.getBindings());
 
 		List<Term> rcpList = new ArrayList<>();
 		if (recipientsTerm.getTerm().isList()) {
@@ -99,7 +99,7 @@ protected void sendMessage(List<Term> recipientList, Term message, AgentState st
 		OutgoingOrganizationalMessage msg = new OutgoingOrganizationalMessage(recipientList, message);
 		state.sendMessage(msg);
 
-		logger.fine("[" + state.getAgent().getName() + "] Executing action: send(" + recipientList + "," + message + ")");
+		logger.finer("[" + state.getAgent().getName() + "] Executing action: send(" + recipientList + "," + message + ")");
 		Tracer.queue(state.getAgent().getName(), "send(" + recipientList + "," + message + ")");
 	}
 

framework/src/java/aorta/reasoning/action/SendOnceAction.java

@@ -58,7 +58,7 @@ protected void sendMessage(List<Term> recipientList, Term message, AgentState st
 			OutgoingOrganizationalMessage msg = new OutgoingOrganizationalMessage(recipientList, message);
 			state.sendMessage(msg);
 
-			logger.fine("[" + state.getAgent().getName() + "/" + state.getAgent().getCycle() + "] Executing action: sendonce(" + recipientList + "," + message + ")");
+			logger.finer("[" + state.getAgent().getName() + "/" + state.getAgent().getCycle() + "] Executing action: sendonce(" + recipientList + "," + message + ")");
 			Tracer.queue(state.getAgent().getName(), "sendonce(" + recipientList + "," + message + ")");
 		}
 	}

framework/src/java/aorta/ts/rules/ActionExecution.java

@@ -90,13 +90,13 @@ private AgentState actionExecuted(ActionRule ar, AgentState state, Formula ifCon
 
 					Term qualified = FormulaQualifier.qualifyGoal(ms, conjunctContext);
 
-					ms.unify(qualified, optionSolution);
+					qualified = ms.unify(qualified, optionSolution);
 					SolveInfo contextSolution = ms.solve(qualified);
 
 					if (contextSolution.isSuccess()) {
 						List<Var> bindings = AgentState.mergeBindings(optionSolution, contextSolution);
-						ms.unify(option, bindings);
-						ms.unify(qualified, bindings);
+						option = ms.unify(option, bindings);
+						qualified = ms.unify(qualified, bindings);
 
 						List<Var> prevBindings = newState.getBindings();
 
@@ -113,7 +113,7 @@ private AgentState actionExecuted(ActionRule ar, AgentState state, Formula ifCon
 						} else {
 							newState.setBindings(prevBindings);
 
-							logger.log(Level.FINE, "Transition was not possible (" + Tracer.getQueue(state.getAgent().getName()) + ")");
+							logger.log(Level.FINER, "Transition was not possible (" + Tracer.getQueue(state.getAgent().getName()) + ")");
 							Tracer.clearQueue(state.getAgent().getName());
 						}
 					}
@@ -122,7 +122,7 @@ private AgentState actionExecuted(ActionRule ar, AgentState state, Formula ifCon
 			}
 		} catch (AORTAException ex) {
 			Tracer.clearQueue(state.getAgent().getName());
-			logger.log(Level.FINE, "Transition was not possible (" + ex.getMessage() + ")");
+			logger.log(Level.FINER, "Transition was not possible (" + ex.getMessage() + ")");
 		}
 
 		return null;

framework/src/java/aorta/ts/rules/Check.java

@@ -32,7 +32,7 @@ public AgentState execute(AgentState state) {
 				Struct oMsg = (Struct) iom.getMessage();
 				Struct msg = (Struct) oMsg.getArg(0);
 
-				logger.log(Level.FINE, "Handling msg: " + msg + " from " + iom.getSender());
+				logger.log(Level.FINER, "Handling msg: " + msg + " from " + iom.getSender());
 
 				Tracer.trace(state.getAgent().getName(), getName(), iom.toString());
 

framework/src/java/aorta/ts/rules/og/DeactRule.java

@@ -46,13 +46,13 @@ protected AgentState execute(AgentState state) {
 			// TODO: create DeactTest 
 			SolveInfo result = ms.solve(test);
 			if (result.isSuccess()) {
-				ms.unify(optRole, result);
+				optRole = (Struct) ms.unify(optRole, result);
 
 				if (optRole.isGround()) {
 					//XXX: newState = state.clone();
 					add(newState, optRole);
 
-					logger.fine("[" + state.getAgent().getName() + "/" + state.getAgent().getCycle() + "] Adding option: " + optRole);
+					logger.finer("[" + state.getAgent().getName() + "/" + state.getAgent().getCycle() + "] Adding option: " + optRole);
 					Tracer.trace(state.getAgent().getName(), getName(), optRole.getArg(0).toString());
 				} else {
 					logger.warning("Failed to consider role, not ground: " + optRole);