Commit 1dd1c0bb authored by Mohammed Ibrahim's avatar Mohammed Ibrahim Committed by James Bracegirdle

Upgrade Model Version to ISDA release 2.65.2

parent 40abf4f0
Pipeline #187 passed with stage
......@@ -167,17 +167,6 @@
"height" : 198,
"width" : 331.75439453125
}
}, {
"class" : "cdm::model::Calculation",
"id" : "90d472a8-2c42-4b18-9a6b-7fbd9370e62b",
"position" : {
"x" : 1671.202449115954,
"y" : 737.9287423103212
},
"rectangle" : {
"height" : 58,
"width" : 256.11328125
}
} ],
"generalizationViews" : [ ],
"name" : "Test1",
......@@ -310,22 +299,6 @@
},
"sourceView" : "087063ae-2830-4b17-b064-df65f4f353b4",
"targetView" : "4f65d9e3-d243-4af2-a851-8c16d620beaf"
}, {
"line" : {
"points" : [ {
"x" : 1296.30224609375,
"y" : 741
}, {
"x" : 1367.8254494657274,
"y" : 934.1732740943266
} ]
},
"property" : {
"class" : "cdm::model::Payout",
"property" : "assetPayout"
},
"sourceView" : "4f65d9e3-d243-4af2-a851-8c16d620beaf",
"targetView" : "2a5106c9-475b-4d70-8afe-e11a6c4229fe"
}, {
"line" : {
"points" : [ {
......@@ -358,22 +331,6 @@
},
"sourceView" : "1bc30c76-51e5-4965-96a4-fe307bfffbae",
"targetView" : "17771eb6-17a9-4ad4-921e-18a88610d285"
}, {
"line" : {
"points" : [ {
"x" : 1398.3521021792762,
"y" : 189.68421052631578
}, {
"x" : 1826.874714740954,
"y" : 175.32874231032133
} ]
},
"property" : {
"class" : "cdm::model::Product",
"property" : "commodity"
},
"sourceView" : "17771eb6-17a9-4ad4-921e-18a88610d285",
"targetView" : "27c32459-4775-43f7-85ae-91727015767b"
}, {
"line" : {
"points" : [ {
......@@ -390,22 +347,6 @@
},
"sourceView" : "2a5106c9-475b-4d70-8afe-e11a6c4229fe",
"targetView" : "2ceaf437-a591-48fe-a4d8-a0f323847128"
}, {
"line" : {
"points" : [ {
"x" : 1657.310066303454,
"y" : 967.8287423103211
}, {
"x" : 1799.259089740954,
"y" : 766.9287423103212
} ]
},
"property" : {
"class" : "cdm::model::PriceReturnTerms",
"property" : "calculation"
},
"sourceView" : "2ceaf437-a591-48fe-a4d8-a0f323847128",
"targetView" : "90d472a8-2c42-4b18-9a6b-7fbd9370e62b"
}, {
"line" : {
"points" : [ {
......
......@@ -258,22 +258,6 @@
},
"sourceView" : "bb0eff8a-53fc-4ed3-a0e6-b73e441d9066",
"targetView" : "6b6780db-eccd-42a2-a073-f291d0c8d3dd"
}, {
"line" : {
"points" : [ {
"x" : 1163.3720446764746,
"y" : 858.6785495704678
}, {
"x" : 1488.018441183525,
"y" : 858.4840341254557
} ]
},
"property" : {
"class" : "cdm::model::Payout",
"property" : "assetPayout"
},
"sourceView" : "bb0eff8a-53fc-4ed3-a0e6-b73e441d9066",
"targetView" : "3a7db446-69b4-495e-a645-51378dc739ab"
}, {
"line" : {
"points" : [ {
......
......@@ -2,7 +2,7 @@
"classifierPath" : "meta::pure::metamodel::type::Class",
"content" : {
"_type" : "class",
"name" : "Conditions",
"name" : "AccessConditions",
"package" : "cdm::model",
"properties" : [ {
"multiplicity" : {
......@@ -17,21 +17,7 @@
},
"value" : "The parties' Access Condition (Initial Margin CSA) or a Specified Condition (Variation Margin CSA) election."
} ],
"type" : "cdm::model::ConditionsElections"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "additionalConditions",
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
"value" : "doc"
},
"value" : "Additional language specific to the Access Conditions as set by the parties to the agreement."
} ],
"type" : "String"
"type" : "cdm::model::AccessConditionsElections"
}, {
"multiplicity" : {
"lowerBound" : 0
......
......@@ -2,7 +2,7 @@
"classifierPath" : "meta::pure::metamodel::type::Class",
"content" : {
"_type" : "class",
"name" : "ConditionsElections",
"name" : "AccessConditionsElections",
"package" : "cdm::model",
"properties" : [ {
"multiplicity" : {
......
......@@ -29,9 +29,37 @@
"profile" : "meta::pure::profiles::doc",
"value" : "doc"
},
"value" : "The regulatory regime terms which are referred to as part of certain legal agreements, such as such as the ISDA 2016 and 2018 CSA for Initial Margin."
"value" : "The party elections with respect to the additional regime(s)."
} ],
"type" : "cdm::model::RegimeTerms"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "additionalType",
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
"value" : "doc"
},
"value" : "The Additional Type of transaction that can require the collection or delivery of initial margin under the specified regulatory regime for the purposes of Covered Transactions, as specified in ISDA 2016 Credit Support Annex for Initial Margin, paragraph 13, General Principles, (b)(B)."
} ],
"type" : "cdm::model::AdditionalTypeEnum"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "additionalTerms",
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
"value" : "doc"
},
"value" : "The bespoke Additional Type for the purposes of Covered Transactions (IM)."
} ],
"type" : "String"
} ],
"taggedValues" : [ {
"tag" : {
......
......@@ -20,7 +20,7 @@
"_type" : "var",
"name" : "this"
} ],
"property" : "lastRegularPaymentDate"
"property" : "additionalRepresentation"
} ]
}, {
"_type" : "func",
......@@ -31,7 +31,7 @@
"_type" : "var",
"name" : "this"
} ],
"property" : "finalPaymentDate"
"property" : "additionalInformation"
} ]
} ]
}, {
......@@ -46,7 +46,7 @@
"_type" : "var",
"name" : "this"
} ],
"property" : "finalPaymentDate"
"property" : "additionalInformation"
} ]
}, {
"_type" : "func",
......@@ -57,7 +57,7 @@
"_type" : "var",
"name" : "this"
} ],
"property" : "lastRegularPaymentDate"
"property" : "additionalRepresentation"
} ]
} ]
} ]
......@@ -66,43 +66,43 @@
},
"name" : "one_of_constraint"
} ],
"name" : "LastRegularPaymentDate",
"name" : "AdditionalRepresentations",
"package" : "cdm::model",
"properties" : [ {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "lastRegularPaymentDate",
"name" : "additionalRepresentation",
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
"value" : "doc"
},
"value" : "The last regular payment date when specified as a date, as in the FpML interest rate construct. FpML specifies that this date may be subject to adjustment in accordance with any business day convention specified in the paymentDatesAdjustments attribute."
"value" : "The specification of the Additional Representation that may be applicable to the agreement."
} ],
"type" : "Date"
"type" : "cdm::model::AdditionalRepresentation"
}, {
"multiplicity" : {
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "finalPaymentDate",
"name" : "additionalInformation",
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
"value" : "doc"
},
"value" : "The last payment when specified as an adjustable or relative date, as in the FpML total return construct."
"value" : "The qualification of whether Additional Information related to Regulatory Compliance and Concentration Limits is applicable or not"
} ],
"type" : "cdm::model::AdjustableOrRelativeDate"
"type" : "Boolean"
} ],
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
"value" : "doc"
},
"value" : "A class which purpose is to provide the ability into the seemingly incompatible representations of the interest rate and equity last payment date."
"value" : "A class to specify Additional Representations that may be applicable to an agreement."
} ]
}
}
\ No newline at end of file
......@@ -65,21 +65,25 @@
"function" : "if",
"parameters" : [ {
"_type" : "func",
"function" : "equal",
"function" : "not",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "standardValue"
}, {
"_type" : "property",
"_type" : "func",
"function" : "equal",
"parameters" : [ {
"_type" : "enum",
"fullPath" : "cdm::model::AdditionalTypeEnum"
} ],
"property" : "Other"
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "standardValue"
}, {
"_type" : "property",
"parameters" : [ {
"_type" : "enum",
"fullPath" : "cdm::model::AdditionalTypeEnum"
} ],
"property" : "Other"
} ]
} ]
}, {
"_type" : "lambda",
......
......@@ -150,6 +150,10 @@
"upperBound" : 1
},
"name" : "adjustedDate",
"stereotypes" : [ {
"profile" : "cdm::model::metadata",
"value" : "id"
} ],
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
......
......@@ -36,6 +36,10 @@
"lowerBound" : 0
},
"name" : "adjustedDate",
"stereotypes" : [ {
"profile" : "cdm::model::metadata",
"value" : "id"
} ],
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
......
......@@ -147,6 +147,10 @@
"upperBound" : 1
},
"name" : "adjustedDate",
"stereotypes" : [ {
"profile" : "cdm::model::metadata",
"value" : "id"
} ],
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
......
......@@ -2,100 +2,6 @@
"classifierPath" : "meta::pure::metamodel::type::Class",
"content" : {
"_type" : "class",
"constraints" : [ {
"functionDefinition" : {
"_type" : "lambda",
"body" : [ {
"_type" : "func",
"function" : "or",
"parameters" : [ {
"_type" : "func",
"function" : "or",
"parameters" : [ {
"_type" : "func",
"function" : "or",
"parameters" : [ {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "adjustedDate"
} ]
}, {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "relativeDate"
} ]
} ]
}, {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "unadjustedDate"
} ]
} ]
}, {
"_type" : "func",
"function" : "and",
"parameters" : [ {
"_type" : "func",
"function" : "and",
"parameters" : [ {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "unadjustedDate"
} ]
}, {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "dateAdjustments"
} ]
} ]
}, {
"_type" : "func",
"function" : "isEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "adjustedDate"
} ]
} ]
} ]
} ],
"parameters" : [ ]
},
"name" : "AdjustedDate"
} ],
"name" : "AdjustableOrAdjustedOrRelativeDate",
"package" : "cdm::model",
"properties" : [ {
......@@ -132,6 +38,10 @@
"upperBound" : 1
},
"name" : "adjustedDate",
"stereotypes" : [ {
"profile" : "cdm::model::metadata",
"value" : "id"
} ],
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
......
......@@ -2,70 +2,6 @@
"classifierPath" : "meta::pure::metamodel::type::Class",
"content" : {
"_type" : "class",
"constraints" : [ {
"functionDefinition" : {
"_type" : "lambda",
"body" : [ {
"_type" : "func",
"function" : "or",
"parameters" : [ {
"_type" : "func",
"function" : "and",
"parameters" : [ {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "adjustableDate"
} ]
}, {
"_type" : "func",
"function" : "isEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "relativeDate"
} ]
} ]
}, {
"_type" : "func",
"function" : "and",
"parameters" : [ {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "relativeDate"
} ]
}, {
"_type" : "func",
"function" : "isEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "adjustableDate"
} ]
} ]
} ]
} ],
"parameters" : [ ]
},
"name" : "AdjustableOrRelativeDate_choice"
} ],
"name" : "AdjustableOrRelativeDate",
"package" : "cdm::model",
"properties" : [ {
......
......@@ -2,70 +2,6 @@
"classifierPath" : "meta::pure::metamodel::type::Class",
"content" : {
"_type" : "class",
"constraints" : [ {
"functionDefinition" : {
"_type" : "lambda",
"body" : [ {
"_type" : "func",
"function" : "or",
"parameters" : [ {
"_type" : "func",
"function" : "and",
"parameters" : [ {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "adjustableDates"
} ]
}, {
"_type" : "func",
"function" : "isEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "relativeDates"
} ]
} ]
}, {
"_type" : "func",
"function" : "and",
"parameters" : [ {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "relativeDates"
} ]
}, {
"_type" : "func",
"function" : "isEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "adjustableDates"
} ]
} ]
} ]
} ],
"parameters" : [ ]