Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1381] trunk
|
From: <jom...@us...> - 2008-09-27 13:56:25
|
Revision: 1381
http://jason.svn.sourceforge.net/jason/?rev=1381&view=rev
Author: jomifred
Date: 2008-09-27 13:56:22 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
try to fix problems of new API in jasdl/jmca/owl2mas
Modified Paths:
--------------
trunk/applications/jasdl-owlapi/examples/commerce/src/java/commerce/ui/customer/CustomerUIPanel.java
trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/protocol/ProtocolProcessor.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java
trunk/applications/jmca/build.xml
trunk/applications/owl2mas/.classpath
trunk/applications/owl2mas/src/owl2mas/OWL2MAS.java
trunk/src/jason/asSemantics/ActionExec.java
trunk/src/jason/bb/DefaultBeliefBase.java
Modified: trunk/applications/jasdl-owlapi/examples/commerce/src/java/commerce/ui/customer/CustomerUIPanel.java
===================================================================
--- trunk/applications/jasdl-owlapi/examples/commerce/src/java/commerce/ui/customer/CustomerUIPanel.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/jasdl-owlapi/examples/commerce/src/java/commerce/ui/customer/CustomerUIPanel.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -21,6 +21,8 @@
import jasdl.util.JASDLCommon;
import jason.asSyntax.Literal;
+import jason.asSyntax.LiteralImpl;
+import jason.asSyntax.Structure;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -224,7 +226,7 @@
// strip newlines
productDescription = productDescription.replace("\n", " ");
shopDescription = shopDescription.replace("\n", " ");
- env.executeAction(customer.getId().toString(), Literal.parseLiteral(
+ env.executeAction(customer.getId().toString(), Structure.parse(
"request_product(\""+productDescription+"\","+"\""+shopDescription+"\","+qty.getValue()+")"));
lastQty = qty.getValue();
@@ -233,7 +235,7 @@
class ConfirmOrderButtonActionListener implements ActionListener{
public void actionPerformed(ActionEvent event) {
- env.executeAction(customer.getId().toString(), Literal.parseLiteral("confirm_order"));
+ env.executeAction(customer.getId().toString(), new LiteralImpl("confirm_order"));
ordersModel.clear();
}
}
Modified: trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -24,6 +24,7 @@
import jasdl.util.JASDLCommon;
import jason.asSemantics.Unifier;
import jason.asSyntax.Literal;
+import jason.asSyntax.LiteralImpl;
import jason.asSyntax.Plan;
import jason.asSyntax.PlanBody;
import jason.asSyntax.Structure;
@@ -64,7 +65,7 @@
// create a new literal with functor of trigger
- Literal newLiteral = new Literal( !oldLiteral.negated(), trigger.getFunctor());
+ Literal newLiteral = new LiteralImpl( !oldLiteral.negated(), trigger.getFunctor());
// add the terms from the old literal
newLiteral.addTerms(oldLiteral.getTerms());
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -31,6 +31,7 @@
import jason.asSyntax.ListTerm;
import jason.asSyntax.ListTermImpl;
import jason.asSyntax.Literal;
+import jason.asSyntax.LiteralImpl;
import jason.asSyntax.Structure;
import jason.asSyntax.Term;
@@ -109,7 +110,7 @@
* </ul>
*/
public SELiteral construct(boolean sign, Atom functor, Term[] terms, Term[] annots, Atom label) throws JASDLInvalidSELiteralException {
- Literal l = new Literal(sign, functor);
+ Literal l = new LiteralImpl(sign, functor);
// add "o"
Structure o = new Structure(JASDLParams.ONTOLOGY_ANNOTATION_FUNCTOR);
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/protocol/ProtocolProcessor.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/protocol/ProtocolProcessor.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/protocol/ProtocolProcessor.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -37,12 +37,18 @@
this.outgoingStrategy = outgoingStrategy;
}
- public Structure processIncomingStructure(Structure struct) throws JASDLMessageContentException {
- return processStructure(struct, incomingStrategy);
+ public Structure processIncomingStructure(Literal struct) throws JASDLMessageContentException {
+ if (struct instanceof Structure)
+ return processStructure((Structure)struct, incomingStrategy);
+ else
+ return processStructure(new Structure(struct), incomingStrategy);
}
- public Structure processOutgoingStructure(Structure struct) throws JASDLMessageContentException {
- return processStructure(struct, outgoingStrategy);
+ public Structure processOutgoingStructure(Literal struct) throws JASDLMessageContentException {
+ if (struct instanceof Structure)
+ return processStructure((Structure)struct, outgoingStrategy);
+ else
+ return processStructure(new Structure(struct), outgoingStrategy);
}
private Structure processStructure(Structure struct, ProtocolProcessingStrategy strategy) throws JASDLMessageContentException {
@@ -51,9 +57,10 @@
if (struct.getArity() > 0) { // if we have any terms to process!
// Process outer SE-enriched content
if (struct.isLiteral()) { // processing strategies only apply to Literals
+ // TODO: (by Jomi): shouldn't the above test be instanceof LiteralImpl? (since for jason 1.2.0 even an Atom is considered a Literal)
Literal l = (Literal) struct;
try {
- struct = strategy.process(l, jom);
+ struct = (Structure)strategy.process(l, jom);
} catch (JASDLException e) {
e.printStackTrace();
}
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -31,6 +31,7 @@
import jason.asSyntax.Atom;
import jason.asSyntax.ListTerm;
import jason.asSyntax.Literal;
+import jason.asSyntax.LiteralImpl;
import jason.asSyntax.StringTermImpl;
import jason.asSyntax.Structure;
import jason.asSyntax.Term;
@@ -225,7 +226,7 @@
* @return
*/
public void mutateFunctor(String newFunctor) throws JASDLException {
- Literal mutated = new Literal(!literal.negated(), newFunctor); // negation dealt with by ~ prefix
+ Literal mutated = new LiteralImpl(!literal.negated(), newFunctor); // negation dealt with by ~ prefix
mutated.addTerms(literal.getTerms());
mutated.addAnnots(literal.getAnnots());
literal = mutated;
Modified: trunk/applications/jmca/build.xml
===================================================================
--- trunk/applications/jmca/build.xml 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/jmca/build.xml 2008-09-27 13:56:22 UTC (rev 1381)
@@ -11,6 +11,9 @@
<path id="project.classpath">
<pathelement location="../../lib/jason.jar"/>
+ <pathelement location="../owl2mas/lib/owl2mas.jar"/>
+ <pathelement location="lib/owlapi-bin.jar"/>
+ <pathelement location="lib/pellet.jar"/>
</path>
<target name="init">
Modified: trunk/applications/owl2mas/.classpath
===================================================================
--- trunk/applications/owl2mas/.classpath 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/owl2mas/.classpath 2008-09-27 13:56:22 UTC (rev 1381)
@@ -4,15 +4,9 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/owlapi-bin.jar"/>
<classpathentry kind="lib" path="lib/pellet.jar"/>
- <classpathentry kind="lib" path="/home/tom/workspace/jason/lib/jason.jar" sourcepath="/home/tom/workspace/jason/src">
- <attributes>
- <attribute name="javadoc_location" value="file:/home/tom/workspace/jason/doc/api/"/>
- </attributes>
- </classpathentry>
<classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
<classpathentry kind="lib" path="lib/relaxngDatatype.jar"/>
<classpathentry kind="lib" path="lib/xsdlib.jar"/>
- <classpathentry kind="lib" path="/home/tom/Protege_4.0_alpha/org.protege.editor.core.application.jar"/>
- <classpathentry kind="lib" path="/home/tom/Protege_4.0_alpha/plugins/org.protege.editor.owl.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/Jason"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/applications/owl2mas/src/owl2mas/OWL2MAS.java
===================================================================
--- trunk/applications/owl2mas/src/owl2mas/OWL2MAS.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/applications/owl2mas/src/owl2mas/OWL2MAS.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -169,9 +169,9 @@
agentParams.options = optionMap;
- try{agentParams.setArchClass(loadClass(agent, factory.getOWLObjectProperty(URI.create(MAS_NS + "hasAgentArchClass"))).className); }catch(OWL2MASParameterNotSetException e){}
+ try{agentParams.setArchClass(loadClass(agent, factory.getOWLObjectProperty(URI.create(MAS_NS + "hasAgentArchClass"))).getClassName()); }catch(OWL2MASParameterNotSetException e){}
try{agentParams.setBB(loadClass(agent, factory.getOWLObjectProperty(URI.create(MAS_NS + "hasBeliefBaseClass")))); }catch(OWL2MASParameterNotSetException e){}
- try{agentParams.setAgClass(loadClass(agent, factory.getOWLObjectProperty(URI.create(MAS_NS + "hasAgentClass"))).className); }catch(OWL2MASParameterNotSetException e){}
+ try{agentParams.setAgClass(loadClass(agent, factory.getOWLObjectProperty(URI.create(MAS_NS + "hasAgentClass"))).getClassName()); }catch(OWL2MASParameterNotSetException e){}
// Force #1
agentParams.qty = 1;
Modified: trunk/src/jason/asSemantics/ActionExec.java
===================================================================
--- trunk/src/jason/asSemantics/ActionExec.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/src/jason/asSemantics/ActionExec.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -62,10 +62,10 @@
}
public Structure getActionTerm() {
- if (action.isAtom())
- return new Structure(action.getFunctor());
+ if (action instanceof Structure)
+ return (Structure)action;
else
- return (Structure)action;
+ return new Structure(action);
}
public Intention getIntention() {
Modified: trunk/src/jason/bb/DefaultBeliefBase.java
===================================================================
--- trunk/src/jason/bb/DefaultBeliefBase.java 2008-09-27 12:48:55 UTC (rev 1380)
+++ trunk/src/jason/bb/DefaultBeliefBase.java 2008-09-27 13:56:22 UTC (rev 1381)
@@ -59,7 +59,7 @@
private int size = 0;
/** set of beliefs with percept annot, used to improve performance of buf */
- private Set<Literal> percepts = new HashSet<Literal>();
+ protected Set<Literal> percepts = new HashSet<Literal>();
public void init(Agent ag, String[] args) {
if (ag != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
