Menu
▾
▴
[Jason-developers] SF.net SVN: jason: [1194] trunk/applications/jasdl-owlapi
|
From: <tom...@us...> - 2008-04-02 17:26:48
|
Revision: 1194
http://jason.svn.sourceforge.net/jason/?rev=1194&view=rev
Author: tomklapiscak
Date: 2008-04-02 10:26:44 -0700 (Wed, 02 Apr 2008)
Log Message:
-----------
Structural improvements (problems with last 3 revisions)
Modified Paths:
--------------
trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j
trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/Alias.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasFactory.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasManager.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/DecapitaliseMappingStrategy.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/DefinitionManager.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/MappingStrategy.java
Added Paths:
-----------
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AllDifferentPlaceholder.java
Modified: trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j
===================================================================
--- trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j 2008-04-02 17:09:55 UTC (rev 1193)
+++ trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j 2008-04-02 17:26:44 UTC (rev 1194)
@@ -43,7 +43,8 @@
jasdl_default_mapping_strategies="jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy", // applied to incoming ontologies and those given no automapping
jasdl_ontologies="travel",
- jasdl_travel_uri="http://www.dur.ac.uk/t.g.klapiscak/onts/travel.owl",
+ //jasdl_travel_uri="http://www.dur.ac.uk/t.g.klapiscak/onts/travel.owl",
+ jasdl_travel_uri="file:///home/tom/workspace/jason/applications/jasdl-owlapi/examples/travel_agent/ontologies/travel.owl",
/*jasdl_travel_mapping_strategies="jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy",*/ // defaults can be overriden per-ontology here
jasdl_travel_mapping_manual="small_beach=beach", // these manual mappings will override any automatic mappings made by strategies,
@@ -65,12 +66,12 @@
jasdl_useBeliefRevision = "true",
jasdl_ontologies="holidays,places",
- jasdl_holidays_uri="http://www.dur.ac.uk/t.g.klapiscak/onts/travel.owl",
+ jasdl_holidays_uri="file:///home/tom/workspace/jason/applications/jasdl-owlapi/examples/travel_agent/ontologies/travel.owl",
jasdl_holidays_mapping_strategies="jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy",
jasdl_holidays_mapping_manual="small_beach=beach, luxuriousHotel=LuxuryHotel", // for demonstration of arbitrary primitive mappings being handled correctly
- jasdl_places_uri="http://www.dur.ac.uk/t.g.klapiscak/onts/places.owl",
+ jasdl_places_uri="file:///home/tom/workspace/jason/applications/jasdl-owlapi/examples/travel_agent/ontologies/places.owl",
jasdl_places_mapping_strategies="jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy"
]
agentArchClass jasdl.architecture.JasdlAgArch
Modified: trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java 2008-04-02 17:09:55 UTC (rev 1193)
+++ trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -89,7 +89,7 @@
throw new JasdlException("Unknown reasoner class: "+reasonerClass);
}else{
agent.setReasoner(reasoner);
- agent.setReasonerLogLevel(Level.WARN);
+ agent.setReasonerLogLevel(Level.FATAL);
}
}catch (Throwable e) {
throw new JasdlException("Error instantiating reasoner "+reasonerClass+". Reason: "+e);
Copied: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing (from rev 1189, trunk/applications/jasdl-owlapi/src/jasdl/bridge/alias)
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/Alias.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/alias/Alias.java 2008-04-01 23:35:02 UTC (rev 1189)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/Alias.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -1,4 +1,4 @@
-package jasdl.bridge.alias;
+package jasdl.bridge.mapping.aliasing;
import jason.asSyntax.Atom;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasFactory.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/alias/AliasFactory.java 2008-04-01 23:35:02 UTC (rev 1189)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasFactory.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -1,4 +1,4 @@
-package jasdl.bridge.alias;
+package jasdl.bridge.mapping.aliasing;
import jasdl.bridge.seliteral.SELiteral;
import jasdl.util.JasdlException;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasManager.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/alias/AliasManager.java 2008-04-01 23:35:02 UTC (rev 1189)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasManager.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -1,6 +1,6 @@
-package jasdl.bridge.alias;
+package jasdl.bridge.mapping.aliasing;
-import jasdl.bridge.MappingManager;
+import jasdl.bridge.mapping.MappingManager;
import org.semanticweb.owl.model.OWLObject;
Copied: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AllDifferentPlaceholder.java (from rev 1189, trunk/applications/jasdl-owlapi/src/jasdl/bridge/AllDifferentPlaceholder.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AllDifferentPlaceholder.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AllDifferentPlaceholder.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -0,0 +1,118 @@
+package jasdl.bridge.mapping.aliasing;
+
+import jason.asSyntax.Atom;
+
+import java.net.URI;
+import java.util.Set;
+
+import org.semanticweb.owl.model.OWLAnnotation;
+import org.semanticweb.owl.model.OWLAnnotationAxiom;
+import org.semanticweb.owl.model.OWLClass;
+import org.semanticweb.owl.model.OWLDataProperty;
+import org.semanticweb.owl.model.OWLDataType;
+import org.semanticweb.owl.model.OWLEntity;
+import org.semanticweb.owl.model.OWLEntityVisitor;
+import org.semanticweb.owl.model.OWLException;
+import org.semanticweb.owl.model.OWLIndividual;
+import org.semanticweb.owl.model.OWLNamedObjectVisitor;
+import org.semanticweb.owl.model.OWLObject;
+import org.semanticweb.owl.model.OWLObjectProperty;
+import org.semanticweb.owl.model.OWLObjectVisitor;
+import org.semanticweb.owl.model.OWLOntology;
+
+/**
+ * Since the all_different has no concrete entity associated with it, we create a "placeholder" so that it remains consistent with
+ * JASDL's mapping mechanisms. Entities of this type will be intercepted and dealt with differently.
+ * Associated with an ontology label which determines hash-code - required since each ontology must have its own placeholder to reference
+ * @author tom
+ *
+ */
+public class AllDifferentPlaceholder implements OWLEntity {
+ private Atom label;
+
+ public AllDifferentPlaceholder(Atom label){
+ this.label = label;
+ }
+
+ public void accept(OWLEntityVisitor visitor) {
+ }
+
+ public Set<OWLAnnotationAxiom> getAnnotationAxioms(OWLOntology ontology) {
+ return null;
+ }
+
+ public Set<OWLAnnotation> getAnnotations(OWLOntology ontology) {
+ return null;
+ }
+
+ public Set<OWLAnnotation> getAnnotations(OWLOntology ontology, URI annotationURI) {
+ return null;
+ }
+
+ public void accept(OWLObjectVisitor visitor) {
+
+ }
+
+ public void accept(OWLNamedObjectVisitor visitor) {
+ }
+
+ public URI getURI() {
+ return null;
+ }
+
+ public boolean equals(Object other){
+ if(!(other instanceof AllDifferentPlaceholder)){
+ return false;
+ }
+ return label.equals(((AllDifferentPlaceholder)other).label);
+ }
+
+ public int hashCode(){
+ return label.hashCode();
+ }
+
+ public OWLClass asOWLClass() {
+ return null;
+ }
+
+ public OWLDataProperty asOWLDataProperty() {
+ return null;
+ }
+
+ public OWLDataType asOWLDataType() {
+ return null;
+ }
+
+ public OWLIndividual asOWLIndividual() {
+ return null;
+ }
+
+ public OWLObjectProperty asOWLObjectProperty() {
+ return null;
+ }
+
+ public boolean isOWLClass() {
+ return false;
+ }
+
+ public boolean isOWLDataProperty() {
+ return false;
+ }
+
+ public boolean isOWLDataType() {
+ return false;
+ }
+
+ public boolean isOWLIndividual() {
+ return false;
+ }
+
+ public boolean isOWLObjectProperty() {
+ return false;
+ }
+
+ public int compareTo(OWLObject arg0) {
+ return 0;
+ }
+
+}
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/DecapitaliseMappingStrategy.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/alias/DecapitaliseMappingStrategy.java 2008-04-01 23:35:02 UTC (rev 1189)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/DecapitaliseMappingStrategy.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -17,7 +17,7 @@
* along with JASDL. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package jasdl.bridge.alias;
+package jasdl.bridge.mapping.aliasing;
public class DecapitaliseMappingStrategy implements MappingStrategy {
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/DefinitionManager.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/alias/DefinitionManager.java 2008-04-01 23:35:02 UTC (rev 1189)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/DefinitionManager.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -1,6 +1,6 @@
-package jasdl.bridge.alias;
+package jasdl.bridge.mapping.aliasing;
-import jasdl.bridge.MappingManager;
+import jasdl.bridge.mapping.MappingManager;
import org.semanticweb.owl.model.OWLClass;
import org.semanticweb.owl.model.OWLDescription;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/MappingStrategy.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/alias/MappingStrategy.java 2008-04-01 23:35:02 UTC (rev 1189)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/MappingStrategy.java 2008-04-02 17:26:44 UTC (rev 1194)
@@ -17,7 +17,7 @@
* along with JASDL. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package jasdl.bridge.alias;
+package jasdl.bridge.mapping.aliasing;
public interface MappingStrategy {
public String apply(String input);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
