Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1493] trunk/src
|
From: <jom...@us...> - 2009-05-03 11:02:00
|
Revision: 1493
http://jason.svn.sourceforge.net/jason/?rev=1493&view=rev
Author: jomifred
Date: 2009-05-03 11:01:49 +0000 (Sun, 03 May 2009)
Log Message:
-----------
improve initialisation of Agent class
Modified Paths:
--------------
trunk/src/jason/architecture/AgArch.java
trunk/src/jason/asSemantics/Agent.java
trunk/src/jason/asSyntax/InternalActionLiteral.java
trunk/src/jason/asSyntax/Literal.java
trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
trunk/src/jason/asSyntax/parser/as2j.java
trunk/src/jason/asSyntax/patterns/goal/DG.java
trunk/src/jason/asSyntax/patterns/goal/EBDG.java
trunk/src/jason/asSyntax/patterns/goal/SGA.java
trunk/src/jason/control/ExecutionControlGUI.java
trunk/src/test/ASParserTest.java
trunk/src/test/BeliefBaseTest.java
trunk/src/test/ExprTermTest.java
trunk/src/test/RuleTest.java
trunk/src/test/StdLibTest.java
trunk/src/test/TSTest.java
trunk/src/test/VarTermTest.java
Modified: trunk/src/jason/architecture/AgArch.java
===================================================================
--- trunk/src/jason/architecture/AgArch.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/architecture/AgArch.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -158,7 +158,7 @@
/** Checks whether the agent is running */
public boolean isRunning() {
- return archTier.isRunning();
+ return archTier == null || archTier.isRunning();
}
/** sets the number of the current cycle in the sync execution mode */
Modified: trunk/src/jason/asSemantics/Agent.java
===================================================================
--- trunk/src/jason/asSemantics/Agent.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSemantics/Agent.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -83,16 +83,16 @@
public class Agent {
// Members
- protected BeliefBase bb = new DefaultBeliefBase();
- protected PlanLibrary pl = new PlanLibrary();
+ protected BeliefBase bb = null;
+ protected PlanLibrary pl = null;
protected TransitionSystem ts = null;
protected String aslSource = null;
- private List<Literal> initialGoals = new ArrayList<Literal>(); // initial goals in the source code
- private List<Literal> initialBels = new ArrayList<Literal>(); // initial beliefs in the source code
+ private List<Literal> initialGoals = null; // initial goals in the source code
+ private List<Literal> initialBels = null; // initial beliefs in the source code
- private Map<String, InternalAction> internalActions = new HashMap<String, InternalAction>();
- private Map<String, ArithFunction> functions = new HashMap<String, ArithFunction>();
+ private Map<String, InternalAction> internalActions = null;
+ private Map<String, ArithFunction> functions = null;
private boolean hasCustomSelOp = true;
@@ -105,12 +105,26 @@
checkCustomSelectOption();
}
+ /** initialise the TS and other components of the agent */
+ public void initAg() {
+ if (bb == null) bb = new DefaultBeliefBase();
+ if (pl == null) pl = new PlanLibrary();
+
+ if (initialGoals == null) initialGoals = new ArrayList<Literal>();
+ if (initialBels == null) initialBels = new ArrayList<Literal>();
+
+ if (internalActions == null) internalActions = new HashMap<String, InternalAction>();
+ initDefaultFunctions();
+
+ if (ts == null) ts = new TransitionSystem(this, new Circumstance(), new Settings(), new AgArch());
+ }
+
+
/** parse and load the agent code, asSrc may be null */
public void initAg(String asSrc) throws JasonException {
+ initAg();
// set the agent
try {
- initDefaultFunctions();
-
boolean parsingOk = true;
if (asSrc != null) {
asSrc = asSrc.replaceAll("\\\\", "/");
@@ -180,7 +194,7 @@
if (scheduler != null)
scheduler.shutdownNow();
}
-
+
/**
* Clone BB, PL, Circumstance.
* A new TS is created (based on the cloned circumstance).
@@ -320,6 +334,8 @@
}
public void initDefaultFunctions() {
+ if (functions == null)
+ functions = new HashMap<String, ArithFunction>();
addFunction(Count.class, false);
}
@@ -360,6 +376,7 @@
* either global (like math.max) or local (like .count).
*/
public ArithFunction getFunction(String function, int arity) {
+ if (functions == null) return null;
ArithFunction af = functions.get(function);
if (af == null || !af.checkArity(arity))
// try global function
Modified: trunk/src/jason/asSyntax/InternalActionLiteral.java
===================================================================
--- trunk/src/jason/asSyntax/InternalActionLiteral.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSyntax/InternalActionLiteral.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -77,7 +77,7 @@
@SuppressWarnings("unchecked")
public Iterator<Unifier> logicalConsequence(Agent ag, Unifier un) {
- if (ag.getTS().getUserAgArch().isRunning()) {
+ if (ag == null || ag.getTS().getUserAgArch().isRunning()) {
try {
// clone terms array
Term[] clone = getTermsArray();
Modified: trunk/src/jason/asSyntax/Literal.java
===================================================================
--- trunk/src/jason/asSyntax/Literal.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSyntax/Literal.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -255,16 +255,16 @@
* Returns an iterator for all unifiers that are logCons.
*/
public Iterator<Unifier> logicalConsequence(final Agent ag, final Unifier un) {
- final Iterator<Literal> il = ag.getBB().getCandidateBeliefs(this, un);
+ final Iterator<Literal> il = ag.getBB().getCandidateBeliefs(this, un);
if (il == null) // no relevant bels
return LogExpr.EMPTY_UNIF_LIST.iterator();
+ final AgArch arch = ag == null ? null : ag.getTS().getUserAgArch();
return new Iterator<Unifier>() {
Unifier current = null;
Iterator<Unifier> ruleIt = null; // current rule solutions iterator
Rule rule; // current rule
Literal cloneAnnon = null; // a copy of the literal with makeVarsAnnon
- AgArch arch = ag.getTS().getUserAgArch();
boolean needsUpdate = true;
public boolean hasNext() {
@@ -285,7 +285,7 @@
private void get() {
needsUpdate = false;
current = null;
- if (!arch.isRunning()) return;
+ if (arch != null && !arch.isRunning()) return;
// try rule iterator
while (ruleIt != null && ruleIt.hasNext()) {
Modified: trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
===================================================================
--- trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2009-05-03 11:01:49 UTC (rev 1493)
@@ -65,7 +65,7 @@
return "["+s.getSrcFile()+":"+s.getBeginSrcLine()+"]";
}
private String getSourceRef(DefaultTerm t) {
- return getSourceRef( ((DefaultTerm)t).getSrcInfo());
+ return getSourceRef( t.getSrcInfo());
}
private String getSourceRef(Object t) {
if (t instanceof DefaultTerm)
@@ -243,7 +243,7 @@
"{"
( LOOKAHEAD(4)
<TK_BEGIN> dir = pred() "}"
- { Agent innerAg = new Agent(); }
+ { Agent innerAg = new Agent(); innerAg.initAg(); }
isEOF = agent(innerAg)
{ if (isEOF)
throw new ParseException(getSourceRef(dir)+" The directive '{ begin "+dir+"}' does not end with '{ end }'.");
Modified: trunk/src/jason/asSyntax/parser/as2j.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2j.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSyntax/parser/as2j.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -35,7 +35,7 @@
return "["+s.getSrcFile()+":"+s.getBeginSrcLine()+"]";
}
private String getSourceRef(DefaultTerm t) {
- return getSourceRef( ((DefaultTerm)t).getSrcInfo());
+ return getSourceRef( t.getSrcInfo());
}
private String getSourceRef(Object t) {
if (t instanceof DefaultTerm)
@@ -251,7 +251,7 @@
jj_consume_token(TK_BEGIN);
dir = pred();
jj_consume_token(28);
- Agent innerAg = new Agent();
+ Agent innerAg = new Agent(); innerAg.initAg();
isEOF = agent(innerAg);
if (isEOF)
{if (true) throw new ParseException(getSourceRef(dir)+" The directive '{ begin "+dir+"}' does not end with '{ end }'.");}
Modified: trunk/src/jason/asSyntax/patterns/goal/DG.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/DG.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSyntax/patterns/goal/DG.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -26,6 +26,7 @@
public Agent process(Pred directive, Agent outerContent, Agent innerContent) {
try {
Agent newAg = new Agent();
+ newAg.initAg();
Literal goal = Literal.parseLiteral(directive.getTerm(0).toString());
Modified: trunk/src/jason/asSyntax/patterns/goal/EBDG.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/EBDG.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSyntax/patterns/goal/EBDG.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -29,6 +29,7 @@
public Agent process(Pred directive, Agent outerContent, Agent innerContent) {
try {
Agent newAg = new Agent();
+ newAg.initAg();
Literal goal = Literal.parseLiteral(directive.getTerm(0).toString());
Modified: trunk/src/jason/asSyntax/patterns/goal/SGA.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/SGA.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/asSyntax/patterns/goal/SGA.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -29,6 +29,7 @@
Term goal = directive.getTerm(2);
Agent newAg = new Agent();
+ newAg.initAg();
// add t : not f__l(_) & c <- !f__g(g).
newAg.getPL().add(ASSyntax.parsePlan(trigger+" : not f__l(_) & " +context +" <- !f__g("+goal+")."));
Modified: trunk/src/jason/control/ExecutionControlGUI.java
===================================================================
--- trunk/src/jason/control/ExecutionControlGUI.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/jason/control/ExecutionControlGUI.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -224,8 +224,7 @@
jList = new JList(listModel);
spList = new JPanel(new BorderLayout());
spList.add(BorderLayout.CENTER, new JScrollPane(jList));
- spList.setBorder(BorderFactory.createTitledBorder(BorderFactory
- .createEtchedBorder(), "Agents", TitledBorder.LEFT, TitledBorder.TOP));
+ spList.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Agents", TitledBorder.LEFT, TitledBorder.TOP));
jList.addListSelectionListener(new ListSelectionListener() {
public void valueChanged(ListSelectionEvent e) {
String ag = jList.getSelectedValue().toString();
Modified: trunk/src/test/ASParserTest.java
===================================================================
--- trunk/src/test/ASParserTest.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/test/ASParserTest.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -4,9 +4,7 @@
import static jason.asSyntax.ASSyntax.createLiteral;
import static jason.asSyntax.ASSyntax.createNumber;
import static jason.asSyntax.ASSyntax.createString;
-import jason.architecture.AgArch;
import jason.asSemantics.Agent;
-import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
import jason.asSyntax.ASSyntax;
import jason.asSyntax.ListTerm;
@@ -23,7 +21,6 @@
import jason.asSyntax.PlanBody.BodyType;
import jason.asSyntax.parser.ParseException;
import jason.asSyntax.parser.as2j;
-import jason.infra.centralised.CentralisedAgArch;
import jason.mas2j.MAS2JProject;
import jason.mas2j.parser.mas2j;
@@ -43,10 +40,7 @@
public void testKQML() {
Agent ag = new Agent();
- ag.setLogger(null);
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
assertTrue(ag.parseAS(new File("src/asl/kqmlPlans.asl")));
assertTrue(ag.parseAS(new File("examples/auction/ag1.asl")));
@@ -136,8 +130,9 @@
as2j parser = new as2j(new StringReader(source));
Agent a = new Agent();
+ a.initAg();
parser.agent(a);
- assertEquals(a.getPL().getPlans().size(), 7);
+ assertEquals(7, a.getPL().getPlans().size());
source = " { begin omc(at(X,Y), no_battery, no_beer) } \n";
source += " +!at(X,Y) : b(X) <- go(X,Y). ";
@@ -145,6 +140,7 @@
source += " { end }";
parser = new as2j(new StringReader(source));
a = new Agent();
+ a.initAg();
a.setASLSrc("test1");
parser.agent(a);
assertTrue(a.getPL().getPlans().size() == 8);
@@ -156,6 +152,7 @@
source += " { end }";
parser = new as2j(new StringReader(source));
a = new Agent();
+ a.initAg();
parser.agent(a);
//for (Plan p: a.getPL().getPlans()) {
// System.out.println(p);
@@ -167,11 +164,12 @@
source += " { end }";
parser = new as2j(new StringReader(source));
a = new Agent();
+ a.initAg();
parser.agent(a);
//for (Plan p: a.getPL().getPlans()) {
// System.out.println(p);
//}
- assertTrue(a.getPL().getPlans().size() == 5);
+ assertEquals(5, a.getPL().getPlans().size());
}
@@ -283,6 +281,8 @@
parseDir(f);
} else if (f.getName().endsWith(MAS2JProject.AS_EXT)) {
as2j parser = new as2j(new FileInputStream(f));
+ //Agent ag = new Agent();
+ //ag.init();
parser.agent((Agent)null);
} else if (f.getName().endsWith(MAS2JProject.EXT)) {
mas2j parser = new mas2j(new FileInputStream(f));
Modified: trunk/src/test/BeliefBaseTest.java
===================================================================
--- trunk/src/test/BeliefBaseTest.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/test/BeliefBaseTest.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -1,10 +1,8 @@
package test;
import jason.RevisionFailedException;
-import jason.architecture.AgArch;
import jason.asSemantics.Agent;
import jason.asSemantics.Intention;
-import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
import jason.asSyntax.ASSyntax;
import jason.asSyntax.Atom;
@@ -22,7 +20,6 @@
import jason.bb.BeliefBase;
import jason.bb.DefaultBeliefBase;
import jason.bb.JDBCPersistentBB;
-import jason.infra.centralised.CentralisedAgArch;
import java.util.Iterator;
import java.util.List;
@@ -253,9 +250,7 @@
public void testRemWithUnnamedVar() {
Agent ag = new Agent();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
ag.getBB().add(Literal.parseLiteral("pos(2,3)"));
Unifier u = new Unifier();
@@ -271,9 +266,7 @@
@SuppressWarnings("unused")
public void testLogCons() {
Agent ag = new Agent();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
ag.getBB().add(Literal.parseLiteral("a(10)"));
ag.getBB().add(Literal.parseLiteral("a(20)"));
@@ -525,9 +518,7 @@
@SuppressWarnings("unchecked")
public void testBelBRF() throws RevisionFailedException {
Agent ag = new Agent();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
ag.getBB().add(Literal.parseLiteral("a(10)"));
ag.getBB().add(Literal.parseLiteral("a(20)[a]"));
@@ -598,6 +589,7 @@
public void testClone() {
Agent ag = new Agent();
+ ag.initAg();
ag.getBB().add(1,Literal.parseLiteral("a(10)"));
ag.getBB().add(1,Literal.parseLiteral("a(20)[a]"));
ag.getBB().add(1,Literal.parseLiteral("a(30)[a,b]"));
@@ -605,7 +597,7 @@
ag.getBB().add(1,Literal.parseLiteral("c(y)"));
ag.getBB().add(Literal.parseLiteral("c(20)"));
BeliefBase c = (BeliefBase)ag.getBB().clone();
- assertEquals(ag.getBB().toString(), c.toString());
+ assertEquals(ag.getBB().size(), c.size());
}
@SuppressWarnings("unchecked")
Modified: trunk/src/test/ExprTermTest.java
===================================================================
--- trunk/src/test/ExprTermTest.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/test/ExprTermTest.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -1,9 +1,7 @@
package test;
import jason.JasonException;
-import jason.architecture.AgArch;
import jason.asSemantics.Agent;
-import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
import jason.asSyntax.ASSyntax;
import jason.asSyntax.ArithExpr;
@@ -17,7 +15,6 @@
import jason.asSyntax.Term;
import jason.asSyntax.VarTerm;
import jason.asSyntax.parser.ParseException;
-import jason.infra.centralised.CentralisedAgArch;
import java.util.Collections;
@@ -207,10 +204,7 @@
public void testCount() throws Exception {
Agent ag = new Agent();
- ag.initDefaultFunctions();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
assertTrue(ag.getFunction(".count",1) != null);
ag.getBB().add(Literal.parseLiteral("b(10)"));
Modified: trunk/src/test/RuleTest.java
===================================================================
--- trunk/src/test/RuleTest.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/test/RuleTest.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -1,14 +1,11 @@
package test;
-import jason.architecture.AgArch;
import jason.asSemantics.Agent;
-import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
import jason.asSyntax.Literal;
import jason.asSyntax.LogExpr;
import jason.asSyntax.Rule;
import jason.asSyntax.VarTerm;
-import jason.infra.centralised.CentralisedAgArch;
import java.util.HashMap;
import java.util.Iterator;
@@ -25,9 +22,7 @@
public void testLogCons() {
Agent ag = new Agent();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
ag.getBB().add(Literal.parseLiteral("a(10)"));
ag.getBB().add(Literal.parseLiteral("a(20)"));
@@ -79,9 +74,7 @@
public void testLogCons2() {
Agent ag = new Agent();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
Rule r = new Rule(Literal.parseLiteral("r([],a(X),b(X,4))"), Literal.parseLiteral("true"));
ag.getBB().add(r);
@@ -98,9 +91,7 @@
public void testLogConsRec() {
Agent ag = new Agent();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
// add
// min([],M,M).
Modified: trunk/src/test/StdLibTest.java
===================================================================
--- trunk/src/test/StdLibTest.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/test/StdLibTest.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -1,7 +1,6 @@
package test;
import jason.RevisionFailedException;
-import jason.architecture.AgArch;
import jason.asSemantics.Agent;
import jason.asSemantics.Circumstance;
import jason.asSemantics.IntendedMeans;
@@ -25,7 +24,6 @@
import jason.asSyntax.VarTerm;
import jason.asSyntax.parser.ParseException;
import jason.bb.BeliefBase;
-import jason.infra.centralised.CentralisedAgArch;
import jason.stdlib.add_annot;
import jason.stdlib.add_nested_source;
import jason.stdlib.add_plan;
@@ -64,6 +62,7 @@
p5 = Plan.parse("+!g5 : true <- i.");
ag = new Agent();
+ ag.initAg();
ag.getPL().add(Plan.parse("-!g1 : true <- j."));
}
@@ -112,10 +111,7 @@
public void testFindAll() throws RevisionFailedException, ParseException {
Agent ag = new Agent();
- ag.setLogger(null);
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
Literal l1 = Literal.parseLiteral("a(10,x)");
assertFalse(l1.hasSource());
@@ -142,7 +138,7 @@
public void testGetRelevantPlansAndAddPlan() throws Exception {
Agent ag = new Agent();
- ag.setLogger(null);
+ ag.initAg();
Plan pa = ASSyntax.parsePlan("@t1 +a : g(10) <- .print(\"ok 10\").");
ag.getPL().add(pa, null, false);
assertTrue(pa != null);
Modified: trunk/src/test/TSTest.java
===================================================================
--- trunk/src/test/TSTest.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/test/TSTest.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -33,11 +33,11 @@
public void testRelevant() throws ParseException, JasonException {
Agent ag = new Agent();
- Circumstance c = new Circumstance();
+ ag.initAg();
ag.getPL().add(ASSyntax.parsePlan("@t1 +a(X) : g(10) <- .print(\"ok 10\")."), new Structure("nosource"), false);
ag.getPL().add((Plan)ASSyntax.parseTerm("{ @t2 +a(X) : true <- .print(\"ok 20\") }"), new Structure("nosource"), false);
ag.getPL().add(ASSyntax.parsePlan("@t3 +b : true <- true."), new Structure("nosource"), false);
- TransitionSystem ts = new TransitionSystem(ag, c, null, null);
+ TransitionSystem ts = ag.getTS();
Literal content = Literal.parseLiteral("~alliance");
content.addSource(new Structure("ag1"));
Modified: trunk/src/test/VarTermTest.java
===================================================================
--- trunk/src/test/VarTermTest.java 2009-04-28 19:24:45 UTC (rev 1492)
+++ trunk/src/test/VarTermTest.java 2009-05-03 11:01:49 UTC (rev 1493)
@@ -1,9 +1,7 @@
package test;
import jason.RevisionFailedException;
-import jason.architecture.AgArch;
import jason.asSemantics.Agent;
-import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
import jason.asSyntax.ASSyntax;
import jason.asSyntax.ArithExpr;
@@ -23,7 +21,6 @@
import jason.asSyntax.parser.SimpleCharStream;
import jason.asSyntax.parser.Token;
import jason.asSyntax.parser.as2jTokenManager;
-import jason.infra.centralised.CentralisedAgArch;
import java.io.StringReader;
import java.util.ArrayList;
@@ -335,9 +332,7 @@
public void testVarWithAnnotsInLogCons() throws RevisionFailedException, ParseException {
Agent ag = new Agent();
- AgArch arch = new AgArch();
- arch.setArchInfraTier(new CentralisedAgArch());
- ag.setTS(new TransitionSystem(ag, null, null, arch));
+ ag.initAg();
ag.addBel(Literal.parseLiteral("b1[b]"));
ag.addBel(Literal.parseLiteral("b2[d]"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
