Code

Fix calculation of expanded income#1057

Code

Merged

martinholmer merged 15 commits intoPSLmodels:masterPSLmodels/Tax-Calculator:masterfrom martinholmer:fix-expanded-incomeCopy head branch name to clipboardNov 14, 2016

+76-54

Commits

Commits on Nov 11, 2016

• Clarify Adj function documentation.

  martinholmer

  committed
  ec87f40

  Copy full SHA for ec87f40

• Add invinc_agi_ec variable and use it in ExpandIncome function.

  martinholmer

  committed
  19c9ea7

  Copy full SHA for 19c9ea7

• Add cmbtp amount to the _expanded_income variable.

  martinholmer

  committed
  4978900

  Copy full SHA for 4978900

• Non-substantive change in order of ExpandIncome statements.

  martinholmer

  committed
  c6e4030

  Copy full SHA for c6e4030

• More non-substantive changes in order of ExpandIncome statements.

  martinholmer

  committed
  89a88ec

  Copy full SHA for 89a88ec

Commits on Nov 12, 2016

• Remove behavior comment from ExpandIncome docstring.

  martinholmer

  committed
  6a1422f

  Copy full SHA for 6a1422f

• Implement JCT-rules about pensions/h.ins. AGI adjustemts in expanded income.

  martinholmer

  committed
  75b5730

  Copy full SHA for 75b5730

Commits on Nov 13, 2016

• Add filer to USABLE_READ_VARS set.

  martinholmer

  committed
  55f210d

  Copy full SHA for 55f210d

• Add FILER to var_label.txt file.

  martinholmer

  committed
  f11b0a0

  Copy full SHA for f11b0a0

• Revise Calculator test to increase code coverage.

  martinholmer

  committed
  48139bb

  Copy full SHA for 48139bb

• Revise different Calculator test to increase code coverage.

  martinholmer

  committed
  6b0af3c

  Copy full SHA for 6b0af3c

Commits on Nov 14, 2016

• Fix typo in validation/CSV_INPUT_VARS.md file.

  martinholmer

  committed
  0b21524

  Copy full SHA for 0b21524

• Fix typo and change c02900_less to c02900_in_ei.

  martinholmer

  committed
  b0a69f5

  Copy full SHA for b0a69f5

• Revert erroneous change in validation results.

  martinholmer

  committed
  5846335

  Copy full SHA for 5846335

• Change docstring in anticipation of CG_nodiff becoming a boolean.

  martinholmer

  committed
  6a9f9ea

  Copy full SHA for 6a9f9ea