Old develop to Main (#152)

Systemorph · Dec 22, 2022 · d0d8b61 · d0d8b61
2 parents ea6c6df + 6bb3207
commit d0d8b61
Show file tree

Hide file tree

Showing 18 changed files with 905 additions and 185 deletions.
diff --git a/ifrs17-template/Initialization/InitSystemorphRefDataToMemory.ipynb b/ifrs17-template/Initialization/InitSystemorphRefDataToMemory.ipynb
@@ -154,7 +154,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/YieldCurve.csv\").WithType<YieldCurve>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/YieldCurve.csv\").WithType<YieldCurve>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -163,7 +163,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/ExchangeRate.csv\").WithType<ExchangeRate>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/ExchangeRate.csv\").WithType<ExchangeRate>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -172,7 +172,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/PartnerRating.csv\").WithType<PartnerRating>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/PartnerRating.csv\").WithType<PartnerRating>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -181,7 +181,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/CreditDefaultRate.csv\").WithType<CreditDefaultRate>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/CreditDefaultRate.csv\").WithType<CreditDefaultRate>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,

diff --git a/ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb b/ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb
@@ -123,7 +123,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/YieldCurve.csv\").WithType<YieldCurve>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/YieldCurve.csv\").WithType<YieldCurve>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -132,7 +132,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/ExchangeRate.csv\").WithType<ExchangeRate>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/ExchangeRate.csv\").WithType<ExchangeRate>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -141,7 +141,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/PartnerRating.csv\").WithType<PartnerRating>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/PartnerRating.csv\").WithType<PartnerRating>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -150,7 +150,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"../Files/Parameters/CreditDefaultRate.csv\").WithType<CreditDefaultRate>().SnapshotMode().WithTarget(DataSource).ExecuteAsync()"
+                "await Import.FromFile(\"../Files/Parameters/CreditDefaultRate.csv\").WithType<CreditDefaultRate>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,

diff --git a/ifrs17-template/Test/AocStructureTest.ipynb b/ifrs17-template/Test/AocStructureTest.ipynb
@@ -94,12 +94,13 @@
         {
             "cell_type": "code",
             "source": [
-                "public async Task CheckAocStepStructureAsync(IEnumerable<BaseDataRecord> inputVariables, ",
+                "public async Task<ActivityLog> CheckAocStepStructureAsync(IEnumerable<BaseDataRecord> inputVariables, ",
                 "\n                                             Dictionary<AocStep,IEnumerable<AocStep>> parentBm, ",
                 "\n                                             Dictionary<AocStep,AocStep> referenceBm, ",
                 "\n                                             Dictionary<AocStep,IEnumerable<AocStep>> fullAocBm,",
                 "\n                                             Dictionary<AocStep,IEnumerable<AocStep>> parentBmCdr = null)",
                 "\n{",
+                "\n    Activity.Start();",
                 "\n    //Save test input data",
                 "\n    var importFormat = ImportFormats.Cashflow;",
                 "\n    var inputSource = InputSource.Cashflow;",
@@ -232,6 +233,7 @@
                 "\n    }",
                 "\n    ",
                 "\n    if(errors.Any()) ApplicationMessage.Log(Error.Generic, string.Join(\"\\n\", errors));",
+                "\n    return Activity.Finish();",
                 "\n}",
                 "\n"
             ],
@@ -502,7 +504,17 @@
         {
             "cell_type": "code",
             "source": [
-                "await CheckAocStepStructureAsync(inputRawVariables, parentBm, referenceBm, fullAocBm, parentBm_CDR)"
+                "var activity = await CheckAocStepStructureAsync(inputRawVariables, parentBm, referenceBm, fullAocBm, parentBm_CDR);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -604,7 +616,17 @@
         {
             "cell_type": "code",
             "source": [
-                "await CheckAocStepStructureAsync(inputRawVariables, parentBm, referenceBm, fullAocBm)"
+                "var activity = await CheckAocStepStructureAsync(inputRawVariables, parentBm, referenceBm, fullAocBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -679,7 +701,17 @@
         {
             "cell_type": "code",
             "source": [
-                "await CheckAocStepStructureAsync(inputIfrsVariables, parentBm, referenceBm, fullAocBm)"
+                "var activity = await CheckAocStepStructureAsync(inputIfrsVariables, parentBm, referenceBm, fullAocBm);",
+                "\nactivity"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "activity.Status.Should().Be(ActivityLogStatus.Succeeded);"
             ],
             "metadata": {},
             "execution_count": 0,