Develop to main (#205)

Systemorph · Jan 30, 2023 · 96cd5f3 · 96cd5f3
2 parents f36d81f + 6443143
commit 96cd5f3
Show file tree

Hide file tree

Showing 35 changed files with 2,090 additions and 486 deletions.
diff --git a/PresentValueSeries/Dimensions.xlsx b/PresentValueSeries/Dimensions.xlsx
diff --git a/PresentValueSeries/InitializeData.ipynb b/PresentValueSeries/InitializeData.ipynb
@@ -40,7 +40,7 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"//ifrs17/v1.0.0/CalculationEngine\""
+                "#!import \"//ifrs17/v1.1.0/CalculationEngine\""
             ],
             "metadata": {},
             "execution_count": 0,

diff --git a/PresentValueSeries/PresentValue - Episode 2.ipynb b/PresentValueSeries/PresentValue - Episode 2.ipynb
@@ -99,7 +99,7 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"//ifrs17/v1.0.0/CalculationEngine\""
+                "#!import \"//ifrs17/v1.1.0/CalculationEngine\""
             ],
             "metadata": {},
             "execution_count": 0,
@@ -168,10 +168,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"YieldCurve.xlsx\")",
-                "\n            .WithType<YieldCurve>()",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"YieldCurve.xlsx\").WithType<YieldCurve>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -180,10 +177,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"Cashflows.xlsx\")",
-                "\n            .WithFormat(\"Cashflow\")",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"Cashflows.xlsx\").WithFormat(\"Cashflow\").WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -507,4 +501,4 @@
             "outputs": []
         }
     ]
-}
+}
diff --git a/PresentValueSeries/PresentValue - Episode 3.ipynb b/PresentValueSeries/PresentValue - Episode 3.ipynb
@@ -99,7 +99,7 @@
         {
             "cell_type": "code",
             "source": [
-                "#!import \"//ifrs17/v1.0.0/CalculationEngine\""
+                "#!import \"//ifrs17/v1.1.0/CalculationEngine\""
             ],
             "metadata": {},
             "execution_count": 0,
@@ -168,10 +168,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"DataNodes_CH.xlsx\")",
-                "\n            .WithFormat(\"DataNode\")",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"DataNodes_CH.xlsx\").WithFormat(\"DataNode\").WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -180,10 +177,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"DataNodes_DE.xlsx\")",
-                "\n            .WithFormat(\"DataNode\")",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"DataNodes_DE.xlsx\").WithFormat(\"DataNode\").WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -192,10 +186,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"YieldCurve.xlsx\")",
-                "\n            .WithType<YieldCurve>()",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"YieldCurve.xlsx\").WithType<YieldCurve>().WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -204,10 +195,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"Cashflows.xlsx\")",
-                "\n            .WithFormat(\"Cashflow\")",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"Cashflows.xlsx\").WithFormat(\"Cashflow\").WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -216,10 +204,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"CF_CH_2021_12.xlsx\")",
-                "\n            .WithFormat(\"Cashflow\")",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"CF_CH_2021_12.xlsx\").WithFormat(\"Cashflow\").WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -228,10 +213,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"CF_DE_2021_12.xlsx\")",
-                "\n            .WithFormat(\"Cashflow\")",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"CF_DE_2021_12.xlsx\").WithFormat(\"Cashflow\").WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,
@@ -240,10 +222,7 @@
         {
             "cell_type": "code",
             "source": [
-                "await Import.FromFile(\"CF_DE_2022_12.xlsx\")",
-                "\n            .WithFormat(\"Cashflow\")",
-                "\n            .WithTarget(DataSource)",
-                "\n            .ExecuteAsync()"
+                "await Import.FromFile(\"CF_DE_2022_12.xlsx\").WithFormat(\"Cashflow\").WithTarget(DataSource).ExecuteAsync()"
             ],
             "metadata": {},
             "execution_count": 0,

diff --git a/ifrs17-template/Constants/CalculationEngine.ipynb b/ifrs17-template/Constants/CalculationEngine.ipynb
@@ -19,7 +19,7 @@
             "cell_type": "code",
             "source": [
                 "var projectName = \"ifrs17\";",
-                "\nvar environmentName = \"v1.0.0\";",
+                "\nvar environmentName = \"v1.1.0\";",
                 "\nvar notebookName = \"CalculationEngine\";",
                 "\nvar calculationEngine = $\"#!import \\\"//{projectName}/{environmentName}/{notebookName}\\\"\";"
             ],

diff --git a/ifrs17-template/Export/MapTemplate.ipynb b/ifrs17-template/Export/MapTemplate.ipynb
@@ -111,7 +111,7 @@
             "source": [
                 "# Map Template: Data Node",
                 "\n",
-                "\n[DataNodes](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#data-node) defines the properties of [Portfolios](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#portfolios) and [Group of Contracts](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#group-of-contracts)."
+                "\n[DataNodes](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#data-node) defines the properties of [Portfolios](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#portfolios) and [Group of Contracts](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#group-of-contracts)."
             ],
             "metadata": {},
             "execution_count": 0,
@@ -167,7 +167,7 @@
             "source": [
                 "# Map Template: Data Node State",
                 "\n",
-                "\n[Data Node State](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#data-node-state) defines whether the instance is active (used in import/output) or inactive (present in the DataSource but not used in input/output operations)."
+                "\n[Data Node State](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#data-node-state) defines whether the instance is active (used in import/output) or inactive (present in the DataSource but not used in input/output operations)."
             ],
             "metadata": {},
             "execution_count": 0,
@@ -253,7 +253,7 @@
             "source": [
                 "# Map Template: Data Node Parameter",
                 "\n",
-                "\n[Data Node Parameters](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#data-node-parameters) are defined at the Group of Contract level and are used during the import calculation. "
+                "\n[Data Node Parameters](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#data-node-parameters) are defined at the Group of Contract level and are used during the import calculation. "
             ],
             "metadata": {},
             "execution_count": 0,

diff --git a/ifrs17-template/Files/Parameters/YieldCurve_2020_1.csv b/ifrs17-template/Files/Parameters/YieldCurve_2020_1.csv
@@ -1,6 +1,6 @@
 @@Main
 Year,Month
-2020,12
+2020,1
 @@YieldCurve
 Currency,Values0,Values1,Values2,Values3
 USD,0.002,0.002,0.002,0.002

diff --git a/ifrs17-template/Files/Parameters/YieldCurve_2020_12.csv b/ifrs17-template/Files/Parameters/YieldCurve_2020_12.csv
@@ -1,6 +1,6 @@
 @@Main
 Year,Month
-2020,1
+2020,12
 @@YieldCurve
 Currency,Values0,Values1,Values2,Values3
 USD,0.002,0.002,0.002,0.002

diff --git a/ifrs17-template/Import/CloseImportTemplate.ipynb b/ifrs17-template/Import/CloseImportTemplate.ipynb
@@ -38,7 +38,7 @@
             "source": [
                 "All imports are triggered via the <code>Import</code> command. Several options can be fluently appended to customize the import action:",
                 "\n- <code>FromFile()</code> : accepts a string as input (eg. \"../Files/TransactionalData/Openings_CH_2020_12.csv\"). It corresponds the file to be imported complete with the path",
-                "\n- <code>WithFormat()</code> : accepts a string as input (eg. \"Cashflow\" or \"Actual\"). It is used to trigger the desired import logic for the current file. Full list of avalaible ImportFormat can be found [here](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/Constants/Consts#import-formats)",
+                "\n- <code>WithFormat()</code> : accepts a string as input (eg. \"Cashflow\" or \"Actual\"). It is used to trigger the desired import logic for the current file. Full list of avalaible ImportFormats can be found [here](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/Constants/Consts#import-formats)",
                 "\n- <code>WithFileStorage()</code> : defined the drive from where the input files is retrieved. In this example we use the project file storage (new files have to be uploaded into the project), other options are SharePoint and OneDrive. ",
                 "\n- <code>WithTarget()</code> : target drive where the results are stored. In this example we use our in-memory set up",
                 "\n"
@@ -88,9 +88,9 @@
                 "\nNew Data Nodes and Parameters are imported here.",
                 "\n<br> To easily generate these files, please refer to the **Map Template** files exported [here](../Export/MapTemplate). Edit them at your wish and import them back into the solution through the following cells. ",
                 "\n<br> For the **ImportFormat**, the following options are expected:",
-                "\n- ImportFormats.DataNode : [Portfolios](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#portfolios) and [Group of Contracts](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#group-of-contracts)",
-                "\n- ImportFormats.DataNodeState : the [state of a data node](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#data-node-state) can be either active or inactive.",
-                "\n- ImportFormats.DataNodeParameter : parameters are described [here](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/DataModel/DataStructure#data-node-parameters). For **Group of Insurance Contracts** a default [Premium Allocation factor](https://portal.systemorph.cloud/project/ifrs17/env/v1.0.0/Import/ImportScopeCalculation#experience-adjustment-on-premium) of 1 is applied if the parameter is not imported.",
+                "\n- ImportFormats.DataNode : [Portfolios](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#portfolios) and [Group of Contracts](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#group-of-contracts)",
+                "\n- ImportFormats.DataNodeState : the [state of a data node](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#data-node-state) can be either active or inactive.",
+                "\n- ImportFormats.DataNodeParameter : parameters are described [here](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/DataModel/DataStructure#data-node-parameters). For **Group of Insurance Contracts** a default [Premium Allocation factor](https://portal.systemorph.cloud/project/ifrs17/env/v1.1.0/Import/ImportScopeCalculation#experience-adjustment-on-premium) of 1 is applied if the parameter is not imported.",
                 "\n"
             ],
             "metadata": {},