diff --git a/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn b/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn index de73b90..f548867 100644 --- a/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn +++ b/examples/Chapter 11 Example 1 Originations/Chapter 11 Example.dmn @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + string @@ -359,7 +359,7 @@ <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span lang="JA">The&nbsp;</span><strong><span lang="JA">Eligibility rules&nbsp;</span></strong><span lang="JA">decision logic&nbsp;defines a complete, priority-ordered single hit decision table&nbsp;</span>deriving Eligibility from Pre-Bureau Risk Category, Pre-Bureau Affordability and Age.</span></p> - + @@ -470,7 +470,7 @@ <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span lang="JA">The&nbsp;</span><strong><span lang="JA">Routing Rules&nbsp;</span></strong><span lang="JA">decision logic defines a complete, priority-ordered single hit decision table&nbsp;</span>deriving Routing from Post-Bureau Risk Category, Post-Bureau Affordability, Bankrupt and Credit Score.</span></p> - + @@ -734,7 +734,7 @@ <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"></span><span lang="JA">The&nbsp;</span><strong><span lang="JA">Credit contingency factor table&nbsp;</span></strong><span lang="JA"><span style="font-size: 10pt; font-family: arial, helvetica, sans-serif;">decision</span> logic defines a complete, unique-hit decision table&nbsp;</span>deriving Credit contingency factor from Risk Category.</p> <p>&nbsp;</p> - + @@ -794,7 +794,7 @@ <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span lang="JA">The&nbsp;</span><strong><span lang="JA">Affordability calculation&nbsp;</span></strong><span lang="JA">decision logic defines a boxed function deriving Affordability from&nbsp;</span>Monthly Income, Monthly Repayments, Monthly Expenses and Required Monthly Installment. One step in this calculation derives Credit contingency factor by invoking the Credit contingency factor table business</span></p> - + @@ -1000,7 +1000,7 @@ else false <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span lang="JA">The&nbsp;</span><strong><span lang="JA">Post-bureau risk category table&nbsp;</span></strong><span lang="JA">decision logic defines a complete, unique-hit decision table&nbsp;</span>deriving Post-Bureau Risk Category from Existing Customer, Application Risk Score and Credit Score.</span></p> - + @@ -1289,7 +1289,7 @@ else false <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span lang="JA">The&nbsp;</span><strong><span lang="JA">Pre-bureau risk category table&nbsp;</span></strong><span lang="JA">decision logic defines a complete, unique-hit decision table&nbsp;</span>deriving Pre-bureau risk category from Existing Customer and Application Risk Score.</span></p> - + @@ -1481,7 +1481,7 @@ else false <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span lang="JA">The&nbsp;</span><strong><span lang="JA">Application risk score model&nbsp;</span></strong><span lang="JA">decision logic&nbsp;defines a complete, no-order multiple-hit table&nbsp;</span>with aggregation, deriving Application risk score from Age, Marital Status and Employment Status, as the sum of the Partial scores of all matching rows (this is therefore a predictive scorecard represented as a decision table).</span></p> - + @@ -1758,7 +1758,7 @@ else false <p><span style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span lang="JA">The&nbsp;</span><strong><span lang="JA">Installment calculation&nbsp;</span></strong><span lang="JA">decision logic&nbsp;defines a boxed function deriving monthly installment&nbsp;</span>from Product Type, Rate, Term and Amount.</span></p> - + diff --git a/examples/Chapter 11 Example 1 Originations/Financial.dmn b/examples/Chapter 11 Example 1 Originations/Financial.dmn index 8bd728e..6d68313 100644 --- a/examples/Chapter 11 Example 1 Originations/Financial.dmn +++ b/examples/Chapter 11 Example 1 Originations/Financial.dmn @@ -1,4 +1,4 @@ - + diff --git a/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn b/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn index 2533519..249d6d3 100644 --- a/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn +++ b/examples/Chapter 11 Example 2 Ranked Loan Products/Loan info.dmn @@ -1,5 +1,5 @@ - + string @@ -640,7 +640,7 @@ - + diff --git a/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn b/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn index 30f5c5f..378068e 100644 --- a/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn +++ b/examples/Chapter 11 Example 2 Ranked Loan Products/Recommended Loan Products.dmn @@ -1,6 +1,6 @@ - - + + string @@ -1171,7 +1171,7 @@ and To be paid off=true].Balance[item!=null]) - + diff --git a/examples/Diagram Interchange/diagram-interchange-decision-service.dmn b/examples/Diagram Interchange/diagram-interchange-decision-service.dmn index 774f89f..b37986a 100644 --- a/examples/Diagram Interchange/diagram-interchange-decision-service.dmn +++ b/examples/Diagram Interchange/diagram-interchange-decision-service.dmn @@ -3,9 +3,9 @@ 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/20211108/MODEL/" + xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" + xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"> 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 index 1089010..24c2c59 100644 --- 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,9 +3,9 @@ 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/20211108/MODEL/" + xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" + xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"> diff --git a/examples/Diagram Interchange/diagram-interchange-dish-example.dmn b/examples/Diagram Interchange/diagram-interchange-dish-example.dmn index 3b1da40..ac0365c 100644 --- a/examples/Diagram Interchange/diagram-interchange-dish-example.dmn +++ b/examples/Diagram Interchange/diagram-interchange-dish-example.dmn @@ -1,9 +1,9 @@ diff --git a/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn b/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn index 362d4fa..20165ab 100644 --- a/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn +++ b/examples/Diagram Interchange/diagram-interchange-shape-with-label-text.dmn @@ -3,9 +3,9 @@ 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/20211108/MODEL/" + xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" + xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"> diff --git a/meta-model/Class_Diagram__DMN_Edge.svg b/meta-model/Class_Diagram__DMN_Edge.svg index 0f6c864..d89223b 100644 --- a/meta-model/Class_Diagram__DMN_Edge.svg +++ b/meta-model/Class_Diagram__DMN_Edge.svg @@ -1,119 +1,98 @@ - - - + + + diff --git a/meta-model/Class_Diagram__DMN_Style.svg b/meta-model/Class_Diagram__DMN_Style.svg index 403ba07..2c68aa5 100644 --- a/meta-model/Class_Diagram__DMN_Style.svg +++ b/meta-model/Class_Diagram__DMN_Style.svg @@ -1,127 +1,113 @@ - - - + + + diff --git a/meta-model/Class_Diagram__DMN__ExpressionsL3.svg b/meta-model/Class_Diagram__DMN__ExpressionsL3.svg index 986738a..c8d5a78 100644 --- a/meta-model/Class_Diagram__DMN__ExpressionsL3.svg +++ b/meta-model/Class_Diagram__DMN__ExpressionsL3.svg @@ -1,262 +1,262 @@ - - - + + + diff --git a/xmi/DMN15.mdzip b/xmi/DMN15.mdzip index 09720af..b82acc8 100644 Binary files a/xmi/DMN15.mdzip and b/xmi/DMN15.mdzip differ diff --git a/xmi/DMN15.xmi b/xmi/DMN15.xmi index 8dcca1b..81ee698 100644 --- a/xmi/DMN15.xmi +++ b/xmi/DMN15.xmi @@ -9,7 +9,7 @@ + URI="https://www.omg.org/spec/DMN/20230324/DMN15.xmi"> @@ -136,14 +136,14 @@ - + association="_19_0_4_17c4044b_1676408438239_44411_4934"> + xmi:id="_19_0_4_17c4044b_1676408466454_788786_4946"/> - + association="_19_0_4_17c4044b_1676408438239_44411_4934"> + xmi:id="_19_0_4_17c4044b_1676408479836_769101_4950"/> + value="text/plain"/> - - - + + + + URI="https://www.omg.org/spec/DMN/20230324/DMNDI15.xmi"> 19.0 v9 + URI="https://www.omg.org/spec/DMN/20230324/DMNDI15.xmi"> @@ -459,7 +459,7 @@ name="DI::Edge" isAbstract="true"> + name="DI::Style" + isAbstract="true"> + + + + + xmlns:dmndi="https://www.omg.org/spec/DMN/20230324/DMNDI/" + targetNamespace="https://www.omg.org/spec/DMN/20230324/MODEL/"> - + Include the DMN Diagram Interchange (DI) schema @@ -54,8 +54,8 @@ - - + + diff --git a/xsd/DMNDI15.xsd b/xsd/DMNDI15.xsd index bf706fd..17b5535 100644 --- a/xsd/DMNDI15.xsd +++ b/xsd/DMNDI15.xsd @@ -1,9 +1,9 @@