Commit 287c9f9c authored by Vijayesh Chandel's avatar Vijayesh Chandel

syncing with workspace from studio [potentially affected 3 entities]

parent 6d88d82f
......@@ -3,28 +3,6 @@
"content" : {
"_type" : "diagram",
"classViews" : [ {
"class" : "cdm::model::OptionFeature",
"id" : "088ff0c5-81ef-44ff-aa49-7f41c60364d7",
"position" : {
"x" : 46.000003814697266,
"y" : 167.80560302734375
},
"rectangle" : {
"height" : 114,
"width" : 220.51904296875
}
}, {
"class" : "cdm::model::OptionStrike",
"id" : "cbe90df4-84e5-482d-9056-549b13c8922b",
"position" : {
"x" : 531.0000038146973,
"y" : 131.7882080078125
},
"rectangle" : {
"height" : 128,
"width" : 276.78125
}
}, {
"class" : "cdm::model::OptionExercise",
"id" : "690d6987-ecf3-450b-b828-2e73dc7791c5",
"position" : {
......@@ -57,6 +35,28 @@
"height" : 114,
"width" : 320.89404296875
}
}, {
"class" : "cdm::model::OptionStrike",
"id" : "cbe90df4-84e5-482d-9056-549b13c8922b",
"position" : {
"x" : 531.0000038146973,
"y" : 131.7882080078125
},
"rectangle" : {
"height" : 128,
"width" : 276.78125
}
}, {
"class" : "cdm::model::OptionFeature",
"id" : "088ff0c5-81ef-44ff-aa49-7f41c60364d7",
"position" : {
"x" : 46.000003814697266,
"y" : 167.80560302734375
},
"rectangle" : {
"height" : 114,
"width" : 220.51904296875
}
} ],
"generalizationViews" : [ ],
"name" : "AveragingModelDiagram",
......
......@@ -228,15 +228,15 @@
"tests" : [ {
"assert" : {
"_type" : "expectedOutputMappingTestAssert",
"expectedOutput" : "{\"defects\":[],\"value\":{\"calcMethod\":\"Harmonic\",\"currency1\":\"currency1 57\",\"currency2\":\"currency2 85\",\"date\":[\"2020-10-19\"],\"infoSource\":\"sourcePageHeading 75\",\"time\":\"2020-11-11T07:11:20\",\"precision\":69,\"weight\":[82.31]},\"source\":{\"defects\":[],\"value\":{\"calculationMethod\":\"Harmonic\",\"fxRateObservable\":{\"quotedCurrencyPair\":{\"currency1\":\"currency1 57\",\"currency2\":\"currency2 85\"},\"primaryFxSpotRateSource\":{\"sourcePageHeading\":\"sourcePageHeading 75\"}},\"observationTime\":{\"hourMinuteTime\":\"2020-11-11T07:11:20\"},\"precision\":{\"precision\":69},\"observationDates\":{\"observationSchedule\":[{\"date\":{\"unadjustedDate\":\"2020-08-24\",\"dateAdjustments\":null,\"adjustedDate\":\"2020-10-19\"},\"weight\":82.31,\"observationNumber\":57}]}},\"source\":{\"number\":1,\"record\":\"{\\\"calculationMethod\\\":\\\"Harmonic\\\",\\\"precision\\\":{\\\"roundingDirection\\\":\\\"Up\\\",\\\"precision\\\":69},\\\"observationTime\\\":{\\\"hourMinuteTime\\\":\\\"2020-11-11T07:11:20\\\",\\\"businessCenter\\\":\\\"BOLP\\\"},\\\"observationDates\\\":{\\\"observationSchedule\\\":[{\\\"date\\\":{\\\"unadjustedDate\\\":\\\"2020-08-24\\\",\\\"adjustedDate\\\":\\\"2020-10-19\\\"},\\\"weight\\\":82.31,\\\"observationNumber\\\":57}],\\\"parametricSchedule\\\":{\\\"startDate\\\":{},\\\"endDate\\\":{},\\\"periodFrequency\\\":{\\\"periodMultiplier\\\":28,\\\"period\\\":\\\"D\\\",\\\"rollConvention\\\":\\\"MON\\\"},\\\"periodDatesAdjustments\\\":{\\\"businessDayConvention\\\":\\\"MODPRECEDING\\\"}}},\\\"fxRateObservable\\\":{\\\"quotedCurrencyPair\\\":{\\\"currency1\\\":\\\"currency1 57\\\",\\\"currency2\\\":\\\"currency2 85\\\",\\\"quoteBasis\\\":\\\"Currency1PerCurrency2\\\"},\\\"primaryFxSpotRateSource\\\":{\\\"sourceProvider\\\":\\\"BankOfCanada\\\",\\\"sourcePage\\\":\\\"sourcePage 84\\\",\\\"sourcePageHeading\\\":\\\"sourcePageHeading 75\\\"},\\\"secondaryFxSpotRateSource\\\":{\\\"sourceProvider\\\":\\\"SAFEX\\\",\\\"sourcePage\\\":\\\"sourcePage 77\\\",\\\"sourcePageHeading\\\":\\\"sourcePageHeading 7\\\"}}}\"}}}"
"expectedOutput" : "{\"defects\":[],\"value\":{\"calcMethod\":\"Geometric\",\"currency1\":\"currency1 95\",\"currency2\":\"currency2 39\",\"date\":[\"2020-11-12\"],\"infoSource\":\"sourcePageHeading 83\",\"precision\":5,\"time\":\"2020-10-30T00:09:17\",\"weight\":[47.08]},\"source\":{\"defects\":[],\"value\":{\"calculationMethod\":\"Geometric\",\"fxRateObservable\":{\"quotedCurrencyPair\":{\"currency1\":\"currency1 95\",\"currency2\":\"currency2 39\"},\"primaryFxSpotRateSource\":{\"sourcePageHeading\":\"sourcePageHeading 83\"}},\"precision\":{\"precision\":5},\"observationTime\":{\"hourMinuteTime\":\"2020-10-30T00:09:17\"},\"observationDates\":{\"observationSchedule\":[{\"date\":{\"unadjustedDate\":\"2020-10-18\",\"dateAdjustments\":null,\"adjustedDate\":\"2020-11-12\"},\"weight\":47.08}]}},\"source\":{\"number\":1,\"record\":\"{\\\"calculationMethod\\\":\\\"Geometric\\\",\\\"precision\\\":{\\\"roundingDirection\\\":\\\"Nearest\\\",\\\"precision\\\":5},\\\"observationTime\\\":{\\\"hourMinuteTime\\\":\\\"2020-10-30T00:09:17\\\",\\\"businessCenter\\\":\\\"USGS\\\"},\\\"observationDates\\\":{\\\"observationSchedule\\\":[{\\\"date\\\":{\\\"unadjustedDate\\\":\\\"2020-10-18\\\",\\\"adjustedDate\\\":\\\"2020-11-12\\\"},\\\"weight\\\":47.08,\\\"observationReference\\\":\\\"observationReference 44\\\"}],\\\"parametricSchedule\\\":{\\\"startDate\\\":{},\\\"endDate\\\":{},\\\"periodFrequency\\\":{\\\"periodMultiplier\\\":12,\\\"period\\\":\\\"D\\\",\\\"rollConvention\\\":\\\"_9\\\"},\\\"periodDatesAdjustments\\\":{\\\"businessDayConvention\\\":\\\"MODPRECEDING\\\"}}},\\\"fxRateObservable\\\":{\\\"quotedCurrencyPair\\\":{\\\"currency1\\\":\\\"currency1 95\\\",\\\"currency2\\\":\\\"currency2 39\\\",\\\"quoteBasis\\\":\\\"Currency1PerCurrency2\\\"},\\\"primaryFxSpotRateSource\\\":{\\\"sourceProvider\\\":\\\"Other\\\",\\\"sourcePage\\\":\\\"sourcePage 37\\\",\\\"sourcePageHeading\\\":\\\"sourcePageHeading 83\\\"},\\\"secondaryFxSpotRateSource\\\":{\\\"sourceProvider\\\":\\\"FHLBSF\\\",\\\"sourcePage\\\":\\\"sourcePage 36\\\",\\\"sourcePageHeading\\\":\\\"sourcePageHeading 82\\\"}}}\"}}}"
},
"inputData" : [ {
"_type" : "object",
"data" : "{\"calculationMethod\":\"Harmonic\",\"precision\":{\"roundingDirection\":\"Up\",\"precision\":69},\"observationTime\":{\"hourMinuteTime\":\"2020-11-11T07:11:20\",\"businessCenter\":\"BOLP\"},\"observationDates\":{\"observationSchedule\":[{\"date\":{\"unadjustedDate\":\"2020-08-24\",\"adjustedDate\":\"2020-10-19\"},\"weight\":82.31,\"observationNumber\":57}],\"parametricSchedule\":{\"startDate\":{},\"endDate\":{},\"periodFrequency\":{\"periodMultiplier\":28,\"period\":\"D\",\"rollConvention\":\"MON\"},\"periodDatesAdjustments\":{\"businessDayConvention\":\"MODPRECEDING\"}}},\"fxRateObservable\":{\"quotedCurrencyPair\":{\"currency1\":\"currency1 57\",\"currency2\":\"currency2 85\",\"quoteBasis\":\"Currency1PerCurrency2\"},\"primaryFxSpotRateSource\":{\"sourceProvider\":\"BankOfCanada\",\"sourcePage\":\"sourcePage 84\",\"sourcePageHeading\":\"sourcePageHeading 75\"},\"secondaryFxSpotRateSource\":{\"sourceProvider\":\"SAFEX\",\"sourcePage\":\"sourcePage 77\",\"sourcePageHeading\":\"sourcePageHeading 7\"}}}",
"data" : "{\"calculationMethod\":\"Geometric\",\"precision\":{\"roundingDirection\":\"Nearest\",\"precision\":5},\"observationTime\":{\"hourMinuteTime\":\"2020-10-30T00:09:17\",\"businessCenter\":\"USGS\"},\"observationDates\":{\"observationSchedule\":[{\"date\":{\"unadjustedDate\":\"2020-10-18\",\"adjustedDate\":\"2020-11-12\"},\"weight\":47.08,\"observationReference\":\"observationReference 44\"}],\"parametricSchedule\":{\"startDate\":{},\"endDate\":{},\"periodFrequency\":{\"periodMultiplier\":12,\"period\":\"D\",\"rollConvention\":\"_9\"},\"periodDatesAdjustments\":{\"businessDayConvention\":\"MODPRECEDING\"}}},\"fxRateObservable\":{\"quotedCurrencyPair\":{\"currency1\":\"currency1 95\",\"currency2\":\"currency2 39\",\"quoteBasis\":\"Currency1PerCurrency2\"},\"primaryFxSpotRateSource\":{\"sourceProvider\":\"Other\",\"sourcePage\":\"sourcePage 37\",\"sourcePageHeading\":\"sourcePageHeading 83\"},\"secondaryFxSpotRateSource\":{\"sourceProvider\":\"FHLBSF\",\"sourcePage\":\"sourcePage 36\",\"sourcePageHeading\":\"sourcePageHeading 82\"}}}",
"inputType" : "JSON",
"sourceClass" : "cdm::model::AveragingObservation"
} ],
"name" : "AveragingModel_Testing",
"name" : "AveragingModel_Test",
"query" : {
"_type" : "lambda",
"body" : [ {
......@@ -283,12 +283,12 @@
}, {
"_type" : "propertyGraphFetchTree",
"parameters" : [ ],
"property" : "time",
"property" : "precision",
"subTrees" : [ ]
}, {
"_type" : "propertyGraphFetchTree",
"parameters" : [ ],
"property" : "precision",
"property" : "time",
"subTrees" : [ ]
}, {
"_type" : "propertyGraphFetchTree",
......@@ -328,12 +328,12 @@
}, {
"_type" : "propertyGraphFetchTree",
"parameters" : [ ],
"property" : "time",
"property" : "precision",
"subTrees" : [ ]
}, {
"_type" : "propertyGraphFetchTree",
"parameters" : [ ],
"property" : "precision",
"property" : "time",
"subTrees" : [ ]
}, {
"_type" : "propertyGraphFetchTree",
......
......@@ -2,62 +2,6 @@
"classifierPath" : "meta::pure::metamodel::type::Class",
"content" : {
"_type" : "class",
"constraints" : [ {
"functionDefinition" : {
"_type" : "lambda",
"body" : [ {
"_type" : "func",
"function" : "if",
"parameters" : [ {
"_type" : "func",
"function" : "isNotEmpty",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "observationNumber"
} ]
}, {
"_type" : "lambda",
"body" : [ {
"_type" : "func",
"function" : "greaterThanEqual",
"parameters" : [ {
"_type" : "property",
"parameters" : [ {
"_type" : "var",
"name" : "this"
} ],
"property" : "observationNumber"
}, {
"_type" : "integer",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ 0 ]
} ]
} ],
"parameters" : [ ]
}, {
"_type" : "lambda",
"body" : [ {
"_type" : "boolean",
"multiplicity" : {
"lowerBound" : 1,
"upperBound" : 1
},
"values" : [ true ]
} ],
"parameters" : [ ]
} ]
} ],
"parameters" : [ ]
},
"name" : "WeightedAveragingObservation_observationNumber"
} ],
"name" : "ObservationSchedule",
"package" : "cdm::model",
"properties" : [ {
......@@ -93,7 +37,7 @@
"lowerBound" : 0,
"upperBound" : 1
},
"name" : "observationNumber",
"name" : "observationReference",
"taggedValues" : [ {
"tag" : {
"profile" : "meta::pure::profiles::doc",
......@@ -101,7 +45,7 @@
},
"value" : "Reference for an observation."
} ],
"type" : "Integer"
"type" : "String"
} ]
}
}
\ No newline at end of file
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