From 9f33026ed163253749c73351e6e25270501bab7f Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 24 Aug 2020 16:36:54 +0200
Subject: [PATCH] Fix Windows build
---
.Rbuildignore | 1 +
inst/extdata/PensionTables_USA_PensionPlan_RP2014.R | 2 +-
inst/extdata/USA_PensionPlans_MP2014_Female.csv | 2 +-
inst/extdata/USA_PensionPlans_MP2014_Male.csv | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.Rbuildignore b/.Rbuildignore
index c80326c..88eff7c 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -9,3 +9,4 @@ PossibleTables.txt
^doc$
^Meta$
+^inst/extdata/Austria_Population_Observation.csv$
diff --git a/inst/extdata/PensionTables_USA_PensionPlan_RP2014.R b/inst/extdata/PensionTables_USA_PensionPlan_RP2014.R
index 13baf97..9047be4 100644
--- a/inst/extdata/PensionTables_USA_PensionPlan_RP2014.R
+++ b/inst/extdata/PensionTables_USA_PensionPlan_RP2014.R
@@ -46,7 +46,7 @@ RP2014.readImprovements = function(file) {
lastyear = tail(cn,1)
lastyear = substr(lastyear, 1, nchar(lastyear) - 1);
colnames(data) = c(head(cn, -1), lastyear)
- bel20 = data["≤ 20",];
+ bel20 = data["<= 20",];
young = matrix(bel20, ncol = length(bel20), nrow = 21, byrow = TRUE, dimnames = list(0:20, colnames(data)))
rbind(young, data[-1,])
}
diff --git a/inst/extdata/USA_PensionPlans_MP2014_Female.csv b/inst/extdata/USA_PensionPlans_MP2014_Female.csv
index ebb0bb3..abd6e1b 100644
--- a/inst/extdata/USA_PensionPlans_MP2014_Female.csv
+++ b/inst/extdata/USA_PensionPlans_MP2014_Female.csv
@@ -1,6 +1,6 @@
"Scale MP-2016, Females",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,1951,1952,1953,1954,1955,1956,1957,1958,1959,1960,1961,1962,1963,1964,1965,1966,1967,1968,1969,1970,1971,1972,1973,1974,1975,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032+
-≤ 20,0.0666,0.0602,0.0536,0.0468,0.0398,0.0331,0.0269,0.0209,0.015,0.0088,0.0026,-0.0035,-0.0089,-0.0132,-0.0161,-0.0173,-0.0165,-0.0136,-0.0085,-0.0019,0.0051,0.0116,0.0168,0.0199,0.021,0.0208,0.0207,0.0214,0.023,0.0247,0.0252,0.0237,0.0201,0.0152,0.0105,0.0069,0.0054,0.0057,0.0073,0.0095,0.0117,0.0136,0.0147,0.0154,0.0152,0.0142,0.012,0.009,0.0054,0.002,-0.0003,-0.0009,0.001,0.0052,0.011,0.0174,0.0232,0.0274,0.0289,0.0279,0.0247,0.0202,0.02,0.0195,0.0188,0.0179,0.0168,0.0158,0.0148,0.0138,0.0131,0.0125,0.0122,0.0118,0.0114,0.0111,0.0108,0.0105,0.0103,0.0101,0.01,0.01
+"<= 20",0.0666,0.0602,0.0536,0.0468,0.0398,0.0331,0.0269,0.0209,0.015,0.0088,0.0026,-0.0035,-0.0089,-0.0132,-0.0161,-0.0173,-0.0165,-0.0136,-0.0085,-0.0019,0.0051,0.0116,0.0168,0.0199,0.021,0.0208,0.0207,0.0214,0.023,0.0247,0.0252,0.0237,0.0201,0.0152,0.0105,0.0069,0.0054,0.0057,0.0073,0.0095,0.0117,0.0136,0.0147,0.0154,0.0152,0.0142,0.012,0.009,0.0054,0.002,-0.0003,-0.0009,0.001,0.0052,0.011,0.0174,0.0232,0.0274,0.0289,0.0279,0.0247,0.0202,0.02,0.0195,0.0188,0.0179,0.0168,0.0158,0.0148,0.0138,0.0131,0.0125,0.0122,0.0118,0.0114,0.0111,0.0108,0.0105,0.0103,0.0101,0.01,0.01
21,0.0691,0.0618,0.0544,0.0468,0.0393,0.0322,0.0256,0.0196,0.0137,0.008,0.0023,-0.003,-0.0075,-0.0111,-0.0134,-0.0143,-0.0135,-0.0108,-0.0062,-0.0002,0.0063,0.0124,0.0172,0.0202,0.0213,0.0212,0.0209,0.0214,0.0228,0.0243,0.0248,0.0235,0.0202,0.0157,0.0111,0.0075,0.0058,0.0059,0.0073,0.0094,0.0115,0.0136,0.015,0.016,0.016,0.0149,0.0124,0.0088,0.0045,0.0005,-0.0025,-0.0037,-0.0025,0.0009,0.0059,0.0117,0.0171,0.021,0.0227,0.0221,0.0196,0.0159,0.0179,0.0176,0.0171,0.0165,0.0158,0.015,0.0143,0.0136,0.013,0.0125,0.0122,0.0118,0.0114,0.0111,0.0108,0.0105,0.0103,0.0101,0.01,0.01
22,0.0711,0.0631,0.0551,0.0468,0.0388,0.0312,0.0244,0.0182,0.0125,0.0072,0.0022,-0.0023,-0.006,-0.0088,-0.0106,-0.0112,-0.0104,-0.0079,-0.0037,0.0018,0.0079,0.0135,0.0181,0.021,0.022,0.0219,0.0214,0.0216,0.0226,0.0237,0.0241,0.0229,0.0198,0.0155,0.0109,0.0073,0.0054,0.0053,0.0067,0.0087,0.0111,0.0134,0.0153,0.0167,0.0171,0.0161,0.0135,0.0095,0.0047,-0.0001,-0.0037,-0.0057,-0.0053,-0.0027,0.0014,0.0064,0.0113,0.015,0.0168,0.0166,0.0147,0.0117,0.0138,0.0157,0.0155,0.0151,0.0147,0.0143,0.0138,0.0134,0.013,0.0125,0.0122,0.0118,0.0114,0.0111,0.0108,0.0105,0.0103,0.0101,0.01,0.01
23,0.0725,0.0641,0.0556,0.0469,0.0383,0.0303,0.0232,0.0169,0.0113,0.0064,0.0021,-0.0016,-0.0044,-0.0065,-0.0077,-0.0081,-0.0073,-0.0051,-0.0012,0.0039,0.0097,0.0151,0.0195,0.0222,0.0232,0.0229,0.0222,0.0219,0.0224,0.0231,0.0232,0.0219,0.0189,0.0146,0.0099,0.0061,0.004,0.0039,0.0054,0.0077,0.0103,0.0129,0.0153,0.0173,0.0184,0.0178,0.0154,0.0111,0.0057,0.0003,-0.0042,-0.0069,-0.0073,-0.0056,-0.0024,0.0018,0.0061,0.0096,0.0115,0.0116,0.0103,0.0079,0.0099,0.0119,0.014,0.0139,0.0138,0.0136,0.0134,0.0132,0.0129,0.0125,0.0122,0.0118,0.0114,0.0111,0.0108,0.0105,0.0103,0.0101,0.01,0.01
diff --git a/inst/extdata/USA_PensionPlans_MP2014_Male.csv b/inst/extdata/USA_PensionPlans_MP2014_Male.csv
index f577b05..6729707 100644
--- a/inst/extdata/USA_PensionPlans_MP2014_Male.csv
+++ b/inst/extdata/USA_PensionPlans_MP2014_Male.csv
@@ -1,6 +1,6 @@
"Scale MP-2016, Males",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,1951,1952,1953,1954,1955,1956,1957,1958,1959,1960,1961,1962,1963,1964,1965,1966,1967,1968,1969,1970,1971,1972,1973,1974,1975,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032+
-≤ 20,-0.0153,-0.0067,0.0015,0.0089,0.0149,0.0192,0.0215,0.0214,0.0184,0.0126,0.0043,-0.0057,-0.0162,-0.0258,-0.0333,-0.0374,-0.0373,-0.0329,-0.025,-0.0151,-0.0049,0.0041,0.0111,0.0158,0.0182,0.0191,0.0199,0.0219,0.0256,0.0302,0.0336,0.0337,0.0296,0.022,0.013,0.0047,-0.0013,-0.0045,-0.0049,-0.0028,0.0016,0.0077,0.0145,0.0213,0.0269,0.0298,0.0293,0.0251,0.0181,0.01,0.0028,-0.0019,-0.003,-0.0005,0.0055,0.0141,0.0234,0.0314,0.0363,0.0375,0.0356,0.0318,0.0315,0.0304,0.0288,0.0269,0.0247,0.0224,0.0202,0.0182,0.0166,0.0155,0.0146,0.0138,0.0131,0.0124,0.0117,0.0111,0.0107,0.0103,0.0101,0.01
+"<= 20",-0.0153,-0.0067,0.0015,0.0089,0.0149,0.0192,0.0215,0.0214,0.0184,0.0126,0.0043,-0.0057,-0.0162,-0.0258,-0.0333,-0.0374,-0.0373,-0.0329,-0.025,-0.0151,-0.0049,0.0041,0.0111,0.0158,0.0182,0.0191,0.0199,0.0219,0.0256,0.0302,0.0336,0.0337,0.0296,0.022,0.013,0.0047,-0.0013,-0.0045,-0.0049,-0.0028,0.0016,0.0077,0.0145,0.0213,0.0269,0.0298,0.0293,0.0251,0.0181,0.01,0.0028,-0.0019,-0.003,-0.0005,0.0055,0.0141,0.0234,0.0314,0.0363,0.0375,0.0356,0.0318,0.0315,0.0304,0.0288,0.0269,0.0247,0.0224,0.0202,0.0182,0.0166,0.0155,0.0146,0.0138,0.0131,0.0124,0.0117,0.0111,0.0107,0.0103,0.0101,0.01
21,-0.0146,-0.0062,0.002,0.0092,0.0151,0.0193,0.0215,0.0211,0.018,0.0121,0.0038,-0.0059,-0.016,-0.0253,-0.0325,-0.0365,-0.0363,-0.0321,-0.0244,-0.0146,-0.0048,0.0038,0.0105,0.0148,0.0169,0.0176,0.0183,0.0203,0.024,0.0287,0.0324,0.0328,0.0291,0.0219,0.0134,0.0055,-0.0001,-0.0029,-0.003,-0.0007,0.0037,0.0095,0.0159,0.0221,0.0269,0.0291,0.0277,0.0228,0.0151,0.0064,-0.0012,-0.0062,-0.0075,-0.005,0.0008,0.0093,0.0187,0.0269,0.032,0.0335,0.0319,0.0284,0.0298,0.0289,0.0275,0.0258,0.0238,0.0218,0.0198,0.018,0.0165,0.0155,0.0146,0.0138,0.0131,0.0124,0.0117,0.0111,0.0107,0.0103,0.0101,0.01
22,-0.0121,-0.0042,0.0034,0.0103,0.0157,0.0195,0.0212,0.0205,0.0171,0.0111,0.0031,-0.0063,-0.0159,-0.0247,-0.0314,-0.035,-0.0348,-0.0306,-0.0231,-0.0138,-0.0044,0.0038,0.0099,0.0138,0.0156,0.0162,0.0167,0.0185,0.0222,0.0268,0.0307,0.0314,0.028,0.0212,0.0129,0.0053,0.0001,-0.0024,-0.002,0.0007,0.0055,0.0115,0.0179,0.0239,0.0283,0.0298,0.0277,0.0219,0.0133,0.0038,-0.0044,-0.0098,-0.0114,-0.0092,-0.0034,0.005,0.0144,0.0226,0.0278,0.0294,0.028,0.0247,0.0263,0.0272,0.026,0.0246,0.0229,0.0212,0.0194,0.0178,0.0165,0.0155,0.0146,0.0138,0.0131,0.0124,0.0117,0.0111,0.0107,0.0103,0.0101,0.01
23,-0.0082,-0.001,0.0059,0.0119,0.0166,0.0197,0.0208,0.0196,0.0159,0.0099,0.0021,-0.0069,-0.0159,-0.0239,-0.03,-0.0332,-0.0328,-0.0287,-0.0215,-0.0126,-0.0038,0.0039,0.0096,0.0131,0.0146,0.0149,0.0152,0.0168,0.0202,0.0247,0.0285,0.0294,0.0263,0.0197,0.0116,0.0042,-0.0008,-0.0029,-0.002,0.0014,0.0068,0.0134,0.0203,0.0265,0.0308,0.032,0.0292,0.0225,0.013,0.0025,-0.0066,-0.0126,-0.0147,-0.0127,-0.0071,0.0011,0.0104,0.0185,0.0237,0.0253,0.024,0.0208,0.0226,0.0238,0.0245,0.0233,0.0219,0.0205,0.019,0.0176,0.0164,0.0155,0.0146,0.0138,0.0131,0.0124,0.0117,0.0111,0.0107,0.0103,0.0101,0.01
--
GitLab