bug fix wasInformedBy range of ACTIVITY doesn't match model value THING

ge-semtk · Apr 28, 2021 · ecb7d34 · ecb7d34
1 parent 504a740
commit ecb7d34
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sparqlGraphLibrary/src/main/java/com/ge/research/semtk/belmont/Node.java b/sparqlGraphLibrary/src/main/java/com/ge/research/semtk/belmont/Node.java
@@ -291,8 +291,10 @@ public void inflateAndValidate(OntologyInfo oInfo, ArrayList<String> modelErrLis
 				String nRangeStr = nodeItem.getUriValueType();
 				String nRangeAbbr = nodeItem.getValueType();
 				boolean rangeErrFlag = false;
+				OntologyClass itemRangeClass = oInfo.getClass(nRangeStr);
+				OntologyClass oPropRangeClass = oInfo.getClass(oProp.getRangeStr());
 
-				if (!nRangeStr.equals(oProp.getRangeStr())) {	
+				if (! oInfo.classIsA(itemRangeClass, oPropRangeClass)) {	
 					if (nodeItem.isUsed()) {
 						String msg = this.getSparqlID() + " node property " + oPropURI + " range of " + nRangeStr+ " doesn't match model range of " + oProp.getRangeStr();
 
@@ -308,7 +310,7 @@ public void inflateAndValidate(OntologyInfo oInfo, ArrayList<String> modelErrLis
 						nodeItem.setUriValueType(oProp.getRangeStr());
 					}
 				}
-				if (!nRangeAbbr.equals(oProp.getRangeStr(true))) {
+				if (!nRangeAbbr.equals(new OntologyName(nRangeStr).getLocalName())) {
 					if (nodeItem.isUsed()) {
 						String msg = this.getSparqlID() + " node property " + oPropURI + " range abbreviation of " + nRangeAbbr + " doesn't match model range of " + oProp.getRangeStr(true);