Skip to content

in flattener, reuse quantity item details from constituent archetypes… #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
william-vw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

in flattener, reuse quantity item details from constituent archetypes… #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 84 additions & 92 deletions oet-parser/src/main/java/org/openehr/am/template/Flattener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,111 +1240,103 @@ protected void applyValueConstraint(Archetype archetype,
}
}

protected void applyQuantityConstraint(CComplexObject ccobj,
QuantityConstraint qc) throws FlatteningException {

protected void applyQuantityConstraint(CComplexObject ccobj, QuantityConstraint qc) throws FlatteningException {
log.debug("applying quantity constraint on path: " + ccobj.path());

String[] includedUnits = qc.getIncludedUnitsArray();
String[] excludedUnits = qc.getExcludedUnitsArray();
QuantityUnitConstraint[] magnitudeUnits = qc.getUnitMagnitudeArray() ;
CDvQuantityItem item = null;
CAttribute valueAttr = ccobj.getAttribute(VALUE);
QuantityUnitConstraint[] magnitudeUnits = qc.getUnitMagnitudeArray();
CAttribute valueAttr = ccobj.getAttribute(VALUE);
String valuePath = ccobj.path() + "/" + VALUE;

if(magnitudeUnits != null && magnitudeUnits.length == 1) {


if (magnitudeUnits != null && magnitudeUnits.length == 1) {
log.debug("setting unit_magnitude quantity constraint");

QuantityUnitConstraint quc = magnitudeUnits[0];
Interval<Double> magnitude = new Interval<Double>(
quc.getMinMagnitude(), quc.getMaxMagnitude(),
Interval<Double> magnitude = new Interval<Double>(quc.getMinMagnitude(), quc.getMaxMagnitude(),
quc.getIncludesMinimum(), quc.getIncludesMaximum());

item = new CDvQuantityItem(magnitude, quc.getUnit());
if(valueAttr != null) {
valueAttr.removeAllChildren();
CDvQuantity cdq = CDvQuantity.singleRequired(valuePath, item);
valueAttr.addChild(cdq);
}

} else if(includedUnits != null && includedUnits.length == 1) {
// <constraint xsi:type="quantityConstraint">
// <includedUnits>mmol/L</includedUnits>
// </constraint>

log.debug("setting included_units quantity constraint");

item = new CDvQuantityItem(includedUnits[0]);

} else if(excludedUnits != null && excludedUnits.length > 0) {

log.debug("setting excluded_units quantity constraint");

// <constraint xsi:type="quantityConstraint">
// <excludedUnits>in</excludedUnits>
// </constraint>

if(valueAttr == null) {
throw new FlatteningException(
"Missing value attribute for quantityConstraint.excludedUnits");
}
if(valueAttr.getChildren() == null || valueAttr.getChildren().isEmpty()) {
throw new FlatteningException(
"Missing child obj for quantityConstraint.excludedUnits");
}
if(valueAttr.getChildren().size() > 1) {
throw new FlatteningException(
"More than one child obj for quantityConstraint.excludedUnits");
}
CObject child = valueAttr.getChildren().get(0);
if( ! (child instanceof CDvQuantity)) {
throw new FlatteningException(
"Non-CDvQuantity child obj for quantityConstraint.excludedUnits");
}
CDvQuantity cdq = (CDvQuantity) child;
if(cdq.getList() == null || cdq.getList().isEmpty()) {
throw new FlatteningException(
"Empty CDvQuantity.list for quantityConstraint.excludedUnits");

if (valueAttr == null) {
valueAttr = new CSingleAttribute(valuePath, VALUE, Existence.REQUIRED);
ccobj.addAttribute(valueAttr);
}

cdq.removeItemByUnitsList(excludedUnits);
return;


createSingleQuantity(valuePath, valueAttr, quc.getUnit(), magnitude);

} else {
boolean including = (includedUnits != null && includedUnits.length == 1);
boolean excluding = (excludedUnits != null && excludedUnits.length > 0);

// TODO > 1 in the array etc
throw new FlatteningException(
"Unsupported quantityConstraint in Template: " + qc);
}


if(valueAttr == null) {

valueAttr = new CSingleAttribute(valuePath, VALUE, Existence.REQUIRED);
CDvQuantity cdq = CDvQuantity.singleRequired(valuePath, item);
valueAttr.addChild(cdq);
ccobj.addAttribute(valueAttr);

} else {

// deal with empty c_dv_quantity to add new items
if(valueAttr.getChildren() == null || valueAttr.getChildren().isEmpty()) {
throw new FlatteningException(
"Missing child obj for quantityConstraint.excludedUnits");
}
if(valueAttr.getChildren().size() > 1) {
throw new FlatteningException(
"More than one child obj for quantityConstraint.excludedUnits");
}
CObject child = valueAttr.getChildren().get(0);
if( ! (child instanceof CDvQuantity)) {
throw new FlatteningException(
"Non-CDvQuantity child obj for quantityConstraint.excludedUnits");
if (!(including || excluding))
throw new FlatteningException("Unsupported quantityConstraint in Template: " + qc);

if (including)
log.debug("setting included_units quantity constraint");
else
log.debug("setting excluded_units quantity constraint");

if (valueAttr == null) {
if (excluding) {
throw new FlatteningException("Missing value attribute for quantityConstraint.excludedUnits");

} else {
valueAttr = new CSingleAttribute(valuePath, VALUE, Existence.REQUIRED);
ccobj.addAttribute(valueAttr);

createSingleQuantity(valuePath, valueAttr, includedUnits[0], null);
}

} else {
if (valueAttr.getChildren() == null || valueAttr.getChildren().isEmpty()) {
throw new FlatteningException("Missing child obj for quantityConstraint.[included/excluded]Units");
}
if (valueAttr.getChildren().size() > 1) {
throw new FlatteningException(
"More than one child obj for quantityConstraint.[included/excluded]Units");
}
CObject child = valueAttr.getChildren().get(0);
if (!(child instanceof CDvQuantity)) {
throw new FlatteningException(
"Non-CDvQuantity child obj for quantityConstraint.[included/excluded]Units");
}
CDvQuantity cdq = (CDvQuantity) child;
// if (cdq.getList() == null || cdq.getList().isEmpty()) {
// throw new FlatteningException(
// "Empty CDvQuantity.list for quantityConstraint.[included/excluded]Units");
// }

if (including) {
// if possible, just keep original quantity item
if (!cdq.keepItemByUnitsList(includedUnits))
// if no original quantity item, let's add it
cdq.addItem(new CDvQuantityItem(includedUnits[0]));

} else if (excluding) {
cdq.removeItemByUnitsList(excludedUnits);
}
}
CDvQuantity cdq = (CDvQuantity) child;
cdq.addItem(item);
}
}

private void createSingleQuantity(String valuePath, CAttribute valueAttr, String unit, Interval<Double> magnitude) {
// try and copy precision from original item ..
CDvQuantityItem orItem = valueAttr.getChildren().stream().filter(c -> c instanceof CDvQuantity)
.flatMap(c -> ((CDvQuantity) c).getList().stream()).filter(q -> q.getUnits().equals(unit)).findAny()
.orElse(null);

CDvQuantityItem item = null;
if (orItem == null)
item = new CDvQuantityItem(magnitude, null, unit);
else
item = new CDvQuantityItem((magnitude == null ? orItem.getMagnitude() : magnitude), orItem.getPrecision(),
unit);

valueAttr.removeAllChildren();

CDvQuantity cdq = CDvQuantity.singleRequired(valuePath, item);
valueAttr.addChild(cdq);
}

protected void applyTextConstraint(CComplexObject ccobj,
TextConstraint tc) throws FlatteningException {
Expand Down
30 changes: 30 additions & 0 deletions openehr-ap/src/main/java/org/openehr/am/openehrprofile/datatypes/quantity/CDvQuantity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,36 @@ public void removeItem(CDvQuantityItem item) {
}
}

/**
* Keeps the items that have the given units
*
* @param item not null
* @return whether any of the units were found in the list
*/
public boolean keepItemByUnitsList(String[] unitsList) {
if (list == null)
return false;

if (unitsList == null) {
list.clear();
return false;
}

boolean found = false;
List<String> keep = Arrays.asList(unitsList);

for (Iterator<CDvQuantityItem> it = list.iterator(); it.hasNext();) {
CDvQuantityItem item = it.next();

if (!keep.contains(item.getUnits()))
it.remove();
else
found = true;
}

return found;
}

/**
* Removes the items that have the given units
*
Expand Down