Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1448] trunk
|
From: <jom...@us...> - 2009-02-18 14:31:03
|
Revision: 1448
http://jason.svn.sourceforge.net/jason/?rev=1448&view=rev
Author: jomifred
Date: 2009-02-18 14:30:59 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
method forceFullLiteralImpl is applied only for atoms (not for
expressions, for instance)
Modified Paths:
--------------
trunk/applications/jason-team/src/java/agent/OrgMaintenanceGoal.java
trunk/applications/jason-team/src/java/arch/CowboyArch.java
trunk/applications/jason-team/src/java/test/MindView.java
trunk/demos/gui/gui2/sample.asl
trunk/src/jason/asSemantics/TransitionSystem.java
trunk/src/jason/asSyntax/Literal.java
trunk/src/jason/asSyntax/Plan.java
trunk/src/jason/asSyntax/PlanBodyImpl.java
trunk/src/jason/asSyntax/PlanLibrary.java
trunk/src/jason/asSyntax/patterns/goal/BC.java
trunk/src/jason/asSyntax/patterns/goal/BDG.java
trunk/src/jason/asSyntax/patterns/goal/DG.java
trunk/src/jason/asSyntax/patterns/goal/EBDG.java
trunk/src/jason/asSyntax/patterns/goal/MG.java
trunk/src/jason/asSyntax/patterns/goal/OMC.java
trunk/src/jason/asSyntax/patterns/goal/RC.java
trunk/src/jason/asSyntax/patterns/goal/SGA.java
trunk/src/jason/asSyntax/patterns/goal/SMC.java
trunk/src/jason/control/ExecutionControlGUI.java
trunk/src/jason/stdlib/add_annot.java
trunk/src/jason/stdlib/add_plan.java
trunk/src/test/StdLibTest.java
trunk/src/test/TSTest.java
trunk/src/test/VarTermTest.java
Modified: trunk/applications/jason-team/src/java/agent/OrgMaintenanceGoal.java
===================================================================
--- trunk/applications/jason-team/src/java/agent/OrgMaintenanceGoal.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/applications/jason-team/src/java/agent/OrgMaintenanceGoal.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,6 +1,7 @@
package agent;
import jason.asSemantics.Agent;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.InternalActionLiteral;
import jason.asSyntax.Literal;
import jason.asSyntax.Plan;
@@ -51,7 +52,7 @@
String sp = "-!"+goal+" <- .current_intention(I); " +
".print(\"ooo Failure in organisational goal "+goal+"\", I); "+
endofplan + ".";
- Plan p = Plan.parse(sp);
+ Plan p = ASSyntax.parsePlan(sp);
newAg.getPL().add(p);
return newAg;
Modified: trunk/applications/jason-team/src/java/arch/CowboyArch.java
===================================================================
--- trunk/applications/jason-team/src/java/arch/CowboyArch.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/applications/jason-team/src/java/arch/CowboyArch.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -298,7 +298,6 @@
}
}
- @SuppressWarnings("unchecked")
@Override
public void checkMail() {
super.checkMail();
Modified: trunk/applications/jason-team/src/java/test/MindView.java
===================================================================
--- trunk/applications/jason-team/src/java/test/MindView.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/applications/jason-team/src/java/test/MindView.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -159,7 +159,6 @@
}
}
- @SuppressWarnings("unchecked")
private void setupSlider() {
int first = -1;
int size = 0;
Modified: trunk/demos/gui/gui2/sample.asl
===================================================================
--- trunk/demos/gui/gui2/sample.asl 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/demos/gui/gui2/sample.asl 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,4 +1,3 @@
-
/* Initial goals */
!start.
Modified: trunk/src/jason/asSemantics/TransitionSystem.java
===================================================================
--- trunk/src/jason/asSemantics/TransitionSystem.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSemantics/TransitionSystem.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -626,8 +626,8 @@
// manage the case of var unified with atom
if (body instanceof VarTerm) {
Term v = ((VarTerm)body).getValue();
- if (v != null && v instanceof Literal)
- body = ((Literal)v).forceLiteralImplClass();
+ if (v != null && v.isAtom())
+ body = ((Atom)v).forceFullLiteralImpl();
}
if (!body.hasSource()) {
// do not add source(self) in case the
Modified: trunk/src/jason/asSyntax/Literal.java
===================================================================
--- trunk/src/jason/asSyntax/Literal.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/Literal.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -379,17 +379,18 @@
}
}
- /**
- * Returns 'this' if this class is LiteralImpl, otherwise, create a new instance of LiteralImpl based on 'this'.
- * This method is useful to translate Atoms to LiteralImpl.
- */
- public Literal forceLiteralImplClass() {
- if (this instanceof LiteralImpl)
+ /**
+ * Transforms this into a full literal (which implements all methods of Literal), if it is an Atom;
+ * otherwise returns 'this'
+ */
+ public Literal forceFullLiteralImpl() {
+ if (this.isAtom() && !(this instanceof LiteralImpl))
+ return new LiteralImpl(this);
+ else
return this;
- else // it is Atom, Structure, Pred but not LiteralImpl
- return new LiteralImpl(this);
- }
+ }
+
@SuppressWarnings("serial")
static final class TrueLiteral extends LiteralImpl {
public TrueLiteral() {
Modified: trunk/src/jason/asSyntax/Plan.java
===================================================================
--- trunk/src/jason/asSyntax/Plan.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/Plan.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -107,6 +107,7 @@
context = null;
}
+ /** prefer using ASSyntax.parsePlan */
public static Plan parse(String sPlan) {
as2j parser = new as2j(new StringReader(sPlan));
try {
Modified: trunk/src/jason/asSyntax/PlanBodyImpl.java
===================================================================
--- trunk/src/jason/asSyntax/PlanBodyImpl.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/PlanBodyImpl.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -41,8 +41,8 @@
formType = t;
if (b != null) {
srcInfo = b.getSrcInfo();
- if (b instanceof Literal) {
- b = ((Literal)b).forceLiteralImplClass();
+ if (b.isAtom()) {
+ b = ((Atom)b).forceFullLiteralImpl();
}
}
term = b;
Modified: trunk/src/jason/asSyntax/PlanLibrary.java
===================================================================
--- trunk/src/jason/asSyntax/PlanLibrary.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/PlanLibrary.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -28,6 +28,7 @@
import jason.JasonException;
import jason.asSyntax.Trigger.TEOperator;
import jason.asSyntax.Trigger.TEType;
+import jason.asSyntax.parser.ParseException;
import jason.bb.BeliefBase;
import java.util.ArrayList;
@@ -35,8 +36,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -63,7 +62,7 @@
private static int lastPlanLabel = 0;
- private Logger logger = Logger.getLogger(PlanLibrary.class.getName());
+ //private Logger logger = Logger.getLogger(PlanLibrary.class.getName());
/**
* Add a new plan written as a String. The source
@@ -73,9 +72,9 @@
*
* The plan is added in the end of the PlanLibrary.
*
- * returns the plan added, null if it does not work.
+ * @returns the plan just added
*/
- public Plan add(StringTerm stPlan, Term tSource) {
+ public Plan add(StringTerm stPlan, Term tSource) throws ParseException, JasonException {
return add(stPlan, tSource, false);
}
@@ -89,39 +88,32 @@
* begin of the PlanLibrary; otherwise, it is added in
* the end.
*
- * returns the plan added, null if it does not work.
+ * @returns the plan just added
*/
- public Plan add(StringTerm stPlan, Term tSource, boolean before) {
+ public Plan add(StringTerm stPlan, Term tSource, boolean before) throws ParseException, JasonException {
String sPlan = stPlan.getString();
- try {
- // remove quotes \" -> "
- StringBuilder sTemp = new StringBuilder();
- for (int c=0; c <sPlan.length(); c++) {
- if (sPlan.charAt(c) != '\\') {
- sTemp.append(sPlan.charAt(c));
- }
+ // remove quotes \" -> "
+ StringBuilder sTemp = new StringBuilder();
+ for (int c=0; c <sPlan.length(); c++) {
+ if (sPlan.charAt(c) != '\\') {
+ sTemp.append(sPlan.charAt(c));
}
- sPlan = sTemp.toString();
- Plan p = Plan.parse(sPlan);
- if (p != null) {
- int i = plans.indexOf(p);
- if (i < 0) {
- // add label, if necessary
- if (p.getLabel() == null) {
- p.setLabel(getUniqueLabel());
- }
- p.getLabel().addSource(tSource);
- add(p, before);
- } else {
- p = plans.get(i);
- p.getLabel().addSource(tSource);
- }
- return p;
+ }
+ sPlan = sTemp.toString();
+ Plan p = ASSyntax.parsePlan(sPlan); //Plan.parse(sPlan);
+ int i = plans.indexOf(p);
+ if (i < 0) {
+ // add label, if necessary
+ if (p.getLabel() == null) {
+ p.setLabel(getUniqueLabel());
}
- } catch (Exception e) {
- logger.log(Level.SEVERE,"Error adding plan "+stPlan,e);
+ p.getLabel().addSource(tSource);
+ add(p, before);
+ } else {
+ p = plans.get(i);
+ p.getLabel().addSource(tSource);
}
- return null;
+ return p;
}
Modified: trunk/src/jason/asSyntax/patterns/goal/BC.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/BC.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/BC.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,7 +1,7 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
-import jason.asSyntax.Plan;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.Pred;
import jason.asSyntax.Term;
import jason.asSyntax.directives.Directive;
@@ -35,7 +35,7 @@
if (newAg != null) {
// add +!g : true <- !!g.
- newAg.getPL().add(Plan.parse("+!"+goal+" <- !!"+goal+"."));
+ newAg.getPL().add(ASSyntax.parsePlan("+!"+goal+" <- !!"+goal+"."));
return newAg;
}
Modified: trunk/src/jason/asSyntax/patterns/goal/BDG.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/BDG.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/BDG.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,7 +1,7 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
-import jason.asSyntax.Plan;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.Pred;
import jason.asSyntax.Term;
@@ -26,7 +26,7 @@
Term goal = directive.getTerm(0);
// add -!g : true <- !!g.
- newAg.getPL().add(Plan.parse("-!"+goal+" <- !!"+goal+"."));
+ newAg.getPL().add(ASSyntax.parsePlan("-!"+goal+" <- !!"+goal+"."));
return newAg;
}
Modified: trunk/src/jason/asSyntax/patterns/goal/DG.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/DG.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/DG.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,6 +1,7 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.PlanBody;
import jason.asSyntax.PlanBodyImpl;
import jason.asSyntax.Literal;
@@ -28,7 +29,7 @@
Literal goal = Literal.parseLiteral(directive.getTerm(0).toString());
// add +!g : g <- true.
- newAg.getPL().add(Plan.parse("+!"+goal+" : " +goal+"."));
+ newAg.getPL().add(ASSyntax.parsePlan("+!"+goal+" : " +goal+"."));
// add ?g in the end of all inner plans
for (Plan p: innerContent.getPL()) {
@@ -38,7 +39,7 @@
}
// add +g : true <- .succeed_goal(g).
- newAg.getPL().add(Plan.parse("+"+goal+" <- .succeed_goal("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan("+"+goal+" <- .succeed_goal("+goal+")."));
return newAg;
} catch (Exception e) {
Modified: trunk/src/jason/asSyntax/patterns/goal/EBDG.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/EBDG.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/EBDG.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,6 +1,7 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.Literal;
import jason.asSyntax.LiteralImpl;
import jason.asSyntax.LogExpr;
@@ -33,7 +34,7 @@
Literal goal = Literal.parseLiteral(directive.getTerm(0).toString());
// add +!g : g <- true.
- newAg.getPL().add(Plan.parse("+!"+goal+" : " +goal+"."));
+ newAg.getPL().add(ASSyntax.parsePlan("+!"+goal+" : " +goal+"."));
// change all inner plans
int i = 0;
@@ -64,13 +65,13 @@
// add -!g : true <- !!g.
- newAg.getPL().add(Plan.parse("-!"+goal+" <- !!"+goal+"."));
+ newAg.getPL().add(ASSyntax.parsePlan("-!"+goal+" <- !!"+goal+"."));
// add +g : true <- .abolish(p__f(_,g)); .succeed_goal(g).
- newAg.getPL().add(Plan.parse("+"+goal+" <- .abolish(p__f(_,"+goal+")); .succeed_goal("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan("+"+goal+" <- .abolish(p__f(_,"+goal+")); .succeed_goal("+goal+")."));
// add -g <- .abolish(p__f(_,g)).
- newAg.getPL().add(Plan.parse("-"+goal+" <- .abolish(p__f(_,"+goal+"))."));
+ newAg.getPL().add(ASSyntax.parsePlan("-"+goal+" <- .abolish(p__f(_,"+goal+"))."));
return newAg;
} catch (Exception e) {
Modified: trunk/src/jason/asSyntax/patterns/goal/MG.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/MG.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/MG.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,12 +1,12 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
-import jason.bb.BeliefBase;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.Literal;
-import jason.asSyntax.Plan;
import jason.asSyntax.Pred;
import jason.asSyntax.directives.Directive;
import jason.asSyntax.directives.DirectiveProcessor;
+import jason.bb.BeliefBase;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -40,7 +40,7 @@
newAg.addInitialBel(goal);
// add -g : true <- !g.
- newAg.getPL().add(Plan.parse("-"+goal+" <- !"+goal+"."));
+ newAg.getPL().add(ASSyntax.parsePlan("-"+goal+" <- !"+goal+"."));
return newAg;
}
Modified: trunk/src/jason/asSyntax/patterns/goal/OMC.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/OMC.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/OMC.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,6 +1,7 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.Plan;
import jason.asSyntax.Pred;
import jason.asSyntax.SourceInfo;
@@ -32,12 +33,12 @@
Agent newAg = sd.process(subDir, outerContent, innerContent);
if (newAg != null) {
// add +f : true <- .fail_goal(g).
- Plan pf = Plan.parse("+"+fail+" <- .fail_goal("+goal+").");
+ Plan pf = ASSyntax.parsePlan("+"+fail+" <- .fail_goal("+goal+").");
pf.setSrcInfo(new SourceInfo(outerContent+"/"+directive, 0));
newAg.getPL().add(pf);
// add -m : true <- .succeed_goal(g).
- Plan pm = Plan.parse("-"+motivation+" <- .succeed_goal("+goal+").");
+ Plan pm = ASSyntax.parsePlan("-"+motivation+" <- .succeed_goal("+goal+").");
pm.setSrcInfo(new SourceInfo(outerContent+"/"+directive, 0));
newAg.getPL().add(pm);
Modified: trunk/src/jason/asSyntax/patterns/goal/RC.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/RC.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/RC.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,7 +1,7 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
-import jason.asSyntax.Plan;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.Pred;
import jason.asSyntax.Term;
import jason.asSyntax.directives.Directive;
@@ -32,7 +32,7 @@
if (newAg != null) {
// add -m : true <- .succeed_goal(g).
- newAg.getPL().add(Plan.parse("-"+motivation+" <- .succeed_goal("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan("-"+motivation+" <- .succeed_goal("+goal+")."));
return newAg;
}
Modified: trunk/src/jason/asSyntax/patterns/goal/SGA.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/SGA.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/SGA.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -4,7 +4,6 @@
import jason.asSyntax.ASSyntax;
import jason.asSyntax.LogExpr;
import jason.asSyntax.LogicalFormula;
-import jason.asSyntax.Plan;
import jason.asSyntax.Pred;
import jason.asSyntax.StringTerm;
import jason.asSyntax.Term;
@@ -32,19 +31,19 @@
Agent newAg = new Agent();
// add t : not f__l(_) & c <- !f__g(g).
- newAg.getPL().add(Plan.parse(trigger+" : not f__l(_) & " +context +" <- !f__g("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan(trigger+" : not f__l(_) & " +context +" <- !f__g("+goal+")."));
// add t : f__l(_) & c <- +f__l(g).
- newAg.getPL().add(Plan.parse(trigger+" : f__l(_) & (" +context +") <- +f__l("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan(trigger+" : f__l(_) & (" +context +") <- +f__l("+goal+")."));
// add +!fg(g) : true <- +fl(g); !g; -fl(g)
- newAg.getPL().add(Plan.parse("+!f__g("+goal+") <- +f__l("+goal+"); !"+goal+"; -f__l("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan("+!f__g("+goal+") <- +f__l("+goal+"); !"+goal+"; -f__l("+goal+")."));
// add -!fg(g) : true <- -fl(g)
- newAg.getPL().add(Plan.parse("-!f__g("+goal+") <- -f__l("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan("-!f__g("+goal+") <- -f__l("+goal+")."));
// add -fl(_) : fg(g) <- !fg(g)
- newAg.getPL().add(Plan.parse("-f__l("+goal+") : f__l("+goal+") <- !f__g("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan("-f__l("+goal+") : f__l("+goal+") <- !f__g("+goal+")."));
return newAg;
} catch (Exception e) {
Modified: trunk/src/jason/asSyntax/patterns/goal/SMC.java
===================================================================
--- trunk/src/jason/asSyntax/patterns/goal/SMC.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/asSyntax/patterns/goal/SMC.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,7 +1,7 @@
package jason.asSyntax.patterns.goal;
import jason.asSemantics.Agent;
-import jason.asSyntax.Plan;
+import jason.asSyntax.ASSyntax;
import jason.asSyntax.Pred;
import jason.asSyntax.Term;
import jason.asSyntax.directives.Directive;
@@ -32,7 +32,7 @@
if (newAg != null) {
// add +f : true <- .fail_goal(g).
- newAg.getPL().add(Plan.parse("+"+fail+" <- .fail_goal("+goal+")."));
+ newAg.getPL().add(ASSyntax.parsePlan("+"+fail+" <- .fail_goal("+goal+")."));
return newAg;
}
Modified: trunk/src/jason/control/ExecutionControlGUI.java
===================================================================
--- trunk/src/jason/control/ExecutionControlGUI.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/control/ExecutionControlGUI.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -298,7 +298,6 @@
}
}
- @SuppressWarnings("unchecked")
private void setupSlider() {
int size = getCycleNumber();
Hashtable<Integer,Component> labelTable = new Hashtable<Integer,Component>();
Modified: trunk/src/jason/stdlib/add_annot.java
===================================================================
--- trunk/src/jason/stdlib/add_annot.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/stdlib/add_annot.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -97,7 +97,7 @@
}
return result;
} else if (l.isLiteral()) {
- return ((Literal)l).forceLiteralImplClass().copy().addAnnots(annot);
+ return ((Literal)l).forceFullLiteralImpl().copy().addAnnots(annot);
}
return l;
}
Modified: trunk/src/jason/stdlib/add_plan.java
===================================================================
--- trunk/src/jason/stdlib/add_plan.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/jason/stdlib/add_plan.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -102,8 +102,9 @@
before = args[2].toString().equals("begin");
if (plans.isList()) { // arg[0] is a list of strings
- for (Term t: (ListTerm) plans)
- ts.getAg().getPL().add((StringTerm) t, source);
+ for (Term t: (ListTerm) plans) {
+ ts.getAg().getPL().add((StringTerm) t, source, before);
+ }
} else { // args[0] is a plan
ts.getAg().getPL().add((StringTerm) plans, source, before);
}
Modified: trunk/src/test/StdLibTest.java
===================================================================
--- trunk/src/test/StdLibTest.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/test/StdLibTest.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,5 +1,6 @@
package test;
+import jason.JasonException;
import jason.RevisionFailedException;
import jason.architecture.AgArch;
import jason.asSemantics.Agent;
@@ -140,7 +141,7 @@
assertEquals(lt.size(), 2);
}
- public void testGetRelevantPlansAndAddPlan() {
+ public void testGetRelevantPlansAndAddPlan() throws ParseException, JasonException {
Agent ag = new Agent();
ag.setLogger(null);
StringTerm pt1 = new StringTermImpl("@t1 +a : g(10) <- .print(\"ok 10\").");
Modified: trunk/src/test/TSTest.java
===================================================================
--- trunk/src/test/TSTest.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/test/TSTest.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -1,5 +1,6 @@
package test;
+import jason.JasonException;
import jason.asSemantics.Agent;
import jason.asSemantics.Circumstance;
import jason.asSemantics.Intention;
@@ -26,7 +27,7 @@
super.setUp();
}
- public void testRelevant() throws ParseException {
+ public void testRelevant() throws ParseException, JasonException {
Agent ag = new Agent();
Circumstance c = new Circumstance();
StringTerm pt1 = new StringTermImpl("@t1 +a(X) : g(10) <- .print(\"ok 10\").");
Modified: trunk/src/test/VarTermTest.java
===================================================================
--- trunk/src/test/VarTermTest.java 2009-02-18 13:17:08 UTC (rev 1447)
+++ trunk/src/test/VarTermTest.java 2009-02-18 14:30:59 UTC (rev 1448)
@@ -7,7 +7,6 @@
import jason.asSemantics.Unifier;
import jason.asSyntax.ASSyntax;
import jason.asSyntax.ArithExpr;
-import jason.asSyntax.Atom;
import jason.asSyntax.ListTerm;
import jason.asSyntax.ListTermImpl;
import jason.asSyntax.Literal;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
