-
Notifications
You must be signed in to change notification settings - Fork 9
Scenario for parameters #75
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
154 commits
Select commit
Hold shift + click to select a range
6d7c59e
base code
dcolleoni 1f545cd
correct broken links
dcolleoni 2a4db13
Merge pull request #29 from Systemorph/importCeProject
dcolleoni fdbe77c
fixed Opening re-import
sbusato 61d4332
Merge pull request #31 from Systemorph/OpeningImporterBug
sbusato 6adb68e
Rename "PvBase" to "PresentValue" (#32)
nnikolopoulos 2c0cc65
include new default spaces
sbusato c3c0bcb
Merge pull request #36 from Systemorph/CleanUpNotebooksSpaces
sbusato 95c90f9
reorder global metadata using alphabetical order
sbusato 7cb299a
Merge pull request #37 from Systemorph/ReorderGlobalMetadata
sbusato fc7816f
Break utils nb (#33)
dcolleoni 9d1844a
Including FX positions to FP scope
sbusato ae5cbac
Merge remote-tracking branch 'origin/develop' into FXinPl
sbusato d171be7
FP specification nb - add FX aoc step
sbusato 18fde56
Merge pull request #38 from Systemorph/FXinPl
dcolleoni 2695c4e
Rename calculation type with estimate type (#34)
nnikolopoulos 56fded2
new data node factory
9b77b4f
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
74a381b
metadata
10ef85f
metadata x2
28fd4f9
metadata x3
4a6c946
implement feedback
9ddbe58
Merge pull request #40 from Systemorph/defaultsStateParameters
amuolo 260b872
split directories
dcolleoni 5b072d7
fix tests + add readme + seperate overview nb
dcolleoni c24a558
include changes on factory
dcolleoni d2ad559
Merge remote-tracking branch 'origin/develop' into ExtractDataProject
dcolleoni 4f6f4cb
Merge pull request #42 from Systemorph/ExtractDataProject
dcolleoni 92f6876
adapt to the split
4f178e2
still not working properly
calderinisystemorph 44412fa
code cleanup
calderinisystemorph d98b701
new file creation
calderinisystemorph 005f28f
update packages and fix csm with bm
dcolleoni 446edd0
Merge pull request #44 from Systemorph/UpdatePackageAndFixCsm
dcolleoni 49a3b6f
approaching
bf8c098
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
59e5ca0
better
c6513da
testing ifrsvariables
calderinisystemorph fc000a1
Merge remote-tracking branch 'origin/develop' into Multiple_Scenario_…
calderinisystemorph efd06dc
implement feedback
886ec68
final feedback
7b8850b
fix
34a97cf
const version ce
9951430
Merge pull request #43 from Systemorph/defaultAocConfig
amuolo 26970b4
testing IfrsVariables calculations
calderinisystemorph fa2154c
Merge remote-tracking branch 'origin/develop' into Multiple_Scenario_…
calderinisystemorph d304e3d
new partition added
calderinisystemorph ad47b3e
implementing new test
calderinisystemorph 254a97e
test cleaned
calderinisystemorph 016fac7
Update links (#51)
dcolleoni 546ae04
removal arithmetics
c26697d
testing queries
calderinisystemorph 5a1fc85
Merge remote-tracking branch 'origin/develop' into Multiple_Scenario_…
calderinisystemorph 95ccbb2
Simple value test data (#54)
03c35bf
reset consts
b8d6e88
implement feedback part 1
3a07d9a
Overview texts (#53)
UMueller1 2312bcb
finalized + hot fixes
22bd497
ReportGridOptions
dcolleoni 193c066
checking multiple import of the same scenario
calderinisystemorph 54c5327
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
5a143ff
final fixes and feedback implementations
a6ee353
Merge pull request #55 from Systemorph/removalArithmetic
amuolo 4ca1bd3
dynamic problems solved
calderinisystemorph 1a0647b
Merge remote-tracking branch 'origin/develop' into Multiple_Scenario_…
calderinisystemorph dfbc6b9
fixing aoctype for scenario
calderinisystemorph a864f0f
Interactive reports (#58)
dcolleoni b78b36a
test for actualsr
calderinisystemorph 0e880bf
Merge remote-tracking branch 'origin/develop' into Multiple_Scenario_…
calderinisystemorph e614d1a
code cleanup
calderinisystemorph ca009df
New format design in importers (#62)
nnikolopoulos fa5563f
import yield curve trigger calculations
calderinisystemorph d597a30
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph 0c0821c
forward
7a4f464
Package update (#65)
dcolleoni dcac721
cleanups
07b3244
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
d62dc98
Fixing AA and OA opening and benchmark simple importer (#57)
372dcb6
much better
091b4df
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
eb04b4d
implemented
10dcfc8
Aggregate by in report variable (#67)
sbusato ab1ddaa
Clean up doc (#71)
dcolleoni 1c0cbe5
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph a79e1d6
Merge remote-tracking branch 'origin/Multiple_Scenario_Implementation…
calderinisystemorph fae9b83
implement feedback
21d1b45
Merge pull request #72 from Systemorph/NoMorePartitions
amuolo 7f507ef
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
47bdcc3
code cleanup after merging
calderinisystemorph 6bb0243
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph 8bddd27
cleanups
77987a9
Merge remote-tracking branch 'origin/Multiple_Scenario_Implementation…
calderinisystemorph 3cb6ee8
cleanups x2
b915eb5
new importer for yield curve
calderinisystemorph 68b7699
Merge remote-tracking branch 'origin/Multiple_Scenario_Implementation…
calderinisystemorph 1b5cbe3
importer cleanup
calderinisystemorph bf0c9c7
fixes needed after merge
fd7cfbf
all tests are green
fa36959
implement feedback
98885ad
Doc cleanup2 (#76)
dcolleoni 7bbd235
importer for yieldcurve improved
calderinisystemorph ace44c8
implement all feedbacks
85a6761
Merge pull request #45 from Systemorph/Multiple_Scenario_Implementation
amuolo ad2384a
yield importer fails to initialize importstorage
calderinisystemorph 6448259
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph 2cc046d
packages + withGridOption + await HierarchyCache init (#83)
dcolleoni f7a3696
Change in ReportMutableScopes NB (#85)
nnikolopoulos 768bc41
changes in datamodel
calderinisystemorph a546177
New metadata (#87)
nnikolopoulos 8bb4648
Rename pv amount type (#88)
nnikolopoulos 2e2431b
New metadatax2 (#91)
nnikolopoulos f91efb1
Signs and actuals (#77)
2b4a8fd
importer written
calderinisystemorph b10821a
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph 835f304
fixing json errors
calderinisystemorph ee53bfd
fix more json errors
pkunszt dd017f5
YC importer cleanup
calderinisystemorph d8f1240
Present value series (#70)
tkukuljan 8c55a01
Update Reports.ipynb (#96)
amuolo fe7d4ad
code clean up
calderinisystemorph 0440457
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph b328759
New packages, tested at *STAGE* (17/11/2022) (#93)
nnikolopoulos b0cc7ac
Add a comma (#97)
nnikolopoulos 808061a
code allignment with dev
calderinisystemorph 8032682
Improve doc (#92)
dcolleoni 9a19cb9
refactor of importer
calderinisystemorph 02a47ed
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph 760fb71
updated links (#101)
amuolo eea6596
Implement Disposable Workspace in all Importers (#100)
tkukuljan 53b8ded
test improved
calderinisystemorph 1f6f60b
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph 045a255
Reorganising importers (#104)
tkukuljan f886f2f
code cleanup
calderinisystemorph 6b0462e
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph 8192c48
new importer for yield curve
calderinisystemorph d7ca8ec
removing full-template
calderinisystemorph e9faa9f
present value reset to develop
calderinisystemorph 6bb4a16
reset to develop
calderinisystemorph 8197ee1
reset to develop
calderinisystemorph af579df
reset changes from wrong merge
calderinisystemorph 4c75b0e
tests added again
calderinisystemorph 91c45a4
reset merging conflit errors
calderinisystemorph 20520a4
fixing importers noteboook
calderinisystemorph 398bd27
fixing importer merging errors
calderinisystemorph 4949f37
fixing importers
calderinisystemorph f4b43d3
merging conflicts fixed
calderinisystemorph 5e619f6
equality comparer and queries updated
calderinisystemorph 36db29e
data model, importers and importstorage updated
calderinisystemorph 270c126
scenario avalinade for datanodes
calderinisystemorph ce3298e
scenario test improved
calderinisystemorph 98720e6
Merge remote-tracking branch 'origin/develop' into Scenario_for_param…
calderinisystemorph dea3833
Merge branch 'Importer_Scenario_Cashflow_Actuals' into Scenario_for_p…
calderinisystemorph 6c0f95d
preliminary files updated
calderinisystemorph ad05d06
new format implemented
calderinisystemorph File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @@Main | ||
| Year,Month,Scenario | ||
| 2020,1, | ||
| @@YieldCurve | ||
| Currency,Values0,Values1,Values2,Values3 | ||
| USD,0.002,0.002,0.002,0.002 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @@Main | ||
| Year,Month,Scenario | ||
| 2020,12, | ||
| @@YieldCurve | ||
| Currency,Values0,Values1,Values2,Values3 | ||
| USD,0.002,0.002,0.002,0.002 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| @@Main | ||
| Year,Month,Scenario | ||
| 2020,3, | ||
| @@YieldCurve | ||
| Currency,Values0,Values1,Values2,Values3 | ||
| EUR,0.008685495,0.008685495,0.018498471,0.019966839 | ||
| CHF,0.002,0.002,0.002,0.002 | ||
| USD,0.002,0.002,0.002,0.002 | ||
| GBP,0.002,0.002,0.002,0.002 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| @@Main | ||
| Year,Month,Scenario | ||
| 2021,3, | ||
| @@YieldCurve | ||
| Currency,Values0,Values1,Values2,Values3 | ||
| CHF,0.1,0.1,0.1,0.1 | ||
| USD,0.005,0.005,0.005,0.005 | ||
| GBP,0.005,0.005,0.005,0.005 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| { | ||
| "metadata": { | ||
| "authors": [], | ||
| "kernelspec": { | ||
| "display_name": "Formula Framework", | ||
| "language": "C#", | ||
| "name": "C#" | ||
| }, | ||
| "language_info": { | ||
| "file_extension": ".cs", | ||
| "mimetype": "text/plain", | ||
| "name": "C#" | ||
| } | ||
| }, | ||
| "nbformat": 4, | ||
| "nbformat_minor": 5, | ||
| "cells": [ | ||
| { | ||
| "cell_type": "markdown", | ||
| "source": [ | ||
| "# Context" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "#!eval-notebook \"../Initialization/InitSystemorphToMemory\"" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "Workspace.Reset(x => x.ResetInitializationRules().ResetCurrentPartitions());", | ||
| "\nWorkspace.Initialize(x => x.FromSource(DataSource));", | ||
| "\nvar defaultVarsBE = Workspace.Query<IfrsVariable>();" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "markdown", | ||
| "source": [ | ||
| "# Yield Curve Scenario" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "var yieldCurve = @\"", | ||
| "\n@@YieldCurve", | ||
| "\nCurrency,Year,Month,Scenario,Values0,Values1,Values2,Values3", | ||
| "\nEUR,2020,3,,0.008685495,0.008685495,0.018498471,0.019966839", | ||
| "\nCHF,2020,3,,0.002,0.002,0.002,0.002", | ||
| "\nCHF,2021,3,,0.1,0.1,0.1,0.1", | ||
| "\nUSD,2021,3,,0.005,0.005,0.005,0.005", | ||
| "\nUSD,2020,12,,0.002,0.002,0.002,0.002", | ||
| "\nUSD,2020,3,,0.002,0.002,0.002,0.002", | ||
| "\nUSD,2020,1,,0.002,0.002,0.002,0.002", | ||
| "\nEUR,2018,3,MTUP10pct,0.009554045,0.009554045,0.020348318,0.021963523", | ||
| "\nCHF,2018,3,MTUP10pct,0.0022,0.0022,0.0022,0.0022", | ||
| "\nCHF,2019,3,MTUP10pct,0.11,0.11,0.11,0.11", | ||
| "\nUSD,2019,3,MTUP10pct,0.0055,0.0055,0.0055,0.0055", | ||
| "\nUSD,2018,12,MTUP10pct,0.0022,0.0022,0.0022,0.0022", | ||
| "\nUSD,2018,3,MTUP10pct,0.0022,0.0022,0.0022,0.0022", | ||
| "\nUSD,2018,1,MTUP10pct,0.0022,0.0022,0.0022,0.0022", | ||
| "\nEUR,2020,12,MTUP10pct,0.009554045,0.009554045,0.020348318,0.021963523", | ||
| "\nCHF,2020,12,MTUP10pct,0.0022,0.0022,0.0022,0.0022", | ||
| "\nCHF,2021,3,MTUP10pct,0.11,0.11,0.11,0.11", | ||
| "\nUSD,2021,3,MTUP10pct,0.0055,0.0055,0.0055,0.0055", | ||
| "\nUSD,2020,12,MTUP10pct,0.0022,0.0022,0.0022,0.0022", | ||
| "\nUSD,2020,3,MTUP10pct,0.0022,0.0022,0.0022,0.0022", | ||
| "\nUSD,2020,1,MTUP10pct,0.0022,0.0022,0.0022,0.0022\";" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "var log = await Import.FromString(yieldCurve).WithFormat(ImportFormats.YieldCurve).WithTarget(DataSource).ExecuteAsync();", | ||
| "\nWorkspace.Reset(x => x.ResetInitializationRules().ResetCurrentPartitions());", | ||
| "\nWorkspace.Initialize(x => x.FromSource(DataSource));", | ||
| "\nlog.Warnings.Count().Should().Be(6);" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "markdown", | ||
| "source": [ | ||
| "## Test 2020Q4 with Scenario MTUP10pct" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "log" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "var argsBestEstimate = new ImportArgs (\"CH\",2020, 12, Periodicity.Quarterly, null, ImportFormats.Cashflow);", | ||
| "\nvar defaultPartition = (Guid)(await DataSource.Partition.GetKeyForInstanceAsync<PartitionByReportingNodeAndPeriod>(argsBestEstimate)); ", | ||
| "\n", | ||
| "\nvar scenarioArgs = new ImportArgs (\"CH\",2020, 12, Periodicity.Quarterly, \"MTUP10pct\", ImportFormats.Cashflow);", | ||
| "\nawait Workspace.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(scenarioArgs);", | ||
| "\nawait DataSource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(scenarioArgs);", | ||
| "\nvar diffIfrsVars = Workspace.Query<IfrsVariable>().Except(defaultVarsBE.Where(x => x.Partition == defaultPartition).ToArray(), IfrsVariableComparer.Instance());", | ||
| "\ndiffIfrsVars.ToArray().Length.Should().NotBe(0);" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "markdown", | ||
| "source": [ | ||
| "## Test 2021Q1 with Scenario MTUP10pct" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "var argsBestEstimate = new ImportArgs (\"CH\",2021, 3, Periodicity.Quarterly, null, ImportFormats.Cashflow);", | ||
| "\nvar defaultPartition = (Guid)(await DataSource.Partition.GetKeyForInstanceAsync<PartitionByReportingNodeAndPeriod>(argsBestEstimate)); ", | ||
| "\n", | ||
| "\nvar scenarioArgs = new ImportArgs (\"CH\",2021, 3, Periodicity.Quarterly, \"MTUP10pct\", ImportFormats.Cashflow);", | ||
| "\nawait Workspace.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(scenarioArgs);", | ||
| "\nawait DataSource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(scenarioArgs);", | ||
| "\nvar diffIfrsVars = Workspace.Query<IfrsVariable>().Except(defaultVarsBE.Where(x => x.Partition == defaultPartition).ToArray(), IfrsVariableComparer.Instance());", | ||
| "\ndiffIfrsVars.ToArray().Length.Should().NotBe(0);" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "markdown", | ||
| "source": [ | ||
| "## Robustness: Reimport does not trigger Calculations" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "source": [ | ||
| "var log = await Import.FromString(yieldCurve).WithFormat(ImportFormats.YieldCurve).WithTarget(DataSource).ExecuteAsync();", | ||
| "\nWorkspace.Reset(x => x.ResetInitializationRules().ResetCurrentPartitions());", | ||
| "\nWorkspace.Initialize(x => x.FromSource(DataSource));", | ||
| "\nlog.Warnings.Count().Should().Be(1);" | ||
| ], | ||
| "metadata": {}, | ||
| "execution_count": 0, | ||
| "outputs": [] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove Scenario from Data Node csv files, it should be optional not mandatory. Apply also for all recurrences.