Commit 80b6fce3 authored by Mohammed Ibrahim's avatar Mohammed Ibrahim

syncing with workspace from studio [potentially affected 19 entities]

parent f02fe9e0
......@@ -43,7 +43,7 @@
"values" : [ "endDateIsInLeapYear" ]
}, {
"_type" : "func",
"function" : "cdm::functions::natives::isLeap",
"function" : "cdm::functions::native::isLeap",
"parameters" : [ {
"_type" : "func",
"function" : "year",
......
......@@ -86,26 +86,15 @@
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
"lowerBound" : 3,
"upperBound" : 3
},
"values" : [ {
"_type" : "func",
"function" : "times",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "calculationAmount"
}, {
"_type" : "var",
"name" : "fixedRateAmount"
} ]
} ]
"_type" : "var",
"name" : "calculationAmount"
}, {
"_type" : "var",
"name" : "fixedRateAmount"
}, {
"_type" : "var",
"name" : "dayCountFraction"
......
......@@ -128,13 +128,10 @@
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 3,
"upperBound" : 3
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "calculationAmount"
}, {
"_type" : "func",
"function" : "plus",
"parameters" : [ {
......@@ -144,8 +141,22 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "floatingRate"
"_type" : "func",
"function" : "times",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "calculationAmount"
}, {
"_type" : "var",
"name" : "floatingRate"
} ]
} ]
}, {
"_type" : "func",
"function" : "toOne",
......
......@@ -75,7 +75,7 @@
"function" : "divide",
"parameters" : [ {
"_type" : "func",
"function" : "times",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -83,11 +83,8 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "cashOrSecurityValue"
}, {
"_type" : "func",
"function" : "minus",
"function" : "times",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -96,12 +93,15 @@
},
"values" : [ {
"_type" : "var",
"name" : "valuationPercentage"
"name" : "cashOrSecurityValue"
}, {
"_type" : "var",
"name" : "fxHaircutPercentage"
"name" : "valuationPercentage"
} ]
} ]
}, {
"_type" : "var",
"name" : "fxHaircutPercentage"
} ]
} ]
}, {
......
......@@ -214,7 +214,7 @@
"function" : "divide",
"parameters" : [ {
"_type" : "func",
"function" : "plus",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -223,7 +223,7 @@
},
"values" : [ {
"_type" : "func",
"function" : "times",
"function" : "plus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -232,7 +232,7 @@
},
"values" : [ {
"_type" : "func",
"function" : "plus",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -249,15 +249,8 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 360 ]
}, {
"_type" : "func",
"function" : "minus",
"function" : "plus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -265,60 +258,67 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endYear"
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "func",
"function" : "times",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 360 ]
}, {
"_type" : "var",
"name" : "endYear"
} ]
} ]
}, {
"_type" : "var",
"name" : "startYear"
} ]
} ]
}, {
"_type" : "var",
"name" : "startYear"
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 30 ]
} ]
} ]
}, {
"_type" : "var",
"name" : "endMonth"
} ]
} ]
}, {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 30 ]
} ]
} ]
}, {
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endMonth"
}, {
"_type" : "var",
"name" : "startMonth"
} ]
} ]
} ]
} ]
}, {
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endDay"
}, {
"_type" : "var",
"name" : "startDay"
"name" : "endDay"
} ]
} ]
}, {
"_type" : "var",
"name" : "startDay"
} ]
} ]
}, {
......
......@@ -73,7 +73,7 @@
"values" : [ "startDateIsInLeapYear" ]
}, {
"_type" : "func",
"function" : "cdm::functions::natives::isLeap",
"function" : "cdm::functions::native::isLeap",
"parameters" : [ {
"_type" : "func",
"function" : "year",
......@@ -99,7 +99,7 @@
"values" : [ "endDateIsInLeapYear" ]
}, {
"_type" : "func",
"function" : "cdm::functions::natives::isLeap",
"function" : "cdm::functions::native::isLeap",
"parameters" : [ {
"_type" : "func",
"function" : "year",
......@@ -618,7 +618,7 @@
"function" : "divide",
"parameters" : [ {
"_type" : "func",
"function" : "plus",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -627,7 +627,7 @@
},
"values" : [ {
"_type" : "func",
"function" : "times",
"function" : "plus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -636,7 +636,7 @@
},
"values" : [ {
"_type" : "func",
"function" : "plus",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -653,15 +653,8 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 360 ]
}, {
"_type" : "func",
"function" : "minus",
"function" : "plus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -669,60 +662,67 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endYear"
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "func",
"function" : "times",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 360 ]
}, {
"_type" : "var",
"name" : "endYear"
} ]
} ]
}, {
"_type" : "var",
"name" : "startYear"
} ]
} ]
}, {
"_type" : "var",
"name" : "startYear"
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 30 ]
} ]
} ]
}, {
"_type" : "var",
"name" : "endMonth"
} ]
} ]
}, {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 30 ]
} ]
} ]
}, {
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endMonth"
}, {
"_type" : "var",
"name" : "startMonth"
} ]
} ]
} ]
} ]
}, {
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endDay"
}, {
"_type" : "var",
"name" : "startDay"
"name" : "endDay"
} ]
} ]
}, {
"_type" : "var",
"name" : "startDay"
} ]
} ]
}, {
......
......@@ -259,7 +259,7 @@
"function" : "divide",
"parameters" : [ {
"_type" : "func",
"function" : "plus",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -268,7 +268,7 @@
},
"values" : [ {
"_type" : "func",
"function" : "times",
"function" : "plus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -277,7 +277,7 @@
},
"values" : [ {
"_type" : "func",
"function" : "plus",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -294,15 +294,8 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 360 ]
}, {
"_type" : "func",
"function" : "minus",
"function" : "plus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
......@@ -310,60 +303,67 @@
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endYear"
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "func",
"function" : "times",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 360 ]
}, {
"_type" : "var",
"name" : "endYear"
} ]
} ]
}, {
"_type" : "var",
"name" : "startYear"
} ]
} ]
}, {
"_type" : "var",
"name" : "startYear"
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 30 ]
} ]
} ]
}, {
"_type" : "var",
"name" : "endMonth"
} ]
} ]
}, {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 30 ]
} ]
} ]
}, {
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endMonth"
}, {
"_type" : "var",
"name" : "startMonth"
} ]
} ]
} ]
} ]
}, {
"_type" : "func",
"function" : "minus",
"parameters" : [ {
"_type" : "collection",
"multiplicity" : {
"lowerBound" : 2,
"upperBound" : 2
},
"values" : [ {
"_type" : "var",
"name" : "endDay"
}, {
"_type" : "var",
"name" : "startDay"
"name" : "endDay"
} ]
} ]
}, {
"_type" : "var",
"name" : "startDay"
} ]
} ]
}, {
......
......@@ -7,7 +7,7 @@
"name" : "portfolio"
} ],
"name" : "EvaluatePortfolioState",
"package" : "cdm::functions::natives",
"package" : "cdm::functions::native",
"parameters" : [ {
"_type" : "var",
"class" : "cdm::model::Portfolio",
......
......@@ -11,7 +11,7 @@
"values" : [ false ]
} ],
"name" : "FpmlIrd8",
"package" : "cdm::functions::natives",
"package" : "cdm::functions::native",
"parameters" : [ {
"_type" : "var",
"class" : "cdm::model::TradableProduct",
......
......@@ -7,7 +7,7 @@
"name" : "contractualProduct"
} ],
"name" : "ResolveContractualProduct",
"package" : "cdm::functions::natives",
"package" : "cdm::functions::native",
"parameters" : [ {
"_type" : "var",
"class" : "cdm::model::ContractualProduct",
......
......@@ -44,7 +44,7 @@
} ]
} ],
"name" : "ResolvePayoutQuantity",
"package" : "cdm::functions::natives",
"package" : "cdm::functions::native",
"parameters" : [ {
"_type" : "var",
"class" : "cdm::model::ResolvablePayoutQuantity",
......
......@@ -44,7 +44,7 @@
} ]
} ],
"name" : "ResolveQuantity",
"package" : "cdm::functions::natives",
"package" : "cdm::functions::native",
"parameters" : [ {
"_type" : "var",
"class" : "cdm::model::ResolvablePayoutQuantity",
......
......@@ -11,7 +11,7 @@
"values" : [ false ]
} ],
"name" : "isLeap",
"package" : "cdm::functions::natives",
"package" : "cdm::functions::native",
"parameters" : [ {
"_type" : "var",
"class" : "Integer",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment