Skip to content

Commit

Permalink
Changes to solve AATIM-1420
Browse files Browse the repository at this point in the history
  • Loading branch information
@TylerDicks
TylerDicks committed Nov 4, 2016
1 parent e777378 commit 701fcc6
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 25 deletions.
Binary file modified sadl3/com.ge.research.sadl.parent/com.ge.research.jena/lib/reasoner-api.jar
View file
Binary file not shown.
Binary file modified sadl3/com.ge.research.sadl.parent/com.ge.research.jena/lib/reasoner-impl.jar
View file
Binary file not shown.
95 changes: 70 additions & 25 deletions .../com.ge.research.sadl.jena/src/com/ge/research/sadl/jena/JenaBasedSadlModelValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
Expand All @@ -30,7 +29,6 @@
import com.ge.research.sadl.reasoner.InvalidNameException;
import com.ge.research.sadl.reasoner.InvalidTypeException;
import com.ge.research.sadl.reasoner.TranslationException;
import com.ge.research.sadl.reasoner.ModelError.ErrorType;
import com.ge.research.sadl.reasoner.utils.SadlUtils;
import com.ge.research.sadl.sADL.BinaryOperation;
import com.ge.research.sadl.sADL.BooleanLiteral;
Expand Down Expand Up @@ -73,7 +71,6 @@
import com.hp.hpl.jena.ontology.Restriction;
import com.hp.hpl.jena.ontology.UnionClass;
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.NodeIterator;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
Expand Down Expand Up @@ -218,7 +215,36 @@ public void setTypeCheckType(ConceptIdentifier typeCheckType) {
}

public RangeValueType getRangeValueType() {
return rangeValueType;
if(this.getCompoundTypes() != null){
return getCompoundRangeValueType(this);
}else{
return rangeValueType;
}
}

private RangeValueType getCompoundRangeValueType(TypeCheckInfo tci){
List<TypeCheckInfo> types = this.getCompoundTypes();
Iterator<TypeCheckInfo> iter = types.iterator();
RangeValueType rvt = null;
while(iter.hasNext()){
TypeCheckInfo type = iter.next();
RangeValueType rvt2 = null;
if(type.getCompoundTypes() != null){
rvt2 = getCompoundRangeValueType(type);
}else{
rvt2 = type.getRangeValueType();
}

if(rvt != null){
if(rvt != rvt2){
issueAcceptor.addError("Incompatable Range Types", tci.context); //TODO add new error message
}
}else{
rvt = rvt2;
}
}

return rvt;
}

protected void setContext(JenaBasedSadlModelValidator validator, EObject ctx) {
Expand Down Expand Up @@ -735,7 +761,7 @@ else if(expression instanceof NumberLiteral || expression instanceof Unit){
Literal litval;
if (expression instanceof Unit) {
value = ((Unit)expression).getValue().getValue();
String unit = ((Unit)expression).getUnit();
//String unit = ((Unit)expression).getUnit();
ConceptName uqcn = new ConceptName(SadlConstants.SADL_IMPLICIT_MODEL_UNITTEDQUANTITY_URI);
List<ConceptName> impliedProperties = getImpliedProperties(theJenaModel.getOntResource(uqcn.getUri()));
if (impliedProperties != null) {
Expand Down Expand Up @@ -790,11 +816,11 @@ else if(expression instanceof ElementInList){
issueAcceptor.addError("Unable to get the List type", el);
}
else if (listtype.getRangeValueType() != RangeValueType.LIST) {
issueAcceptor.addError("Expected a List", el);
issueAcceptor.addError("Expected a List", el);
}
else {
// the element's type is the type of the list but not necessarily a list
listtype.setRangeValueType((listtype.getTypeCheckType() != null && listtype.getTypeCheckType() instanceof ConceptName) ? ((ConceptName)listtype.getTypeCheckType()).getRangeValueType() : RangeValueType.CLASS_OR_DT);
listtype = convertListTypeToElementOfListType(listtype);
}
return listtype;
}
Expand Down Expand Up @@ -869,6 +895,25 @@ else if (expression instanceof SadlUnionType) {
return null;
}

private TypeCheckInfo convertListTypeToElementOfListType(TypeCheckInfo listtype) {
listtype.setRangeValueType((listtype.getTypeCheckType() != null && listtype.getTypeCheckType() instanceof ConceptName) ? ((ConceptName)listtype.getTypeCheckType()).getRangeValueType() : RangeValueType.CLASS_OR_DT);

if(listtype.getCompoundTypes() == null){
//not compound
ConceptIdentifier tct = listtype.getTypeCheckType();
if(tct instanceof ConceptName){
((ConceptName) tct).setRangeValueType(RangeValueType.CLASS_OR_DT);
}
}else{
Iterator<TypeCheckInfo> tci_iter = listtype.getCompoundTypes().iterator();
while(tci_iter.hasNext()){
convertListTypeToElementOfListType(tci_iter.next());
}
}

return listtype;
}

protected TypeCheckInfo getType(Constant expression) throws DontTypeCheckException {
//What do we do about the rest of the constants?
/*'--' | 'a'? 'type' ;*/
Expand Down Expand Up @@ -1020,7 +1065,7 @@ else if (subjtype != null && (cnstval.equals("first element") || cnstval.equals(
else if (!predtype.equals(OntConceptType.CLASS_PROPERTY) && !predtype.equals(OntConceptType.DATATYPE_PROPERTY) &&
!predtype.equals(OntConceptType.RDF_PROPERTY) && !predtype.equals(OntConceptType.ANNOTATION_PROPERTY)) {
issueAcceptor.addError(SadlErrorMessages.EXPECTED_A.get("property in property chain"), predicate);
String preduri = declarationExtensions.getConceptUri(((Name)predicate).getName());
//String preduri = declarationExtensions.getConceptUri(((Name)predicate).getName());
}
} catch (CircularDefinitionException e) {
e.printStackTrace();
Expand Down Expand Up @@ -1080,7 +1125,7 @@ private void addEffectiveRange(TypeCheckInfo predicateType, Expression subject){
metricsProcessor.addEffectiveRangeAndDomain(null, className, propertyName, rangeStr, isList);
}
else {
int i = 0; // TODO
//int i = 0;
}
}
}
Expand Down Expand Up @@ -1389,7 +1434,7 @@ else if(conceptType.equals(OntConceptType.INSTANCE)){
}
ConceptName instConceptName = new ConceptName(conceptUri);
instConceptName.setType(ConceptType.INDIVIDUAL);
// TODO could belong to multiple classes
// TODO could belong to multiple classes
ExtendedIterator<Resource> typeitr = individual.listRDFTypes(true);
TypeCheckInfo compoundTci = null;
TypeCheckInfo tci = null;
Expand Down Expand Up @@ -1694,21 +1739,21 @@ private List<ConceptName> getImpliedProperties(Resource first) {
return retlst;
}

private boolean isRangeKlugyDATASubclass(OntResource rsrc) {
if (rsrc.getURI().endsWith("#DATA")) {
return true;
}
if (rsrc.canAs(OntClass.class)){
ExtendedIterator<OntClass> itr = rsrc.as(OntClass.class).listSuperClasses();
while (itr.hasNext()) {
OntClass spr = itr.next();
if (spr.isURIResource() && spr.getURI().endsWith("#DATA")) {
return true;
}
}
}
return false;
}
// private boolean isRangeKlugyDATASubclass(OntResource rsrc) {
// if (rsrc.getURI().endsWith("#DATA")) {
// return true;
// }
// if (rsrc.canAs(OntClass.class)){
// ExtendedIterator<OntClass> itr = rsrc.as(OntClass.class).listSuperClasses();
// while (itr.hasNext()) {
// OntClass spr = itr.next();
// if (spr.isURIResource() && spr.getURI().endsWith("#DATA")) {
// return true;
// }
// }
// }
// return false;
// }

protected TypeCheckInfo getVariableType(ConceptType variable, String conceptNm, String conceptUri, EObject expression) throws DontTypeCheckException, CircularDefinitionException {
//Needs filled in for Requirements extension
Expand Down

0 comments on commit 701fcc6

Please sign in to comment.