Merge DMN 1.6 Ballot 5 (#34)

omg-dmn-taskforce · May 13, 2024 · 1231abe · 1231abe
2 parents 585bbcd + 75438aa
commit 1231abe
Show file tree

Hide file tree

Showing 77 changed files with 516 additions and 441 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,41 +18,41 @@ jobs:
       - uses: korelstar/xmllint-problem-matcher@v1
       - uses: ChristophWurst/[email protected]
         with:
-          xml-file: "./examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-file: "./examples/Chapter 12 Example 1 Originations/Chapter 12 Example.dmn"
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
       - uses: ChristophWurst/[email protected]
         with:
-          xml-file: "./examples/Chapter 11 Example 1 Originations/Financial.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-file: "./examples/Chapter 12 Example 1 Originations/Financial.dmn"
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
       - uses: ChristophWurst/[email protected]
         with:
-          xml-file: "examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-file: "examples/Chapter 12 Example 2 Ranked Loan Products/Recommended Loan Products.dmn"
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
       - uses: ChristophWurst/[email protected]
         with:
-          xml-file: "examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-file: "examples/Chapter 12 Example 2 Ranked Loan Products/Loan info.dmn"
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
       - uses: ChristophWurst/[email protected]
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-decision-service.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
       - uses: ChristophWurst/[email protected]
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
       - uses: ChristophWurst/[email protected]
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-dish-example.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
       - uses: ChristophWurst/[email protected]
         with:
           xml-file: "examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn"
-          xml-schema-file: ./xsd/DMN15.xsd
+          xml-schema-file: ./xsd/DMN16.xsd
         if: always()
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,62 @@
+{
+    "xml.catalogs": [
+        "xsd/catalog.xml"
+    ],
+    "xml.filePathSupport.mappings": [
+        // see: https://github.com/redhat-developer/vscode-xml/blob/main/docs/Features/XMLFilePathSupport.md
+        {
+            "pattern": "**/*.dmn",
+            "expressions": [
+               {
+                  "xpath": "import/@locationURI"
+               }
+            ]
+        }
+    ],
+    "xml.references": [
+        // see: https://github.com/redhat-developer/vscode-xml/blob/main/docs/Features/XMLReferencesFeatures.md
+        {
+            "pattern": "**/*.dmn",
+            "expressions": [
+                {
+                    "from": "itemComponent/typeRef/text()",
+                    "to": "itemDefinition/@name"
+                },
+                {
+                    "from": "@dmnElementRef",
+                    "to": "@id"
+                },
+                {
+                    "from": "@href",
+                    "prefix": "#",
+                    "to": "@id"
+                },
+                {
+                    "from": "DMNEdge/@sourceElement",
+                    "to": "DMNShape/@id"
+                },
+                {
+                    "from": "DMNEdge/@targetElement",
+                    "to": "DMNShape/@id"
+                }
+            ]
+        },
+        {
+            "pattern": "**/*.xmi",
+            "expressions": [
+                {
+                    "from": "@idref",
+                    "to": "@id"
+                },
+                {
+                    "from": "@type",
+                    "to": "@id"
+                },
+                {
+                    "from": "@element",
+                    "to": "@id"
+                }
+            ]
+        }
+    ]
+}
diff --git a/...ple 1 Originations/Chapter 11 Example.dmn → ...ple 1 Originations/Chapter 12 Example.dmn b/...ple 1 Originations/Chapter 11 Example.dmn → ...ple 1 Originations/Chapter 12 Example.dmn
diff --git a/...ation risk score model decision logic.png → ...ation risk score model decision logic.png b/...ation risk score model decision logic.png → ...ation risk score model decision logic.png
diff --git a/...t-bureau risk category decision logic.png → ...t-bureau risk category decision logic.png b/...t-bureau risk category decision logic.png → ...t-bureau risk category decision logic.png
diff --git a/...Figure 11.01 Example business process.png → ...Figure 12.01 Example business process.png b/...Figure 11.01 Example business process.png → ...Figure 12.01 Example business process.png
diff --git a/... DRD of all automated decision making.png → ... DRD of all automated decision making.png b/... DRD of all automated decision making.png → ... DRD of all automated decision making.png
diff --git a/...Decide bureau strategy decision point.png → ...Decide bureau strategy decision point.png b/...Decide bureau strategy decision point.png → ...Decide bureau strategy decision point.png
diff --git a/...DRD for Decide routing decision point.png → ...DRD for Decide routing decision point.png b/...DRD for Decide routing decision point.png → ...DRD for Decide routing decision point.png
diff --git a/...for Review application decision point.png → ...for Review application decision point.png b/...for Review application decision point.png → ...for Review application decision point.png
diff --git a/...redit Risk Analytics Knowledge Source.png → ...redit Risk Analytics Knowledge Source.png b/...redit Risk Analytics Knowledge Source.png → ...redit Risk Analytics Knowledge Source.png
diff --git a/...(74) Bureau Strategy Decision Service.png → ...(74) Bureau Strategy Decision Service.png b/...(74) Bureau Strategy Decision Service.png → ...(74) Bureau Strategy Decision Service.png
diff --git a/...e 11.08 (75) Routing Decision Service.png → ...e 12.08 (75) Routing Decision Service.png b/...e 11.08 (75) Routing Decision Service.png → ...e 12.08 (75) Routing Decision Service.png
diff --git a/...re 11.09 (76) Strategy decision logic.png → ...re 12.09 (76) Strategy decision logic.png b/...re 11.09 (76) Strategy decision logic.png → ...re 12.09 (76) Strategy decision logic.png
diff --git a/... (77) Bureau call type decision logic.png → ... (77) Bureau call type decision logic.png b/... (77) Bureau call type decision logic.png → ... (77) Bureau call type decision logic.png
diff --git a/...Bureau call type table decision logic.png → ...Bureau call type table decision logic.png b/...Bureau call type table decision logic.png → ...Bureau call type table decision logic.png
diff --git a/...11.12 (79) Eligibility decision logic.png → ...12.12 (79) Eligibility decision logic.png b/...11.12 (79) Eligibility decision logic.png → ...12.12 (79) Eligibility decision logic.png
diff --git a/...(80) Eligibility rules decision logic.png → ...(80) Eligibility rules decision logic.png b/...(80) Eligibility rules decision logic.png → ...(80) Eligibility rules decision logic.png
diff --git a/...e-bureau Risk Category decision logic.png → ...e-bureau Risk Category decision logic.png b/...e-bureau Risk Category decision logic.png → ...e-bureau Risk Category decision logic.png
diff --git a/...au risk category table decision logic.png → ...au risk category table decision logic.png b/...au risk category table decision logic.png → ...au risk category table decision logic.png
diff --git a/...pplicaktion risk score decision logic.png → ...pplicaktion risk score decision logic.png b/...pplicaktion risk score decision logic.png → ...pplicaktion risk score decision logic.png
diff --git a/...ure 11.18 (85) Routing decision logic.png → ...ure 12.18 (85) Routing decision logic.png b/...ure 11.18 (85) Routing decision logic.png → ...ure 12.18 (85) Routing decision logic.png
diff --git a/...gures/Figure 11.19 (86) Routing rules.png → ...gures/Figure 12.19 (86) Routing rules.png b/...gures/Figure 11.19 (86) Routing rules.png → ...gures/Figure 12.19 (86) Routing rules.png
diff --git a/...t-bureau risk category decision logic.png → ...t-bureau risk category decision logic.png b/...t-bureau risk category decision logic.png → ...t-bureau risk category decision logic.png
diff --git a/...e-bureau affordability decision logic.png → ...e-bureau affordability decision logic.png b/...e-bureau affordability decision logic.png → ...e-bureau affordability decision logic.png
diff --git a/...t-bureau affordability decision logic.png → ...t-bureau affordability decision logic.png b/...t-bureau affordability decision logic.png → ...t-bureau affordability decision logic.png
diff --git a/...ordability calculation decision logic.png → ...ordability calculation decision logic.png b/...ordability calculation decision logic.png → ...ordability calculation decision logic.png
diff --git a/... (92) Credit contingency factor table.png → ... (92) Credit contingency factor table.png b/... (92) Credit contingency factor table.png → ... (92) Credit contingency factor table.png
diff --git a/...uired monthly installment calculation.png → ...uired monthly installment calculation.png b/...uired monthly installment calculation.png → ...uired monthly installment calculation.png
diff --git a/...nstallment caclulation decision logic.png → ...nstallment caclulation decision logic.png b/...nstallment caclulation decision logic.png → ...nstallment caclulation decision logic.png
diff --git a/... Function defined in Financial import.png → ... Function defined in Financial import.png b/... Function defined in Financial import.png → ... Function defined in Financial import.png
diff --git a/...(95) Applicant data input data sample.png → ...(95) Applicant data input data sample.png b/...(95) Applicant data input data sample.png → ...(95) Applicant data input data sample.png
diff --git a/...30 (96) Bureau data input data sample.png → ...30 (96) Bureau data input data sample.png b/...30 (96) Bureau data input data sample.png → ...30 (96) Bureau data input data sample.png
diff --git a/... the Bureau Strategy Decision Service.png → ... the Bureau Strategy Decision Service.png b/... the Bureau Strategy Decision Service.png → ... the Bureau Strategy Decision Service.png
diff --git a/...utput of the Routing Decision Service.png → ...utput of the Routing Decision Service.png b/...utput of the Routing Decision Service.png → ...utput of the Routing Decision Service.png
diff --git a/...) Requested product input data sample.png → ...) Requested product input data sample.png b/...) Requested product input data sample.png → ...) Requested product input data sample.png
diff --git a/...r 11 Example 1 Originations/Financial.dmn → ...r 12 Example 1 Originations/Financial.dmn b/...r 11 Example 1 Originations/Financial.dmn → ...r 12 Example 1 Originations/Financial.dmn
@@ -1,4 +1,4 @@
-<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:rss="http://purl.org/rss/2.0/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:feel="https://www.omg.org/spec/DMN/20230324/FEEL/"           xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn"  xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  xmlns:drools="http://www.drools.org/kie/dmn/1.1"  xmlns="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" id="_5e8e877a-af87-434b-9c36-ed51c8d6b514" name="Financial" namespace="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" exporter="DMN Modeler" exporterVersion="6.2.2.1" triso:logoChoice="None">
+<semantic:definitions xmlns:semantic="https://www.omg.org/spec/DMN/20240513/MODEL/" xmlns:rss="http://purl.org/rss/2.0/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:trisofeed="http://trisotech.com/feed" xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:feel="https://www.omg.org/spec/DMN/20240513/FEEL/"           xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn"  xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase"  xmlns:drools="http://www.drools.org/kie/dmn/1.1"  xmlns="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" id="_5e8e877a-af87-434b-9c36-ed51c8d6b514" name="Financial" namespace="http://www.trisotech.com/definitions/_5e8e877a-af87-434b-9c36-ed51c8d6b514" exporter="DMN Modeler" exporterVersion="6.2.2.1" triso:logoChoice="None">
     <semantic:decisionService id="_5e8e877a-af87-434b-9c36-ed51c8d6b514_DS" name="Whole Model Decision Service" triso:dynamicDecisionService="true">
         <semantic:variable name="Whole Model Decision Service" id="_7510044d-9f94-4b5a-a172-bb5412031a86" typeRef="Any"/>
     </semantic:decisionService>
@@ -7,12 +7,12 @@
     </semantic:decisionService>
     <semantic:businessKnowledgeModel id="_a30c75ec-7d81-4606-802c-b31ea308392d" name="PMT">
         <semantic:description>&lt;p&gt;&lt;span lang="JA"&gt;Standard calculation of monthly installment&amp;nbsp;&lt;/span&gt;from Rate, Term and Amount.&lt;/p&gt;</semantic:description>
-        <semantic:variable name="PMT" id="_702e93e8-7d03-4400-aae4-a21543a4d631" typeRef="Any"/>
-        <semantic:encapsulatedLogic id="_7fafdbd9-083f-43f5-bc0a-57c9ea0cf943" kind="FEEL" typeRef="Any" triso:expressionId="_3e686571-acdc-46c2-8fe0-8e399ee6a570">
+        <semantic:variable name="PMT" id="_702e93e8-7d03-4400-aae4-a21543a4d631"/>
+        <semantic:encapsulatedLogic id="_7fafdbd9-083f-43f5-bc0a-57c9ea0cf943" kind="FEEL" triso:expressionId="_3e686571-acdc-46c2-8fe0-8e399ee6a570">
             <semantic:formalParameter name="Rate" typeRef="number" id="_1787cf94-5e76-4926-ac24-5b4096b28dca"/>
             <semantic:formalParameter name="Term" typeRef="number" id="_0d037df5-8942-473f-9feb-2e16d6d7d631"/>
             <semantic:formalParameter name="Amount" typeRef="number" id="_deb10bf3-97f0-4f6b-8ae4-5cbfd44debac"/>
-            <semantic:literalExpression id="_4d149dbb-89da-498e-853f-2c33f4e9b834">
+            <semantic:literalExpression id="_4d149dbb-89da-498e-853f-2c33f4e9b834" typeRef="number">
                 <semantic:text>(Amount *Rate/12) / (1 - (1 + Rate/12)**-Term)</semantic:text>
             </semantic:literalExpression>
         </semantic:encapsulatedLogic>

diff --git a/....34 DRD for Recommended Loan Products.png → ....34 DRD for Recommended Loan Products.png b/....34 DRD for Recommended Loan Products.png → ....34 DRD for Recommended Loan Products.png
diff --git a/...operty (non-normative representation).png → ...operty (non-normative representation).png b/...operty (non-normative representation).png → ...operty (non-normative representation).png
diff --git a/...s/Figures/Figure 11.37 Type tBorrower.png → ...s/Figures/Figure 12.37 Type tBorrower.png b/...s/Figures/Figure 11.37 Type tBorrower.png → ...s/Figures/Figure 12.37 Type tBorrower.png
diff --git a/...atings, a collection of tLenderRating.png → ...atings, a collection of tLenderRating.png b/...atings, a collection of tLenderRating.png → ...atings, a collection of tLenderRating.png
diff --git a/...ts/Figures/Figure 11.39 Loan Products.png → ...ts/Figures/Figure 12.39 Loan Products.png b/...ts/Figures/Figure 11.39 Loan Products.png → ...ts/Figures/Figure 12.39 Loan Products.png
diff --git a/...roducts, a collection of tLoanProduct.png → ...roducts, a collection of tLoanProduct.png b/...roducts, a collection of tLoanProduct.png → ...roducts, a collection of tLoanProduct.png
diff --git a/....41 DRD of imported Loan Info Service.png → ....41 DRD of imported Loan Info Service.png b/....41 DRD of imported Loan Info Service.png → ....41 DRD of imported Loan Info Service.png
diff --git a/...foTable, a collection of tLoanInfoRow.png → ...foTable, a collection of tLoanInfoRow.png b/...foTable, a collection of tLoanInfoRow.png → ...foTable, a collection of tLoanInfoRow.png
diff --git a/...oducts/Figures/Figure 11.43 Loan Data.png → ...oducts/Figures/Figure 12.43 Loan Data.png b/...oducts/Figures/Figure 11.43 Loan Data.png → ...oducts/Figures/Figure 12.43 Loan Data.png
diff --git a/...ures/Figure 11.44 BKM Rate Adjustment.png → ...ures/Figure 12.44 BKM Rate Adjustment.png b/...ures/Figure 11.44 BKM Rate Adjustment.png → ...ures/Figure 12.44 BKM Rate Adjustment.png
diff --git a/...ucts/Figures/Figure 11.45 BKM payment.png → ...ucts/Figures/Figure 12.45 BKM payment.png b/...ucts/Figures/Figure 11.45 BKM payment.png → ...ucts/Figures/Figure 12.45 BKM payment.png
diff --git a/...oducts/Figures/Figure 11.46 Loan Info.png → ...oducts/Figures/Figure 12.46 Loan Info.png b/...oducts/Figures/Figure 11.46 Loan Info.png → ...oducts/Figures/Figure 12.46 Loan Info.png
diff --git a/.../Figures/Figure 11.47 Loan Info Table.png → .../Figures/Figure 12.47 Loan Info Table.png b/.../Figures/Figure 11.47 Loan Info Table.png → .../Figures/Figure 12.47 Loan Info Table.png
diff --git a/...Figures/Figure 11.48 Min Credit Score.png → ...Figures/Figure 12.48 Min Credit Score.png b/...Figures/Figure 11.48 Min Credit Score.png → ...Figures/Figure 12.48 Min Credit Score.png
diff --git a/...s/Figure 11.49 Eligibility Parameters.png → ...s/Figure 12.49 Eligibility Parameters.png b/...s/Figure 11.49 Eligibility Parameters.png → ...s/Figure 12.49 Eligibility Parameters.png
diff --git a/...igures/Figure 11.50 Eligibility (top).png → ...igures/Figure 12.50 Eligibility (top).png b/...igures/Figure 11.50 Eligibility (top).png → ...igures/Figure 12.50 Eligibility (top).png
diff --git a/...res/Figure 11.51 Eligibility (bottom).png → ...res/Figure 12.51 Eligibility (bottom).png b/...res/Figure 11.51 Eligibility (bottom).png → ...res/Figure 12.51 Eligibility (bottom).png
diff --git a/...igures/Figure 11.52 Eligibility Table.png → ...igures/Figure 12.52 Eligibility Table.png b/...igures/Figure 11.52 Eligibility Table.png → ...igures/Figure 12.52 Eligibility Table.png
diff --git a/...igure 11.53 Recommended Loan Products.png → ...igure 12.53 Recommended Loan Products.png b/...igure 11.53 Recommended Loan Products.png → ...igure 12.53 Recommended Loan Products.png
diff --git a/...ducts/Figures/Figure 11.54 Format Row.png → ...ducts/Figures/Figure 12.54 Format Row.png b/...ducts/Figures/Figure 11.54 Format Row.png → ...ducts/Figures/Figure 12.54 Format Row.png
diff --git a/...e output of Recommended Loan Products.png → ...e output of Recommended Loan Products.png b/...e output of Recommended Loan Products.png → ...e output of Recommended Loan Products.png
diff --git a/...1.56 Test Case Input Data (partial) 1.png → ...2.56 Test Case Input Data (partial) 1.png b/...1.56 Test Case Input Data (partial) 1.png → ...2.56 Test Case Input Data (partial) 1.png
diff --git a/...Test Case Input Data (partial) Assets.png → ...Test Case Input Data (partial) Assets.png b/...Test Case Input Data (partial) Assets.png → ...Test Case Input Data (partial) Assets.png
diff --git a/...Case Input Data (partial) Liabilities.png → ...Case Input Data (partial) Liabilities.png b/...Case Input Data (partial) Liabilities.png → ...Case Input Data (partial) Liabilities.png
diff --git a/...mple 2 Ranked Loan Products/Loan info.dmn → ...mple 2 Ranked Loan Products/Loan info.dmn b/...mple 2 Ranked Loan Products/Loan info.dmn → ...mple 2 Ranked Loan Products/Loan info.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<semantic:definitions id="_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Loan info" namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" exporter="DMN Modeler" exporterVersion="6.2.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed">
+<semantic:definitions id="_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Loan info" namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" exporter="DMN Modeler" exporterVersion="6.2.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/20240513/MODEL/" xmlns="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed">
 	<semantic:itemDefinition name="tBorrower" label="tBorrower">
 		<semantic:itemComponent id="_b7dcc14d-510d-4628-a510-ca774208e501" name="Full Name">
 			<semantic:typeRef>string</semantic:typeRef>
@@ -356,8 +356,8 @@
 		<semantic:variable name="Down Payment" id="_bbe3f7c0-d59c-472b-9266-73bcdcc0fbb6" typeRef="number"/>
 	</semantic:inputData>
 	<semantic:businessKnowledgeModel id="_aeaa30db-0f84-424a-b2f5-af9b2538a9ce" name="Rate Adjustment">
-		<semantic:variable name="Rate Adjustment" id="_3199df2d-5734-481f-a201-933b41d6196e" typeRef="tPercent"/>
-		<semantic:encapsulatedLogic typeRef="tPercent">
+		<semantic:variable name="Rate Adjustment" id="_3199df2d-5734-481f-a201-933b41d6196e"/>
+		<semantic:encapsulatedLogic>
 			<semantic:formalParameter name="Credit Score" typeRef="tCreditScore"/>
 			<semantic:formalParameter name="LTV" typeRef="tPercent"/>
 			<semantic:decisionTable id="_cd20f4b0-fbc2-4b9d-b31f-4a83d951e989" hitPolicy="UNIQUE" outputLabel="Rate Adjustment" typeRef="tPercent">
@@ -520,8 +520,8 @@
 		</semantic:encapsulatedLogic>
 	</semantic:businessKnowledgeModel>
 	<semantic:businessKnowledgeModel id="_0d2a6f36-0403-41ad-a191-f793743649d4" name="payment">
-		<semantic:variable name="payment" id="_8c231b6d-165f-4c36-bcd3-617498b36e0e" typeRef="number"/>
-		<semantic:encapsulatedLogic id="_97168569-14dd-4533-8d8c-497681134e3b" kind="FEEL" typeRef="number">
+		<semantic:variable name="payment" id="_8c231b6d-165f-4c36-bcd3-617498b36e0e"/>
+		<semantic:encapsulatedLogic id="_97168569-14dd-4533-8d8c-497681134e3b" kind="FEEL">
 			<semantic:formalParameter name="p" typeRef="number" id="_b65fd962-b719-4dca-b37b-4c4d2b7e9867"/>
 			<semantic:formalParameter name="r" typeRef="number" id="_22bb5be8-b3dd-4a05-8e0d-6458fe53aa4a"/>
 			<semantic:formalParameter name="n" typeRef="number" id="_6a169eec-28b4-4789-ac5e-141348bcc99a"/>

diff --git a/...an Products/Recommended Loan Products.dmn → ...an Products/Recommended Loan Products.dmn b/...an Products/Recommended Loan Products.dmn → ...an Products/Recommended Loan Products.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<semantic:definitions id="_736fa164-03d8-429f-8318-4913a548c3a6" name="Recommended Loan Products" namespace="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6" exporter="DMN Modeler" exporterVersion="6.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:include1="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" xmlns="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6">
-	<semantic:import namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Services" importType="https://www.omg.org/spec/DMN/20230324/MODEL/"/>
+<semantic:definitions id="_736fa164-03d8-429f-8318-4913a548c3a6" name="Recommended Loan Products" namespace="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6" exporter="DMN Modeler" exporterVersion="6.2.3" xmlns:semantic="https://www.omg.org/spec/DMN/20240513/MODEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:include1="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" xmlns="http://www.trisotech.com/definitions/_736fa164-03d8-429f-8318-4913a548c3a6">
+	<semantic:import namespace="http://www.trisotech.com/definitions/_5c8b9296-96cf-4898-bba5-3a2d21d34eed" name="Services" importType="https://www.omg.org/spec/DMN/20240513/MODEL/"/>
 	<semantic:itemDefinition name="tBorrower" label="tBorrower">
 		<semantic:itemComponent id="_b7dcc14d-510d-4628-a510-ca774208e501" name="Full Name">
 			<semantic:typeRef>string</semantic:typeRef>
@@ -431,8 +431,8 @@
 		<semantic:variable name="Down Payment" id="_bbe3f7c0-d59c-472b-9266-73bcdcc0fbb6" typeRef="number"/>
 	</semantic:inputData>
 	<semantic:businessKnowledgeModel id="_a6e2c692-4a0c-4385-bbc3-7280e94a8760" name="Min Credit Score">
-		<semantic:variable name="Min Credit Score" id="_bafc7628-ede7-40ed-8229-b79e1760b8ee" typeRef="tCreditScore"/>
-		<semantic:encapsulatedLogic typeRef="tCreditScore">
+		<semantic:variable name="Min Credit Score" id="_bafc7628-ede7-40ed-8229-b79e1760b8ee"/>
+		<semantic:encapsulatedLogic>
 			<semantic:formalParameter name="DTI" typeRef="tPercent"/>
 			<semantic:formalParameter name="LTV" typeRef="tPercent"/>
 			<semantic:formalParameter name="Reserves" typeRef="number"/>
@@ -797,8 +797,8 @@ Property, Credit Score, Lender Ratings) </semantic:text>
 		</semantic:literalExpression>
 	</semantic:decision>
 	<semantic:businessKnowledgeModel id="_f286d938-0042-4f0d-a889-6838d2c83a17" name="Eligibility">
-		<semantic:variable name="Eligibility" id="_33c71a05-13ba-4040-9ce3-394aa5513d28" typeRef="Any"/>
-		<semantic:encapsulatedLogic id="_0c7fd6f0-3c0f-43fc-8689-de083430e010" kind="FEEL" typeRef="Any">
+		<semantic:variable name="Eligibility" id="_33c71a05-13ba-4040-9ce3-394aa5513d28"/>
+		<semantic:encapsulatedLogic id="_0c7fd6f0-3c0f-43fc-8689-de083430e010" kind="FEEL">
 			<semantic:formalParameter name="Loan Product" typeRef="tLoanProduct" id="_d91e73be-a2fa-4224-a673-07e5cafe2235"/>
 			<semantic:formalParameter name="Borrower" typeRef="tBorrower" id="_6828f434-c3cb-4c22-909c-e21c34f66416"/>
 			<semantic:formalParameter name="Loan Info" typeRef="tLoanInfoRow" id="_cf041290-0a54-4e2b-80ef-c3a3a04d6c21"/>
@@ -1024,8 +1024,8 @@ then true else false</semantic:text>
 		</semantic:context>
 	</semantic:decision>
 	<semantic:businessKnowledgeModel id="_813f0ad9-fae2-41fd-b99b-2c8e438b4e01" name="Eligibility Parameters">
-		<semantic:variable name="Eligibility Parameters" id="_de0fa861-531d-4983-9dd7-0b448af5d6a7" typeRef="tEligibilityParameters"/>
-		<semantic:encapsulatedLogic id="_0a63f9b7-5f09-47af-9bd7-0e6b10f0d457" kind="FEEL" typeRef="tEligibilityParameters">
+		<semantic:variable name="Eligibility Parameters" id="_de0fa861-531d-4983-9dd7-0b448af5d6a7"/>
+		<semantic:encapsulatedLogic id="_0a63f9b7-5f09-47af-9bd7-0e6b10f0d457" kind="FEEL">
 			<semantic:formalParameter name="Loan Product" typeRef="tLoanProduct" id="_1912abed-44d7-4728-a98b-f9edb9874014"/>
 			<semantic:formalParameter name="Borrower" typeRef="tBorrower" id="_53f8f293-a4ab-48e3-9285-1a50d9c7f384"/>
 			<semantic:formalParameter name="Loan Info" typeRef="tLoanInfoRow" id="_962c2fd9-96da-46b1-9532-234b60306665"/>
@@ -1091,8 +1091,8 @@ and To be paid off=true].Balance[item!=null])</semantic:text>
 		<semantic:variable name="Lender Ratings" id="_2c92c03e-a395-4af5-ae8c-387b37ba1d71" typeRef="tLenderRatings"/>
 	</semantic:inputData>
 	<semantic:businessKnowledgeModel id="_929201cb-cb3b-4326-b199-bb0f9149ebb0" name="Format Row">
-		<semantic:variable name="Format Row" id="_517952d5-64e8-4dc8-8815-ac6732b851a6" typeRef="tformattedrow_1"/>
-		<semantic:encapsulatedLogic id="_e6de2d7e-3623-449f-b238-63d2eadc31d6" kind="FEEL" typeRef="tformattedrow_1">
+		<semantic:variable name="Format Row" id="_517952d5-64e8-4dc8-8815-ac6732b851a6"/>
+		<semantic:encapsulatedLogic id="_e6de2d7e-3623-449f-b238-63d2eadc31d6" kind="FEEL">
 			<semantic:formalParameter name="row" typeRef="tTableRow" id="_984e3a72-a34e-4957-beb5-471b1a972ed5"/>
 			<semantic:context id="_5ccce417-75fd-4d60-b014-695bb847cb31" typeRef="tformattedrow_1">
 				<semantic:contextEntry id="_b5fcf3db-2bf1-4b11-ac61-88234e8ff31a">

diff --git a/examples/Diagram Interchange/diagram-interchange-decision-service.dmn b/examples/Diagram Interchange/diagram-interchange-decision-service.dmn
@@ -3,7 +3,7 @@
   id="Definitions_DecisionService"
   name="Decision Service"
   namespace="http://www.omg.org/spec/DMN/20180521/diagram-interchange-decision-service/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
+  xmlns="https://www.omg.org/spec/DMN/20240513/MODEL/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"

diff --git a/examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn b/examples/Diagram Interchange/diagram-interchange-decision-with-listed-input-data.dmn
@@ -3,7 +3,7 @@
   id="Definitions_0v8cooh"
   name="Decision with Listed Input data"
   namespace="http://www.omg.org/spec/DMN/20180521/diagram-interchange-decision-with-listed-input-data/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
+  xmlns="https://www.omg.org/spec/DMN/20240513/MODEL/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"

diff --git a/examples/Diagram Interchange/diagram-interchange-dish-example.dmn b/examples/Diagram Interchange/diagram-interchange-dish-example.dmn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="dish-decisions" name="Dish Decisions"
   namespace="http://www.omg.org/spec/DMN/20180521/dish-example/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
+  xmlns="https://www.omg.org/spec/DMN/20240513/MODEL/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"

diff --git a/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn b/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn
@@ -3,7 +3,7 @@
   id="definitions_0v8cooh"
   name="Decision"
   namespace="http://www.omg.org/spec/DMN/20180521/diagram-interchange-shape-with-label-text/"
-  xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
+  xmlns="https://www.omg.org/spec/DMN/20240513/MODEL/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/"
   xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"