Skip to content

Commit

Permalink
Update to version 2015.2
Browse files Browse the repository at this point in the history
The SSA released Detailed Calculator 2015.2 on September 4, 2015,
incorporate the code changes from this release.

Changes in 2015.2 from SSA:
It updates the 2015.1 version by updating the projected benefit increases and average wage index with the economic assumptions from the 2015 Trustees Report.
  • Loading branch information
mrpippy committed Sep 13, 2015
1 parent c64984a commit 8c0fe1e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
Binary file modified anypiamacprojOSX/Resources/AppResources.ppob
Binary file not shown.
6 changes: 3 additions & 3 deletions oactobjs/BaseYearNonFile.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Declarations for the <see cref="BaseYearNonFile"/> class to manage the
// computation year stored internally.
//
// $Id: BaseYearNonFile.h 1.35 2015/01/14 09:18:28EST 277133 Development $
// $Id: BaseYearNonFile.h 1.36 2015/08/11 09:08:16EDT 277133 Development $

#pragma once

Expand All @@ -15,7 +15,7 @@
/// stored with the code.</summary>
///
/// <remarks>Currently <see cref="YEAR"/> is 2015 and <see cref="TR_YEAR"/>
/// is 2014. See <see cref="BaseYearFile"/> for a class where the computation
/// is 2015. See <see cref="BaseYearFile"/> for a class where the computation
/// year is stored on disk.</remarks>
///
/// <seealso cref="BaseYearFile"/>
Expand All @@ -33,7 +33,7 @@ class BaseYearNonFile : public BaseYear
/// <remarks>This is updated when the TR is released, so it is equal to
/// <see cref="YEAR"/> from the TR date to October, and 1 less than
/// <see cref="YEAR"/> from October to the TR date.</remarks>
static const int TR_YEAR = 2014;
static const int TR_YEAR = 2015;
public:
BaseYearNonFile();
void read();
Expand Down
12 changes: 6 additions & 6 deletions oactobjs/oactcnst.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// Constants used in the various Oact C++ programs and utilities.
//
// $Id: oactcnst.h 1.17 2012/03/12 12:48:25EDT 277133 Development $
// $Id: oactcnst.h 1.18 2015/07/30 11:47:28EDT 729915 Development $

#pragma once

// <summary>Number of years of data in trust fund projections, January 1
// basis.</summary>
//
// <remarks>When using 52, data runs from January 1, 1975 through January 1,
// 2026.</remarks>
const int MAXYRSR = 52;
// <remarks>When using 57, data runs from January 1, 1975 through January 1,
// 2031.</remarks>
const int MAXYRSR = 57;

// <summary>Number of years of data in trust fund projections, during-year
// basis.</summary>
//
// <remarks>When using 51, data runs from 1975 through 2025.</remarks>
const int MAXYRSR1 = 51;
// <remarks>When using 56, data runs from 1975 through 2030.</remarks>
const int MAXYRSR1 = 56;

// <summary>Base year for trust fund projection arrays on January 1 basis.
// </summary>
Expand Down
26 changes: 13 additions & 13 deletions oactobjs/piadataproj/biprojnf.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Functions for the <see cref="BiprojNonFile"/> class to manage projected
// benefit increases stored in arrays.
//
// $Id: biprojnf.cpp 1.68 2015/01/14 09:24:24EST 277133 Development $
// $Id: biprojnf.cpp 1.69 2015/08/11 09:07:08EDT 277133 Development $

#include "BiprojNonFile.h"
#include "Resource.h"
Expand All @@ -13,26 +13,26 @@

using namespace std;

// <summary>Titles for 2014 Trustees Report update</summary>
// <summary>Titles for 2015 Trustees Report</summary>
const string BiprojNonFile::titletrOriginal[NUMASSUMSETS] = {
"2014 Trustees Report Alternative I, updated October 22, 2014",
"2014 Trustees Report Alternative II, updated October 22, 2014",
"2014 Trustees Report Alternative III, updated October 22, 2014",
"2015 Trustees Report Alternative I",
"2015 Trustees Report Alternative II",
"2015 Trustees Report Alternative III",
"No increase beginning with 2015 benefit increase"
};

// <remarks>Benefit increases for 2014 Trustees Report, 2015 to 2029</remarks>
// <remarks>Benefit increases for 2015 Trustees Report, 2015 to 2029</remarks>
const double BiprojNonFile::biprojtrOriginal[NUMASSUMSETS][NUMPROJYEARS] = {
{ 3.0,
3.4, 3.4, 3.4, 3.4, 3.4,
{ 0.2,
3.5, 3.4, 3.4, 3.4, 3.4,
3.4, 3.4, 3.4, 3.4, 3.4,
3.4, 3.4, 3.4, 3.4 },
{ 2.0,
2.2, 2.4, 2.6, 2.7, 2.7,
{ 0.0,
3.1, 2.7, 2.7, 2.7, 2.7,
2.7, 2.7, 2.7, 2.7, 2.7,
2.7, 2.7, 2.7, 2.7 },
{ 1.4,
1.5, 1.7, 1.9, 2.0, 2.0,
{ 0.0,
2.5, 2.0, 2.0, 2.0, 2.0,
2.0, 2.0, 2.0, 2.0, 2.0,
2.0, 2.0, 2.0, 2.0 },
{ 0.0,
Expand All @@ -41,7 +41,7 @@ const double BiprojNonFile::biprojtrOriginal[NUMASSUMSETS][NUMPROJYEARS] = {
0.0, 0.0, 0.0, 0.0 }
};

// <remarks>Ultimate benefit increases for 2014 Trustees Report.</remarks>
// <remarks>Ultimate benefit increases for 2015 Trustees Report.</remarks>
const double BiprojNonFile::biult[NUMASSUMSETS] = {
3.4, 2.7, 2.0, 0.0
};
Expand Down
4 changes: 2 additions & 2 deletions oactobjs/piadataproj/wbgenrl.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Functions for the <see cref="WageBaseGeneral"/> class - parent of classes
// that manage wage base projections.

// $Id: wbgenrl.cpp 1.27 2011/10/26 11:07:32EDT 044579 Development $
// $Id: wbgenrl.cpp 1.28 2015/07/16 07:57:49EDT 729915 Development $

#include <cmath> // for floor
#include "wbgenrl.h"
Expand Down Expand Up @@ -113,7 +113,7 @@ const DoubleAnnual& cpi, int firstYeart, int lastYeart )
baseun = 45000.0 * factor;
}
else {
baseun = (wageBaseInd < 2) ? 60600.0 * factor : 999999999.0;
baseun = (wageBaseInd < 2) ? 60600.0 * factor : 99999999.0;
}
}
// handle ad hoc increases 1979-81
Expand Down

0 comments on commit 8c0fe1e

Please sign in to comment.