Skip to content

Commit

Permalink
Merge pull request #45 from thoutenbos/update_market_data
Browse files Browse the repository at this point in the history
Update market data
  • Loading branch information
nicwortel authored Feb 8, 2024
2 parents a6f2dd0 + 9ddd8fb commit 2651974
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 44 deletions.
2 changes: 1 addition & 1 deletion data/brokers.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
"product": "Zelf Beleggen",
"mutualFundTransactionFee": {
"percentage": 0.12,
"minimum": null,
"minimum": 2.4,
"maximum": 45
},
"etfTransactionFee": {
Expand Down
44 changes: 22 additions & 22 deletions data/indices.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"mid",
"small"
],
"marketCapitalization": 72144376.72,
"marketCapitalization": 75902955.66,
"percentageOfTotalMarketCapitalization": 100,
"factsheet": "https://www.msci.com/documents/10199/4211cc4b-453d-4b0a-a6a7-51d36472a703"
},
Expand All @@ -18,18 +18,18 @@
"large",
"mid"
],
"marketCapitalization": 52988851.48,
"percentageOfTotalMarketCapitalization": 73.44834606535638,
"factsheet": "https://www.msci.com/documents/10199/149ed7bc-316e-4b4c-8ea4-43fcb5bd6523"
"marketCapitalization": 60901628.08,
"percentageOfTotalMarketCapitalization": 80.23617466598138,
"factsheet": "https://www.msci.com/documents/10199/4db922ce-68d2-446d-2f9e-4ed408a9db29"
},
{
"name": "MSCI World Small Cap Index",
"markets": "developed",
"sizes": [
"small"
],
"marketCapitalization": 6599811.99,
"percentageOfTotalMarketCapitalization": 9.148061553867977,
"marketCapitalization": 7114356.14,
"percentageOfTotalMarketCapitalization": 9.372963250427395,
"factsheet": "https://www.msci.com/documents/10199/a67b0d43-0289-4bce-8499-0c102eaa8399"
},
{
Expand All @@ -39,8 +39,8 @@
"large",
"mid"
],
"marketCapitalization": 6761002.48,
"percentageOfTotalMarketCapitalization": 9.371489210087947,
"marketCapitalization": 6736584.18,
"percentageOfTotalMarketCapitalization": 8.87525936430708,
"factsheet": "https://www.msci.com/documents/10199/c0db0a48-01f2-4ba9-ad01-226fd5678111"
},
{
Expand All @@ -51,8 +51,8 @@
"mid",
"small"
],
"marketCapitalization": 7888254.79,
"percentageOfTotalMarketCapitalization": 10.933984253014142,
"marketCapitalization": 7886971.44,
"percentageOfTotalMarketCapitalization": 10.390862083591227,
"factsheet": "https://www.msci.com/documents/10199/97e25eb7-9bd0-4204-bea9-077095acf1d3"
},
{
Expand All @@ -62,8 +62,8 @@
"large",
"mid"
],
"marketCapitalization": 64954623,
"percentageOfTotalMarketCapitalization": 90.03421465833131,
"marketCapitalization": 68185589,
"percentageOfTotalMarketCapitalization": 89.83258742311801,
"factsheet": "https://research.ftserussell.com/Analytics/Factsheets/Home/DownloadSingleIssue?issueName=AWORLDS&IsManual=false"
},
{
Expand All @@ -73,8 +73,8 @@
"large",
"mid"
],
"marketCapitalization": 58582562,
"percentageOfTotalMarketCapitalization": 81.20184089657488,
"marketCapitalization": 61791559,
"percentageOfTotalMarketCapitalization": 81.40863351460168,
"factsheet": "https://research.ftserussell.com/Analytics/FactSheets/Home/DownloadSingleIssue?issueName=AWD&IsManual=False"
},
{
Expand All @@ -84,8 +84,8 @@
"large",
"mid"
],
"marketCapitalization": 52988851.48,
"percentageOfTotalMarketCapitalization": 73.44834606535638,
"marketCapitalization": 60901628.08,
"percentageOfTotalMarketCapitalization": 80.23617466598138,
"factsheet": ""
},
{
Expand All @@ -95,8 +95,8 @@
"large",
"mid"
],
"marketCapitalization": 6761002.48,
"percentageOfTotalMarketCapitalization": 9.371489210087947,
"marketCapitalization": 6736584.18,
"percentageOfTotalMarketCapitalization": 8.87525936430708,
"factsheet": ""
},
{
Expand All @@ -105,8 +105,8 @@
"sizes": [
"small"
],
"marketCapitalization": 6599811.99,
"percentageOfTotalMarketCapitalization": 9.148061553867977,
"marketCapitalization": 7114356.14,
"percentageOfTotalMarketCapitalization": 9.372963250427395,
"factsheet": ""
},
{
Expand All @@ -117,8 +117,8 @@
"mid",
"small"
],
"marketCapitalization": 62524362.48,
"percentageOfTotalMarketCapitalization": 86.66560766428644,
"marketCapitalization": 70497308.64,
"percentageOfTotalMarketCapitalization": 92.8782127481121,
"factsheet": ""
}
]
41 changes: 22 additions & 19 deletions data/portfolios.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
{
"portfolio": [
{
"allocation": 89,
"allocation": 90,
"fund": "NT World"
},
{
"allocation": 11,
"allocation": 10,
"fund": "NT EM"
}
],
Expand All @@ -19,15 +19,15 @@
{
"portfolio": [
{
"allocation": 81,
"allocation": 83,
"fund": "NT World"
},
{
"allocation": 10,
"allocation": 9,
"fund": "NT EM"
},
{
"allocation": 9,
"allocation": 8,
"fund": "NT SC"
}
],
Expand Down Expand Up @@ -83,26 +83,29 @@
{
"portfolio": [
{
"allocation": 89,
"allocation": 91,
"fund": "CARIW"
},
{
"allocation": 11,
"allocation": 9,
"fund": "CARIEM"
}
],
"brokers": [
"Saxo Bank"
"Saxo Bank",
"Interactive Brokers",
"Lynx",
"Easybroker"
]
},
{
"portfolio": [
{
"allocation": 84,
"allocation": 86,
"fund": "CARIW"
},
{
"allocation": 16,
"allocation": 14,
"fund": "EMIM"
}
],
Expand All @@ -116,15 +119,15 @@
{
"portfolio": [
{
"allocation": 75,
"allocation": 77,
"fund": "CARIW"
},
{
"allocation": 13,
"allocation": 12,
"fund": "EMIM"
},
{
"allocation": 12,
"allocation": 11,
"fund": "IUSN"
}
],
Expand All @@ -138,11 +141,11 @@
{
"portfolio": [
{
"allocation": 89,
"allocation": 90,
"fund": "IWDA"
},
{
"allocation": 11,
"allocation": 10,
"fund": "IEMM"
}
],
Expand Down Expand Up @@ -172,11 +175,11 @@
{
"portfolio": [
{
"allocation": 82,
"allocation": 83,
"fund": "BND WIF Hedged"
},
{
"allocation": 10,
"allocation": 9,
"fund": "BND EM"
},
{
Expand All @@ -191,11 +194,11 @@
{
"portfolio": [
{
"allocation": 89,
"allocation": 90,
"fund": "GSESA"
},
{
"allocation": 11,
"allocation": 10,
"fund": "GSEME"
}
],
Expand Down
2 changes: 1 addition & 1 deletion src/Import/IndexImporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class IndexImporter implements DataImporter

private const FACTSHEETS = [
'MSCI ACWI IMI Index' => 'https://www.msci.com/documents/10199/4211cc4b-453d-4b0a-a6a7-51d36472a703',
'MSCI World Index' => 'https://www.msci.com/documents/10199/149ed7bc-316e-4b4c-8ea4-43fcb5bd6523',
'MSCI World Index' => 'https://www.msci.com/documents/10199/4db922ce-68d2-446d-2f9e-4ed408a9db29',
'MSCI World Small Cap Index' => 'https://www.msci.com/documents/10199/a67b0d43-0289-4bce-8499-0c102eaa8399',
'MSCI Emerging Markets Index' => 'https://www.msci.com/documents/10199/c0db0a48-01f2-4ba9-ad01-226fd5678111',
'MSCI Emerging Markets IMI Index' => 'https://www.msci.com/documents/10199/97e25eb7-9bd0-4204-bea9-077095acf1d3',
Expand Down
2 changes: 1 addition & 1 deletion src/Import/MsciFactsheetParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private function getMarkets(Document $document): string
$text = $this->getText($document);

if (preg_match(
'/representation across \d+ Developed ?Markets ?\(DM\) and \d+ Emerging ?Markets ?\(EM\) countries/i',
'/representation across \d+ Developed ?Markets ?\(DM\) and.\d+ Emerging ?Markets ?\(EM\) countries/i',
$text
)) {
return 'all-world';
Expand Down

0 comments on commit 2651974

Please sign in to comment.