Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1403] trunk
|
From: <jom...@us...> - 2008-10-29 12:54:20
|
Revision: 1403
http://jason.svn.sourceforge.net/jason/?rev=1403&view=rev
Author: jomifred
Date: 2008-10-29 12:54:13 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
fix some problems in the Jason AgentContest team for the new version
of JMoise
Modified Paths:
--------------
trunk/applications/jason-moise/src/jmoise/OrgAgent.java
trunk/applications/jason-moise/src/jmoise/OrgManager.java
trunk/applications/jason-team/dummies.xml
trunk/applications/jason-team/gauchos.xml
trunk/applications/jason-team/src/asl/exploration.asl
trunk/applications/jason-team/src/asl/gaucho.asl
trunk/applications/jason-team/src/asl/herding.asl
trunk/applications/jason-team/src/java/arch/CowboyArch.java
trunk/applications/jason-team/src/java/jia/cluster.java
trunk/applications/jason-team/src/java/jia/herd_position.java
trunk/applications/jason-team/src/team-os.xml
trunk/src/jason/asSyntax/ASSyntax.java
trunk/src/jason/asSyntax/Structure.java
trunk/src/test/TermTest.java
Modified: trunk/applications/jason-moise/src/jmoise/OrgAgent.java
===================================================================
--- trunk/applications/jason-moise/src/jmoise/OrgAgent.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-moise/src/jmoise/OrgAgent.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -67,6 +67,8 @@
private Set<GoalInstance> alreadyGeneratedEvents = new HashSet<GoalInstance>();
private String orgManagerName = "orgManager";
+ private boolean checkCommLink = true;
+
@Override
public void initAg(String agClass, ClassParameters bbPars, String asSrc, Settings stts) throws JasonException {
super.initAg(agClass, bbPars, asSrc, stts);
@@ -95,16 +97,24 @@
logger.fine("Error sending add_agent to OrgManager!");
}
}
+
+ public void setCheckCommunicationLink(boolean check) {
+ checkCommLink = check;
+ }
@Override
public void sendMsg(Message m) throws Exception {
// check communication link
- String to = m.getReceiver();
- if (currentOE == null || to.equals(orgManagerName) || to.equals(getAgName()) ||
- getMyOEAgent().hasLink("communication", getOE().getAgent(to))) {
+ if (checkCommLink) {
+ String to = m.getReceiver();
+ if (currentOE == null || to.equals(orgManagerName) || to.equals(getAgName()) ||
+ getMyOEAgent().hasLink("communication", getOE().getAgent(to))) {
+ super.sendMsg(m);
+ } else {
+ throw new MoiseException(getAgName()+" is not allowed to communicate with "+to+", sender roles are "+getMyOEAgent().getRoles());
+ }
+ } else {
super.sendMsg(m);
- } else {
- throw new MoiseException(getAgName()+" is not allowed to communicate with "+to);
}
}
@@ -241,7 +251,9 @@
Set<Permission> obligations = new HashSet<Permission>();
List<Literal> toAdd = new ArrayList<Literal>();
toAdd = createObligation(obligations);
- orgBUF(toAdd, obligationLiteral);
+ //getTS().getLogger().info("** obliations "+toAdd);
+ List<Literal> deleted = orgBUF(toAdd, obligationLiteral);
+ //getTS().getLogger().info("** new obli "+toAdd+", deleted "+deleted);
toAdd.clear();
toAdd = createPermission(obligations);
orgBUF(toAdd, permissionLiteral);
Modified: trunk/applications/jason-moise/src/jmoise/OrgManager.java
===================================================================
--- trunk/applications/jason-moise/src/jmoise/OrgManager.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-moise/src/jmoise/OrgManager.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -8,6 +8,7 @@
import jason.asSyntax.StringTerm;
import jason.asSyntax.Structure;
import jason.asSyntax.Term;
+import jason.infra.centralised.CentralisedAgArch;
import jason.mas2j.ClassParameters;
import jason.runtime.Settings;
@@ -580,7 +581,11 @@
if (!ag.getId().equals("orgManager")) {
try {
Message moe = new Message("tell", null, ag.getId(), null);
- moe.setPropCont(currentOE.clone()); //partialOE(ag)); // TODO: the clone of OE is not working!
+ // need to clone only on centralised execution, otherwise the serialization will clone
+ if (getArchInfraTier() instanceof CentralisedAgArch)
+ moe.setPropCont(currentOE.clone()); //partialOE(ag)); // TODO: the clone of OE is not working!
+ else
+ moe.setPropCont(currentOE);
sendMsg(moe);
} catch (Exception e) {
logger.log(Level.SEVERE, "Error sending update to " + ag, e);
Modified: trunk/applications/jason-team/dummies.xml
===================================================================
--- trunk/applications/jason-team/dummies.xml 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/dummies.xml 2008-10-29 12:54:13 UTC (rev 1403)
@@ -25,68 +25,16 @@
<fileset dir="${basedir}/lib" > <include name="*.jar" /> </fileset>
</path>
- <!-- tasks the user can override in his/her c-build.xml script -->
- <target name="user-init">
- <ant antfile="../jason-moise/build.xml" target="jar" inheritall="false" />
- <copy file="../jason-moise/lib/jmoise.jar" todir="lib" />
- <copy file="../jason-moise/lib/moise.jar" todir="lib" />
- </target>
- <target name="user-end">
- </target>
-
<target name="init">
<mkdir dir="${build.dir}" />
- <antcall target="user-init" />
</target>
<target name="compile" depends="init">
- <condition property="srcdir" value="${basedir}/src/java" else="${basedir}" >
- <available file="${basedir}/src/java" />
- </condition>
- <javac srcdir="${srcdir}" destdir="${build.dir}" debug="true" optimize="true" >
+ <javac srcdir="${basedir}/src/java" destdir="${build.dir}" debug="true" optimize="true" >
<classpath refid="project.classpath"/>
</javac>
</target>
- <target name="jar" depends="compile">
- <delete file="${ant.project.name}.jar" />
- <copy file="${jasonJar}" tofile="${ant.project.name}.jar" />
- <copy file="${mas2j.project.file}" tofile="default.mas2j" />
- <jar update="yes" jarfile="${ant.project.name}.jar" >
- <fileset dir="${basedir}">
- <include name="**/*.asl" />
- <include name="**/*.mas2j" />
- </fileset>
- <fileset dir="${build.dir}">
- <include name="**/*.class" />
- </fileset>
- </jar>
- <delete file="default.mas2j" />
- </target>
-
-
- <target name="jnlp" depends="jar" >
- <mkdir dir="${basedir}/${ant.project.name}-jws"/>
- <java classname="jason.infra.centralised.CreateJNLP"
- failonerror="true" fork="yes" dir="${basedir}/${ant.project.name}-jws" >
- <classpath refid="project.classpath"/>
- <arg line="${ant.project.name} ${mas2j.project.file}"/>
- </java>
- <copy todir="${basedir}/${ant.project.name}-jws" failonerror="no">
- <fileset dir="${basedir}/lib" includes="**/*.jar" />
- <fileset dir="${basedir}" includes="${ant.project.name}.jar" />
- <fileset dir="/Users/jomi/Jason/Jason-svn/src/images" includes="Jason-GMoreau-Icon.jpg" />
- </copy>
- <signjar jar="${basedir}/${ant.project.name}-jws/${ant.project.name}.jar" alias="jason"
- storepass="rbjhja" keypass="rbjhja" keystore="/Users/jomi/Jason/Jason-svn/src/jasonKeystore" />
- <echo message="**" />
- <echo message="** Java Web Start application created in directory ${ant.project.name}-jws" />
- <echo message="** Update the codebase (in the second line of the .jnlp file)" />
- <echo message="** with the URL where you will upload the application." />
- <echo message="**" />
- </target>
-
-
<target name="run" depends="compile" >
<echo message="Running project ${ant.project.name}" />
<java classname="jason.infra.centralised.RunCentralisedMAS"
@@ -95,15 +43,5 @@
<arg line="${mas2j.project.file} ${debug} "/>
<jvmarg line="-Xmx750M"/>
</java>
- <antcall target="user-end" />
</target>
-
- <target name="clean" >
- <delete failonerror="no" includeEmptyDirs="true" verbose="true">
- <fileset dir="${basedir}" includes="**/*.class"/>
- </delete>
- </target>
-
-
-
</project>
Modified: trunk/applications/jason-team/gauchos.xml
===================================================================
--- trunk/applications/jason-team/gauchos.xml 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/gauchos.xml 2008-10-29 12:54:13 UTC (rev 1403)
@@ -29,7 +29,7 @@
<target name="user-init">
<ant antfile="../jason-moise/build.xml" target="jar" inheritall="false" />
<copy file="../jason-moise/lib/jmoise.jar" todir="lib" />
- <copy file="../jason-moise/lib/moise.jar" todir="lib" />
+ <copy file="../jason-moise/lib/moise.jar" todir="lib" />
<delete failonerror="no" includeEmptyDirs="true" verbose="false">
<fileset dir="massim-server/backup" includes="**/*"/>
@@ -67,30 +67,8 @@
</jar>
<delete file="default.mas2j" />
</target>
-
- <target name="jnlp" depends="jar" >
- <mkdir dir="${basedir}/${ant.project.name}-jws"/>
- <java classname="jason.infra.centralised.CreateJNLP"
- failonerror="true" fork="yes" dir="${basedir}/${ant.project.name}-jws" >
- <classpath refid="project.classpath"/>
- <arg line="${ant.project.name} ${mas2j.project.file}"/>
- </java>
- <copy todir="${basedir}/${ant.project.name}-jws" failonerror="no">
- <fileset dir="${basedir}/lib" includes="**/*.jar" />
- <fileset dir="${basedir}" includes="${ant.project.name}.jar" />
- <fileset dir="/Users/jomi/Jason/Jason-svn/src/images" includes="Jason-GMoreau-Icon.jpg" />
- </copy>
- <signjar jar="${basedir}/${ant.project.name}-jws/${ant.project.name}.jar" alias="jason"
- storepass="rbjhja" keypass="rbjhja" keystore="/Users/jomi/Jason/Jason-svn/src/jasonKeystore" />
- <echo message="**" />
- <echo message="** Java Web Start application created in directory ${ant.project.name}-jws" />
- <echo message="** Update the codebase (in the second line of the .jnlp file)" />
- <echo message="** with the URL where you will upload the application." />
- <echo message="**" />
- </target>
-
<target name="run" depends="compile" >
<delete failonerror="no" includeEmptyDirs="true" verbose="false">
<fileset dir="mind-ag" includes="**/*.xml"/>
@@ -119,6 +97,4 @@
</delete>
</target>
-
-
</project>
Modified: trunk/applications/jason-team/src/asl/exploration.asl
===================================================================
--- trunk/applications/jason-team/src/asl/exploration.asl 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/src/asl/exploration.asl 2008-10-29 12:54:13 UTC (rev 1403)
@@ -45,15 +45,21 @@
+play(Me,explorer,G)
: .my_name(Me) &
not scheme_group(_,G)
- <- jmoise.create_scheme(explore_sch, [G]).
+ <- .print("Creating explore scheme");
+ jmoise.create_scheme(explore_sch, [G]).
-// If I stop playing explorer, destroy the explore groups I've created
+// If I stop playing explorer, destroy the explore scheme/group I've created
-play(Me,explorer,_)
: .my_name(Me)
- <- for( group(exploration_grp,G)[owner(Me)] ) {
+ <- for( scheme(explore_sch,S)[owner(Me)] ) {
+ .print("ooo Removing scheme ",S);
+ jmoise.remove_scheme(S);
+ .wait(1000)
+ };
+ for( group(exploration_grp,G)[owner(Me)] ) {
.print("ooo Removing group ",G," since I am not in the group anymore");
jmoise.remove_group(G);
- .wait(4000)
+ .wait(1000)
}.
Modified: trunk/applications/jason-team/src/asl/gaucho.asl
===================================================================
--- trunk/applications/jason-team/src/asl/gaucho.asl 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/src/asl/gaucho.asl 2008-10-29 12:54:13 UTC (rev 1403)
@@ -151,24 +151,25 @@
+!quit_all_missions_roles
<- .my_name(Me);
+ // if I play any other role, give it up
+ while( play(Me,R,OG) ) {
+ .print("ooo removing my role ",R," in ",OG);
+ jmoise.remove_role(R,OG)
+ }/*;
+
// give up all missions
while( commitment(Me,M,Sch) ) {
.print("ooo removing my mission ",M," in ",Sch);
jmoise.remove_mission(M,Sch)
- };
+ }*/.
- // if I play any other role, give it up
- while( play(Me,R,OG) ) {
- .print("ooo removing my role ",R," in ",OG);
- jmoise.remove_role(R,OG)
- }.
// finish the scheme if it has no more players
// and it was created by me
-+sch_players(Sch,0)
- : .my_name(Me) & scheme(_, Sch)[owner(Me)]
- <- jmoise.remove_scheme(Sch).
+//+sch_players(Sch,0)
+// : .my_name(Me) & scheme(_, Sch)[owner(Me)]
+// <- jmoise.remove_scheme(Sch).
// when I have an obligation or permission to a mission, commit to it
@@ -180,14 +181,16 @@
jmoise.commit_mission(Mission,Sch).
// when I am not obligated to a mission anymore, uncommit
+/*
-obligation(Sch, Mission)
: .my_name(Me) & commitment(Me,Mission,Sch)
- <- .print("ooo I don't have obligation for the mission ",Mission," anymore, remove the commit");
+ <- .print("ooo I don't have obligation for the mission ",Mission," in ",Sch," anymore, remove the commitment");
jmoise.remove_mission(Mission,Sch).
-permission(Sch, Mission)
: .my_name(Me) & commitment(Me,Mission,Sch)
- <- .print("ooo I don't have permission for the mission ",Mission," anymore, remove the commit");
+ <- .print("ooo I don't have permission for the mission ",Mission," in ",Sch," anymore, remove the commitment");
jmoise.remove_mission(Mission,Sch).
+*/
// when I am not committed to a mission anymore, remove all goals based on that mission
-commitment(Me,Mission,Sch)
Modified: trunk/applications/jason-team/src/asl/herding.asl
===================================================================
--- trunk/applications/jason-team/src/asl/herding.asl 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/src/asl/herding.asl 2008-10-29 12:54:13 UTC (rev 1403)
@@ -35,12 +35,17 @@
// If I stop playing herder, destroy the herding groups I've created
-play(Me,herder,_)
: .my_name(Me)
- <- for( group(herding_grp,G)[owner(Me)] ) {
+ <- for( scheme(herd_sch,S)[owner(Me)] ) {
+ .print("ooo Removing scheme ",S);
+ jmoise.remove_scheme(S);
+ .wait(1000)
+ };
+ for( group(herding_grp,G)[owner(Me)] ) {
-group_leader(G,Me);
.broadcast(untell, group_leader(G,Me));
.print("ooo removing the group ",G);
jmoise.remove_group(G);
- .wait(4000)
+ .wait(1000)
}.
// If I stop playing herdboy (because the group was destroied by the herder),
Modified: trunk/applications/jason-team/src/java/arch/CowboyArch.java
===================================================================
--- trunk/applications/jason-team/src/java/arch/CowboyArch.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/src/java/arch/CowboyArch.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -71,6 +71,8 @@
if (massimBackDir != null && massimBackDir.startsWith("\""))
massimBackDir = massimBackDir.substring(1,massimBackDir.length()-1);
logger = Logger.getLogger(CowboyArch.class.getName() + ".CA-" + getAgName());
+
+ setCheckCommunicationLink(false);
}
@Override
Modified: trunk/applications/jason-team/src/java/jia/cluster.java
===================================================================
--- trunk/applications/jason-team/src/java/jia/cluster.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/src/java/jia/cluster.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -1,13 +1,13 @@
package jia;
+import static jason.asSyntax.ASSyntax.createNumber;
+import static jason.asSyntax.ASSyntax.createStructure;
import jason.asSemantics.DefaultInternalAction;
import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
import jason.asSyntax.ListTerm;
import jason.asSyntax.ListTermImpl;
-import jason.asSyntax.NumberTermImpl;
import jason.asSyntax.ObjectTermImpl;
-import jason.asSyntax.Structure;
import jason.asSyntax.Term;
import jason.environment.grid.Location;
@@ -47,9 +47,7 @@
ListTerm r = new ListTermImpl();
ListTerm tail = r;
for (Location l: locs) {
- Structure p = new Structure("pos",2);
- p.addTerms(new NumberTermImpl(l.x), new NumberTermImpl(l.y));
- tail = tail.append(p);
+ tail = tail.append(createStructure("pos", createNumber(l.x), createNumber(l.y)));
}
return un.unifies(args[0], new ObjectTermImpl(locs)) &&
un.unifies(args[1], r);
Modified: trunk/applications/jason-team/src/java/jia/herd_position.java
===================================================================
--- trunk/applications/jason-team/src/java/jia/herd_position.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/src/java/jia/herd_position.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -1,5 +1,7 @@
package jia;
+import static jason.asSyntax.ASSyntax.createNumber;
+import static jason.asSyntax.ASSyntax.createStructure;
import jason.asSemantics.DefaultInternalAction;
import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
@@ -8,7 +10,6 @@
import jason.asSyntax.NumberTerm;
import jason.asSyntax.NumberTermImpl;
import jason.asSyntax.ObjectTerm;
-import jason.asSyntax.Structure;
import jason.asSyntax.Term;
import jason.environment.grid.Location;
@@ -101,9 +102,7 @@
ListTerm r = new ListTermImpl();
ListTerm tail = r;
for (Location l: locs) {
- Structure p = new Structure("pos",2);
- p.addTerms(new NumberTermImpl(l.x), new NumberTermImpl(l.y));
- tail = tail.append(p);
+ tail = tail.append(createStructure("pos", createNumber(l.x), createNumber(l.y)));
}
return un.unifies(args[2], r);
} else {
Modified: trunk/applications/jason-team/src/team-os.xml
===================================================================
--- trunk/applications/jason-team/src/team-os.xml 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/applications/jason-team/src/team-os.xml 2008-10-29 12:54:13 UTC (rev 1403)
@@ -16,6 +16,7 @@
<properties>
<property id="check-players-in-remove-group" value="false" />
<property id="check-sub-group-in-remove-group" value="false" />
+ <property id="check-missions-in-remove-role" value="false" />
</properties>
<role-definitions>
@@ -70,8 +71,9 @@
<functional-specification>
<properties>
<property id="check-players-in-remove-responsible-group" value="false" />
+ <property id="check-players-in-remove-scheme" value="false" />
<property id="only-owner-can-remove-scheme" value="false" />
- <!--property id="check-goals-in-remove-mission" value="false" /-->
+ <property id="check-goals-in-remove-mission" value="false" />
</properties>
<scheme id="explore_sch" >
Modified: trunk/src/jason/asSyntax/ASSyntax.java
===================================================================
--- trunk/src/jason/asSyntax/ASSyntax.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/src/jason/asSyntax/ASSyntax.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -81,7 +81,8 @@
* and the n remainder arguments are terms.
*/
public static Structure createStructure(String functor, Term... terms) {
- return (Structure)new Structure(functor).addTerms(terms);
+ int size = (terms == null || terms.length == 0 ? 3 : terms.length);
+ return (Structure)new Structure(functor, size).addTerms(terms);
}
/** creates a new Atom term */
Modified: trunk/src/jason/asSyntax/Structure.java
===================================================================
--- trunk/src/jason/asSyntax/Structure.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/src/jason/asSyntax/Structure.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -192,9 +192,8 @@
@Override
public Literal addTerms(Term ... ts ) {
- for (Term t: ts) {
+ for (Term t: ts)
terms.add(t);
- }
predicateIndicatorCache = null;
resetHashCodeCache();
return this;
@@ -202,9 +201,8 @@
@Override
public Literal addTerms(List<Term> l) {
- for (Term t: l) {
+ for (Term t: l)
terms.add(t);
- }
predicateIndicatorCache = null;
resetHashCodeCache();
return this;
Modified: trunk/src/test/TermTest.java
===================================================================
--- trunk/src/test/TermTest.java 2008-10-28 22:24:40 UTC (rev 1402)
+++ trunk/src/test/TermTest.java 2008-10-29 12:54:13 UTC (rev 1403)
@@ -1,5 +1,6 @@
package test;
+import static jason.asSyntax.ASSyntax.*;
import jason.asSemantics.Unifier;
import jason.asSyntax.ASSyntax;
import jason.asSyntax.Atom;
@@ -318,8 +319,8 @@
public void testAnnotsUnify7() throws ParseException {
// p[a,b,c,d] = p[a,c|R] - ok and R=[b,d]
- Term t1 = ASSyntax.parseTerm("p[a,b,c,d]");
- Term t2 = ASSyntax.parseTerm("p[a,c|R]");
+ Term t1 = parseTerm("p[a,b,c,d]");
+ Term t2 = parseTerm("p[a,c|R]");
Unifier u = new Unifier();
assertTrue(u.unifies(t1, t2));
assertEquals(u.get("R").toString(),"[b,d]");
@@ -330,7 +331,7 @@
assertEquals(u.get("R").toString(),"[b,d]");
// p[H|R] = p[a,b,c,d] - ok and R=[b,c,d], H=a
- Term t3 = ASSyntax.parseTerm("p[H|R]");
+ Term t3 = parseTerm("p[H|R]");
u = new Unifier();
assertTrue(u.unifies(t1, t3));
assertEquals(u.get("H").toString(),"a");
@@ -338,17 +339,17 @@
}
public void testApplyAnnots() throws ParseException {
- Term t1 = ASSyntax.parseTerm("p[a,X,c,d]");
+ Term t1 = parseTerm("p[a,X,c,d]");
Unifier u = new Unifier();
u.unifies(new VarTerm("X"), new Atom("z"));
t1.apply(u);
assertEquals("p[a,z,c,d]",t1.toString());
- t1 = ASSyntax.parseTerm("p[X,b,c,d]");
+ t1 = parseTerm("p[X,b,c,d]");
t1.apply(u);
assertEquals("p[z,b,c,d]",t1.toString());
- t1 = ASSyntax.parseTerm("p[a,b,c,X]");
+ t1 = parseTerm("p[a,b,c,X]");
t1.apply(u);
assertEquals("p[a,b,c,z]",t1.toString());
}
@@ -678,15 +679,16 @@
}
public void testGetTermsArray() {
- Structure s2 = Structure.parse("a(1,2,3)");
+ Structure s2 = createStructure("a");
+ s2.addTerms(createNumber(1), createNumber(2), createNumber(3));
Term[] a = s2.getTermsArray();
assertEquals(3,a.length);
assertEquals("1",a[0].toString());
assertEquals("3",a[2].toString());
}
- public void testIALiteral() {
- Literal l = Literal.parseLiteral(".print(a)");
+ public void testIALiteral() throws ParseException {
+ Literal l = parseLiteral(".print(a)");
assertTrue(l.isInternalAction());
l = Literal.parseLiteral("print(a)");
@@ -703,8 +705,8 @@
assertEquals(0,s.getArity());
}
- public void testHasVar() {
- Literal l = Literal.parseLiteral("a(Test,X,Y,b(g([V1,X,V2,V1]),c))[b,source(Y),B,kk(_),oo(oo(OO))]");
+ public void testHasVar() throws ParseException {
+ Literal l = parseLiteral("a(Test,X,Y,b(g([V1,X,V2,V1]),c))[b,source(Y),B,kk(_),oo(oo(OO))]");
assertTrue(l.hasVar(new VarTerm("X")));
assertTrue(l.hasVar(new VarTerm("V2")));
assertTrue(l.hasVar(new VarTerm("OO")));
@@ -755,8 +757,8 @@
}
- public void testAtomParsing() {
- Literal l = Literal.parseLiteral("b");
+ public void testAtomParsing() throws ParseException {
+ Literal l = parseLiteral("b");
assertTrue(l instanceof Literal);
assertTrue(l.isAtom());
@@ -764,12 +766,12 @@
@SuppressWarnings("unused")
Atom x = (Atom)l;
- l = Literal.parseLiteral("b(10,a,c(10,x))[ant1,source(c)]");
+ l = parseLiteral("b(10,a,c(10,x))[ant1,source(c)]");
assertTrue(l.getTerm(1) instanceof Atom);
assertFalse(l.getTerm(2).isAtom());
assertTrue(l.getAnnots().get(0) instanceof Atom);
- l = Literal.parseLiteral("b(a.r)"); // internal actions should not be atoms
+ l = parseLiteral("b(a.r)"); // internal actions should not be atoms
assertFalse(l.getTerm(0).isAtom());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
