Skip to content
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

Jump to bottom

improve perofrmance of combine_coding_and_quantity_values #241

Merged
merged 6 commits into from
Sep 11, 2023
Merged

improve perofrmance of combine_coding_and_quantity_values #241

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3826a67
improve perofrmance of combine_coding_and_quantity_values
Sep 7, 2023
74a6209
improve perofrmance of combine_coding_and_quantity_values
Sep 8, 2023
e3e4bcb
Merge branch 'master' into combine_coding_and_quantity_values
danieldubrovski Sep 8, 2023
fd028f9
improve perofrmance of combine_coding_and_quantity_values
Sep 11, 2023
5f77d7d
improve perofrmance of combine_coding_and_quantity_values
Sep 11, 2023
3664f1f
improve perofrmance of combine_coding_and_quantity_values
Sep 11, 2023
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
21 changes: 13 additions & 8 deletions src/optimizer/plugins/CombineCodingAndQuantityValuesOptimizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ export default {
const rules: fshrules.Rule[] = def.rules; // <-- this assignment makes TypeScript happier in the next chunk of code
const typeCache: Map<string, fhirtypes.ElementDefinitionType[]> = new Map();

const ruleMap: { [path: string]: { [caretPath: string]: ExportableCaretValueRule } } = {};
rules
.filter(r => r instanceof ExportableCaretValueRule)
.forEach((r: ExportableCaretValueRule) => {
ruleMap[r.path] = ruleMap[r.path] ?? {};
ruleMap[r.path][r.caretPath] = r;
});

rules.forEach(rule => {
if (
rule instanceof ExportableCaretValueRule &&
Expand All @@ -72,18 +80,15 @@ export default {
return;
}

const siblingPaths = [
const siblings = [
`${basePath}.system`,
`${basePath}.display`,
`${basePath}.unit`,
`${basePath}.value`
];
const siblings = rules.filter(
otherRule =>
otherRule instanceof ExportableCaretValueRule &&
rule.path === otherRule.path &&
siblingPaths.includes(otherRule.caretPath)
) as ExportableCaretValueRule[];
]
.map(sibling => ruleMap[rule.path]?.[sibling])
.filter(Boolean);

if (siblings.length) {
const systemSibling = siblings.find(sibling => sibling.caretPath.endsWith('.system'));
const displaySibling = siblings.find(sibling => sibling.caretPath.endsWith('.display'));
Expand Down