From c1fa355c1e9d4ffe6cfa8d92a578755cd72dda02 Mon Sep 17 00:00:00 2001
From: Bianey Palma
Date: Tue, 20 Jun 2023 12:11:45 +0200
Subject: [PATCH] EUROMOD v3.6.2 Compared to previous release v.3.5.8, this
software version includes the following updates/changes: - Core software:
- Added a new table for External Statistics, which is used by the new
Macrovalidation tool (see next section). - Fixed a bug in the Uprating
Indices form where columns without any values were ignored. - Added the
possibility of conditional uprating by regular expressions. - Improved the
help file. - Applications: - New Macrovalidation tool to compare EUROMOD
results with external statistics and SILC variables. - Hypothetical
Household Tool (HHoT): - Updated HHoT files. -
Fixed a bug related to derived variables using other variables that contained
numbers in their name. - EUROMOD Statistics: - Unified the
Statistics Presenter and the In-depth Analysis tools under a single button
(EUROMOD Statistics). - Reorganised the Statistics Presenter
templates to have tables grouped in a similar manner to In-depth Analysis.
- Added multiple breakdowns to both Statistics Presenter templates and
In-depth Analysis. - Allowed for file filtering when selecting
the files for Statistics Presenter and In-depth Analysis. -
Improved the Excel export of all statistics (added support for borders, bold,
auto-column-width etc.). - Updated the UKMOD templates.
IMPORTANT NOTE: if you are using custom templates in the Statistics
Presenter, please note that the location for them has moved: - from
c:\ProgramData\EUROMOD\Plugins\StatisticsPresenter\UserSelectableTemplates\ -
to c:\ProgramData\EUROMOD\UserSelectableTemplates\
A list with the most notable changes can be found in the changelog.txt file located in the root.
---
...figure and run the EUROMOD source code.txt | 28 +-
EM_Help/HelpFiles/EM_BC_Introduction.htm | 55 -
.../HelpFiles/EM_BC_PresentationTaxBen.htm | 137 -
EM_Help/HelpFiles/EM_BC_UserInterface.htm | 95 -
EM_Help/HelpFiles/EM_FC_ParameterTypes.htm | 305 -
.../EM_WW_AdministratingAcronyms.htm | 179 -
.../EM_WW_AdministratingVariables.htm | 122 -
EM_Help/HelpFiles/EM_WW_Applications.htm | 26 -
EM_Help/HelpFiles/EM_WW_ComponentUse.htm | 90 -
EM_Help/HelpFiles/EM_WW_FindingErrors.htm | 112 -
.../HelpFiles/EM_WW_ImportingCountries.htm | 77 -
.../HelpFiles/EM_WW_ImportingVariables.htm | 167 -
EM_Help/HelpFiles/EM_WW_Plugins.htm | 26 -
EM_Help/HelpFiles/EM_WW_SearchReplace.htm | 158 -
EM_Help/HelpFiles/EM_WW_Variables.htm | 131 -
EM_Help/HelpFiles/EUROMODHelp.hhc | 838 -
.../Gaensefuesschen/Gaensefuesschen.exe | Bin 10568 -> 0 bytes
.../EM_Common/Definitions/DefGeneral.cs | 7 +-
.../EM_Common/Definitions/DefPar/DefInput.cs | 9 +
.../EM_Common/Definitions/DefPar/DefOutput.cs | 9 +
.../EM_Common/Definitions/DefPar/Store.cs | 12 +
.../EM_Common/Definitions/DefPar/Uprate.cs | 6 +
.../EM_Common/Definitions/DefVarName.cs | 3 +
.../Definitions/InDepthDefinitions.cs | 59 +
.../EM_Common/Helpers/EM_Helpers_Convert.cs | 20 +-
.../EM_Common/Helpers/EM_Helpers_Pretty.cs | 3 +-
.../PathAndEnvironment/EnvironmentInfo.cs | 11 +-
.../EM_Common/PlugIns/UICommunicator.cs | 2 +-
EM_Libraries/EM_Common/Undo/UndoManager.cs | 2 +-
.../Properties/GlobalSuppressions.cs | 38 -
EM_Libraries/EM_Crypt/EM_Crypt.cs | 297 -
.../1.8.6/.nupkg.metadata | 4 +
.../bouncycastle.netcore/1.8.6/.signature.p7s | Bin 0 -> 9467 bytes
.../1.8.6/bouncycastle.netcore.1.8.6.nupkg | Bin 0 -> 7359548 bytes
.../bouncycastle.netcore.1.8.6.nupkg.sha512 | 1 +
.../1.8.6/bouncycastle.netcore.nuspec | 14 +
.../1.8.6/lib/Mono/BouncyCastle.Crypto.xml | 26182 ++++++++++++++++
.../lib/MonoAndroid/BouncyCastle.Crypto.xml | 26182 ++++++++++++++++
.../1.8.6/lib/MonoMac/BouncyCastle.Crypto.xml | 26182 ++++++++++++++++
.../lib/MonoTouch/BouncyCastle.Crypto.xml | 26182 ++++++++++++++++
.../1.8.6/lib/net20/BouncyCastle.Crypto.xml | 26182 ++++++++++++++++
.../netstandard2.0/BouncyCastle.Crypto.xml | 26182 ++++++++++++++++
.../lib/xamarinios/BouncyCastle.Crypto.xml | 26182 ++++++++++++++++
.../EM_Statistics/Classes/ErrorCollector.cs | 4 +-
.../EM_Statistics/Classes/ExportHandling.cs | 134 +-
.../Classes/PrettyInfo/PrettyInfo.cs | 2 +
.../PrettyInfoProvider_Definitions.cs | 6 +
.../PrettyInfoProvider_Functions.cs | 6 +-
.../Classes/PrettyInfo/PrettyInfoResources.cs | 6 +-
.../PrettyInfo/PrettyInfo_BaseCountry.cs | 4 +-
.../PrettyInfo/PrettyInfo_BaseCountryShort.cs | 18 +
.../PrettyInfo/PrettyInfo_BaseDataset.cs | 5 +-
.../PrettyInfo/PrettyInfo_BaseFileName.cs | 2 +-
.../PrettyInfo/PrettyInfo_BaseRunAddons.cs | 5 +-
.../PrettyInfo/PrettyInfo_BaseRunDuration.cs | 5 +-
.../PrettyInfo/PrettyInfo_BaseRunEndTime.cs | 5 +-
.../PrettyInfo_BaseRunExtensionSwitches.cs | 5 +-
.../PrettyInfo/PrettyInfo_BaseRunLog.cs | 5 +-
.../PrettyInfo_BaseRunLogExtended.cs | 5 +-
.../PrettyInfo/PrettyInfo_BaseRunStartTime.cs | 5 +-
.../PrettyInfo/PrettyInfo_BaseRunWarnings.cs | 5 +-
.../Classes/PrettyInfo/PrettyInfo_BaseSys.cs | 2 +-
.../PrettyInfo/PrettyInfo_BaseSysLabel.cs | 2 +-
.../PrettyInfo/PrettyInfo_BaseSysList.cs | 19 +
.../PrettyInfo/PrettyInfo_BaseSysPretty.cs | 2 +-
.../PrettyInfo/PrettyInfo_BaseTaxSysPretty.cs | 2 +-
.../PrettyInfo_RefRunExtensionSwitches.cs | 26 +-
.../Classes/PrettyInfo/PrettyInfo_UserVar.cs | 2 +
.../EM_Statistics/Classes/Template.cs | 18 +-
.../EM_Statistics/Classes/TemplateApi.cs | 204 +-
.../EM_Statistics/EM_Statistics.csproj | 160 +-
.../EM_Statistics/EM_TemplateCalculator.cs | 127 +-
.../EM_TemplateCalculator_Actions.cs | 10 +-
.../ExternalStatistics/ExternalStatistic.cs | 26 +
.../ExternalStatisticAggregate.cs | 64 +
.../ExternalStatisticDistributional.cs | 44 +
.../ExternalStatistics/IlVarInfo.cs | 16 +
.../BaselineReform/BaselineReformPackage.cs | 24 +-
.../SelectBaselinesReforms.Designer.cs | 2 +-
.../BaselineReform/SelectBaselinesReforms.cs | 18 +-
.../SelectBaselinesReforms.resx | 0
.../BaselineReform/SystemInfo.cs | 62 +-
.../EM_Statistics/InDepthAnalysis/Help.chm | Bin 0 -> 44739 bytes
.../InDepthAnalysis/Helpers/Breakdowns.cs | 288 +
.../CategoryDescriptionsForm.Designer.cs | 2 +-
.../Helpers/CategoryDescriptionsForm.cs | 29 +-
.../Helpers/CategoryDescriptionsForm.resx | 0
.../InDepthAnalysis/Helpers/EMVarInfo.cs | 2 +-
.../InDepthAnalysis/Helpers/FormulaEditor.cs | 2 +-
.../Helpers/MergedDatasetWriter.cs | 2 +-
.../InDepthAnalysis/InDepthAnalysis.cs | 20 +
.../InDepthAnalysis/InDepthAnalysis.ico | Bin 0 -> 24078 bytes
.../InDepthAnalysisForm.Designer.cs | 2 +-
.../InDepthAnalysis/InDepthAnalysisForm.cs | 35 +-
.../InDepthAnalysis/InDepthAnalysisForm.resx | 23 +-
.../InDepthAnalysis/Settings/ISettings.cs | 2 +-
.../InDepthAnalysis/Settings/Settings.cs | 74 +-
.../SettingsDistributional.Designer.cs | 164 +-
.../Settings/SettingsDistributional.cs | 435 +-
.../Settings/SettingsDistributional.resx | 0
.../Settings/SettingsFiscal.Designer.cs | 7 +-
.../Settings/SettingsFiscal.cs | 108 +-
.../Settings/SettingsFiscal.resx | 0
.../SettingsInequalityAndPoverty.Designer.cs | 17 +-
.../Settings/SettingsInequalityAndPoverty.cs | 421 +-
.../SettingsInequalityAndPoverty.resx | 0
.../Settings/SettingsMacrovalidation.cs | 910 +
.../EM_Statistics/Resources.Designer.cs | 123 +-
EM_Libraries/EM_Statistics/Resources.resx | 15 +
.../Resources/EUROMODStatistics.ico | Bin
.../Resources}/InDepthAnalysis.ico | Bin
.../Resources/InDepthAnalysis.xml | 824 +-
.../Resources/Macrovalidation.xml | 1465 +
.../Resources/StatisticsPresenter.ico | Bin 0 -> 99971 bytes
.../EM_Statistics}/Resources/dummy.html | 0
.../EM_Statistics}/Resources/existing.png | Bin
.../EM_Statistics}/Resources/missing.png | Bin
.../PresenterForm.Designer.cs | 2 +-
.../StatisticsPresenter/PresenterForm.cs | 4 +-
.../StatisticsPresenter/PresenterForm.resx | 0
.../SelectBaseAltsForm.Designer.cs | 2 +-
.../StatisticsPresenter/SelectBaseAltsForm.cs | 9 +-
.../SelectBaseAltsForm.resx | 0
...SelectDefaultTemplateComboForm.Designer.cs | 2 +-
.../SelectDefaultTemplateComboForm.cs | 2 +-
.../SelectDefaultTemplateComboForm.resx | 0
.../SelectFilesForm.Designer.cs | 2 +-
.../StatisticsPresenter/SelectFilesForm.cs | 18 +-
.../StatisticsPresenter/SelectFilesForm.resx | 0
.../SelectPackagesForm.Designer.cs | 2 +-
.../StatisticsPresenter/SelectPackagesForm.cs | 2 +-
.../SelectPackagesForm.resx | 0
.../ShowInfoForm.Designer.cs | 2 +-
.../StatisticsPresenter/ShowInfoForm.cs | 2 +-
.../StatisticsPresenter/ShowInfoForm.resx | 0
.../StatisticsPresenter.cs | 30 +-
.../StatisticsPresenter.ico | Bin 0 -> 24038 bytes
.../TakeUserInput.Designer.cs | 2 +-
.../StatisticsPresenter/TakeUserInput.cs | 2 +-
.../StatisticsPresenter/TakeUserInput.resx | 0
EM_Libraries/EM_Statistics/XML_handling.cs | 8 +-
EM_Libraries/EM_XmlHandler/Common/TAGS.cs | 9 +-
.../EM_XmlHandler/Common/XmlHelpers.cs | 9 +
.../ExeXmlReader_ReadCAO/GetExtStatInfo.cs | 54 +
.../ExeXmlReader_ReadCAO/_ReadCountry_Main.cs | 69 +-
.../Executable/ExeXml_Structures.cs | 99 +-
.../Hypothetical Household/DataGenerator.cs | 65 +-
.../Hypothetical Household.csproj | 10 +-
.../HypotheticalHousehold.cs | 24 +-
.../InputForm.Designer.cs | 298 +-
.../Hypothetical Household/InputForm.cs | 13 +-
.../Hypothetical Household/InputForm.resx | 9 +-
.../Hypothetical Household/NumericEditor.cs | 6 +
...signer.cs => SelectFolderForm.Designer.cs} | 4 +-
...OpenProjectForm.cs => SelectFolderForm.cs} | 18 +-
...ProjectForm.resx => SelectFolderForm.resx} | 0
.../Statistics/SimpleStatistics.cs | 6 +-
.../VariableDataSet.Designer.cs | 2438 +-
.../VariableDataSet.xsd | 80 +-
.../VariableDataSet.xss | 128 +-
.../data/HouseholdData.xml | 428 +-
.../data/ReferenceTables.xml | 240 +-
.../data/VariableSettings.xml | 1212 +-
EM_Plugins/InDepthAnalysis/Help.chm | Bin 44589 -> 0 bytes
EM_Plugins/InDepthAnalysis/InDepthAnalysis.cs | 44 -
.../InDepthAnalysis/InDepthAnalysis.csproj | 203 -
.../InDepthHelpMaker/InDepthHelpMaker.csproj | 8 -
.../Properties/AssemblyInfo.cs | 37 -
.../Properties/Resources.Designer.cs | 103 -
EM_Plugins/InDepthAnalysis/app.config | 139 -
.../InputForm.Designer.cs | 20 +-
EM_Plugins/StatisticsPresenter/App.config | 139 -
.../Properties/AssemblyInfo.cs | 36 -
.../StatisticsPresenter/Resources.Designer.cs | 79 -
EM_Plugins/StatisticsPresenter/Resources.resx | 124 -
.../StatisticsPresenter.csproj | 363 -
.../StatisticsPresenter/packages.config | 55 -
.../Web Statistics/OutputForm.Designer.cs | 31 +-
EM_Plugins/Web Statistics/OutputForm.cs | 86 +-
EM_UI/Actions/CopySystemAction.cs | 2 +
.../Actions/SetSelectionPrivateStateAction.cs | 68 +-
.../CountryAdministrator.cs | 2 +-
EM_UI/DataSets/CountryConfig.Designer.cs | 1003 +-
EM_UI/DataSets/CountryConfig.cs | 4 +
EM_UI/DataSets/CountryConfig.xsd | 83 +-
EM_UI/DataSets/CountryConfig.xss | 115 +-
EM_UI/DataSets/CountryConfigFacade.cs | 150 +-
EM_UI/Dialogs/AddParameterForm.cs | 2 +-
EM_UI/Dialogs/ComponentSearchForm.cs | 3 +-
EM_UI/Dialogs/ConditionalFormattingForm.cs | 2 +-
EM_UI/Dialogs/ConfigurationForm.cs | 2 +-
EM_UI/Dialogs/DeleteCountryForm.cs | 3 +-
EM_UI/Dialogs/FindReplaceForm.cs | 8 +-
EM_UI/Dialogs/OptionalWarningsManager.cs | 2 +-
EM_UI/Dialogs/SelectSystemsForm.cs | 2 +-
.../Tools/ChooseStatistics.Designer.cs | 105 +
EM_UI/Dialogs/Tools/ChooseStatistics.cs | 40 +
.../Tools/ChooseStatistics.resx} | 3 -
.../Tools/MacrovalidationForm.Designer.cs | 69 +
EM_UI/Dialogs/Tools/MacrovalidationForm.cs | 242 +
EM_UI/Dialogs/Tools/MacrovalidationForm.resx | 1227 +
.../{ => Tools/PET}/PolicyEffects.Asc.cs | 5 +-
.../{ => Tools/PET}/PolicyEffects.Designer.cs | 2 +-
.../Dialogs/{ => Tools/PET}/PolicyEffects.cs | 2 +-
.../{ => Tools/PET}/PolicyEffects.resx | 0
.../PET}/PolicyEffectsAlphaRange.Designer.cs | 2 +-
.../PET}/PolicyEffectsAlphaRange.cs | 2 +-
.../PET}/PolicyEffectsAlphaRange.resx | 0
.../PET}/PolicyEffectsChooseMode.Designer.cs | 2 +-
.../PET}/PolicyEffectsChooseMode.cs | 2 +-
.../PET}/PolicyEffectsChooseMode.resx | 0
.../{ => Tools/PET}/PolicyEffectsEM2.cs | 2 +-
.../{ => Tools/PET}/PolicyEffectsEM3.cs | 2 +-
EM_UI/EM_UI.csproj | 134 +-
EM_UI/EM_UI_MainForm.Designer.cs | 118 +-
EM_UI/EM_UI_MainForm.cs | 48 +-
EM_UI/EM_UI_MainForm.resx | 407 +-
EM_UI/Editor/FormulaEditorManager.cs | 30 +-
.../ExternalStatisticUtil.cs | 277 +
.../ExternalStatisticsAction.cs | 27 +
.../ExternalStatisticsComponent.cs | 175 +
.../ExternalStatisticsForm.Designer.cs | 912 +
.../ExternalStatisticsForm.cs | 1124 +
.../ExternalStatisticsForm.resx | 68 +-
EM_UI/Icons/FunctionInconsistent.png | Bin 0 -> 909 bytes
EM_UI/Icons/Macrovalidation.ico | Bin 0 -> 66110 bytes
EM_UI/Icons/PrivateFunctionInconsistent.png | Bin 0 -> 912 bytes
EM_UI/Icons/PrivateParameterInconsistent.png | Bin 0 -> 475 bytes
EM_UI/Icons/blueballInconsistent.png | Bin 0 -> 460 bytes
EM_UI/Icons/intelli-image-3.png | Bin 0 -> 507 bytes
EM_UI/Icons/intelli-image-4.png | Bin 0 -> 590 bytes
EM_UI/IndirectTaxes/IndirectTaxesAction.cs | 11 +-
EM_UI/IndirectTaxes/IndirectTaxesForm.cs | 22 +-
EM_UI/PlugInService/SessionInfo.cs | 2 +-
EM_UI/Properties/Resources.Designer.cs | 30 +
EM_UI/Properties/Resources.resx | 117 +-
EM_UI/Properties/licenses.licx | 1 +
EM_UI/Resources/EUROMODStatistics.ico | Bin 0 -> 24038 bytes
EM_UI/Resources/InDepthAnalysis.ico | Bin 0 -> 67646 bytes
EM_UI/Resources/InDepthAnalysis.png | Bin 0 -> 3762 bytes
EM_UI/Resources/StatisticsPresenter.png | Bin 0 -> 288 bytes
EM_UI/Run/RunManager.cs | 4 +-
EM_UI/TreeListManagement/TreeListBuilder.cs | 108 +-
EM_UI/TreeListTags/ParameterTreeListTag.cs | 2 +
.../UpratingIndicesForm.Designer.cs | 79 +-
EM_UI/UpratingIndices/UpratingIndicesForm.cs | 28 +-
.../VariablesForm.Designer.cs | 10 +-
.../VariablesAdministration/VariablesForm.cs | 19 +-
.../Dialogs/VCChangePassword.Designer.cs | 207 -
.../Dialogs/VCChangePassword.cs | 45 -
.../Merging/ApplyAdministrator.cs | 115 +
.../Merging/ChangeLogAdministrator.cs | 3 +-
.../Merging/MergeAdministrator.cs | 168 +-
EM_UI/VersionControl/Merging/MergeControl.cs | 118 +-
EM_UI/VersionControl/Merging/MergeForm.cs | 21 +-
.../Merging/MergeForm.designer.cs | 26 +
EM_UI/packages.config | 22 +
.../ControlAndInfo/Control_Run.cs | 31 +
.../EM_Executable/EM_Executable.csproj | 2 +-
.../EM_Executable/Functions/FunDefIL.cs | 19 +
.../Functions/FunDefOutput_Work.cs | 95 +-
.../EM_Executable/Functions/FunIlArithOp.cs | 2 +-
.../EM_Executable/Functions/FunStore.cs | 50 +
.../EM_Executable/Functions/FunUprate.cs | 102 +-
.../EM_Transformer/EM2/EM2Country_Def.cs | 5 +
.../EM_Transformer/EM2/EM2Country_Read.cs | 14 +-
EM_executable/EM_Transformer/EM2/EM2TAGS.cs | 1 +
.../EM23Adapt/EM23Adapt_YearValues.cs | 39 +-
.../EM23Adapt/_EM23Adapt_Country.cs | 6 +
.../EM_Transformer/EM3/EM3Country_Write.cs | 15 +
.../EM_Transformer/EM_Transformer.csproj | 4 +-
EUROMOD development.sln | 304 +-
.../EUROMOD_HelpOnHelp.docx | Bin
.../HelpFiles/EM_BC_InOut.htm | 0
EuromodHelp/HelpFiles/EM_BC_Introduction.htm | 59 +
.../HelpFiles/EM_BC_PresentationTaxBen.htm | 98 +
.../HelpFiles/EM_BC_Terminology.htm | 6 +-
EuromodHelp/HelpFiles/EM_BC_UserInterface.htm | 65 +
.../HelpFiles/EM_FC_AddHHMembers.htm | 2 +-
..._Applic_AddOn_Pol_AddOn_Func_AddOn_Par.htm | 43 +-
.../HelpFiles/EM_FC_AddOn_ExtensionSwitch.htm | 0
.../HelpFiles/EM_FC_Allocate.htm | 4 +-
.../HelpFiles/EM_FC_ArithOp.htm | 0
.../HelpFiles/EM_FC_BenCalc.htm | 87 +-
.../HelpFiles/EM_FC_Break.htm | 6 +-
.../HelpFiles/EM_FC_CallProgramme.htm | 0
.../HelpFiles/EM_FC_ChangeLog.htm | 0
.../HelpFiles/EM_FC_ChangeParam.htm | 0
.../HelpFiles/EM_FC_ChangeSwitch.htm | 0
.../HelpFiles/EM_FC_CommonParameters.htm | 80 +-
.../HelpFiles/EM_FC_CumulativeSum.htm | 0
.../HelpFiles/EM_FC_DefIL.htm | 4 +-
.../HelpFiles/EM_FC_DefInput.htm | 6 +-
.../HelpFiles/EM_FC_DefOutput.htm | 4 +-
.../HelpFiles/EM_FC_DefTU_UpdateTU.htm | 293 +-
.../HelpFiles/EM_FC_DefVar_DefConst.htm | 4 +-
.../EM_FC_DescriptionOfFunctions.htm | 0
.../HelpFiles/EM_FC_DropUnit_KeepUnit.htm | 0
.../HelpFiles/EM_FC_Elig.htm | 31 +-
.../HelpFiles/EM_FC_FootnoteParameters.htm | 78 +-
.../HelpFiles/EM_FC_Formula.htm | 0
.../HelpFiles/EM_FC_GeneralFeatures.htm | 0
.../HelpFiles/EM_FC_HeaderPage.htm | 0
.../HelpFiles/EM_FC_ILVarOp.htm | 2 +-
.../HelpFiles/EM_FC_IlArithOp.htm | 0
.../HelpFiles/EM_FC_InitVars.htm | 0
.../EM_FC_InteractionsBetweenFunctions.htm | 0
.../HelpFiles/EM_FC_Loop_UnitLoop.htm | 5 +-
.../HelpFiles/EM_FC_Min_Max.htm | 3 +-
.../HelpFiles/EM_FC_ParameterTypes.htm | 203 +
.../HelpFiles/EM_FC_ParameterValues.htm | 70 +-
.../HelpFiles/EM_FC_Placeholders.htm | 13 +-
.../HelpFiles/EM_FC_Queries.htm | 0
.../HelpFiles/EM_FC_RandSeed.htm | 0
.../HelpFiles/EM_FC_Scale.htm | 0
.../HelpFiles/EM_FC_SchedCalc.htm | 8 +-
.../HelpFiles/EM_FC_SetDefault.htm | 0
.../HelpFiles/EM_FC_SortsOfFunctions.htm | 0
.../HelpFiles/EM_FC_Store_Restore.htm | 30 +-
.../HelpFiles/EM_FC_Sum_AddHHMembers.htm | 2 +-
.../HelpFiles/EM_FC_Sum_AddOn_Applic.htm | 0
.../EM_FC_Sum_AddOn_ExtensionSwitch.htm | 0
.../HelpFiles/EM_FC_Sum_AddOn_Func.htm | 0
.../HelpFiles/EM_FC_Sum_AddOn_Par.htm | 0
.../HelpFiles/EM_FC_Sum_AddOn_Pol.htm | 0
.../HelpFiles/EM_FC_Sum_Allocate.htm | 0
.../HelpFiles/EM_FC_Sum_ArithOp.htm | 0
.../HelpFiles/EM_FC_Sum_BenCalc.htm | 2 +-
.../HelpFiles/EM_FC_Sum_Break.htm | 0
.../HelpFiles/EM_FC_Sum_CallProgramme.htm | 0
.../HelpFiles/EM_FC_Sum_ChangeParam.htm | 0
.../HelpFiles/EM_FC_Sum_ChangeSwitch.htm | 0
.../HelpFiles/EM_FC_Sum_CommonParameters.htm | 0
.../HelpFiles/EM_FC_Sum_CumulativeSum.htm | 0
.../HelpFiles/EM_FC_Sum_DefConst.htm | 0
.../HelpFiles/EM_FC_Sum_DefIL.htm | 0
.../HelpFiles/EM_FC_Sum_DefInput.htm | 0
.../HelpFiles/EM_FC_Sum_DefOutput.htm | 0
.../HelpFiles/EM_FC_Sum_DefTU.htm | 28 +-
.../HelpFiles/EM_FC_Sum_DefVar.htm | 0
.../HelpFiles/EM_FC_Sum_DropUnit.htm | 0
.../HelpFiles/EM_FC_Sum_Elig.htm | 0
.../HelpFiles/EM_FC_Sum_ILVarOp.htm | 0
.../HelpFiles/EM_FC_Sum_IlArithOp.htm | 2 +-
.../HelpFiles/EM_FC_Sum_InitVars.htm | 0
.../HelpFiles/EM_FC_Sum_KeepUnit.htm | 2 +-
.../HelpFiles/EM_FC_Sum_Loop.htm | 0
.../HelpFiles/EM_FC_Sum_Max.htm | 0
.../HelpFiles/EM_FC_Sum_Min.htm | 0
.../HelpFiles/EM_FC_Sum_RandSeed.htm | 0
.../HelpFiles/EM_FC_Sum_Restore.htm | 6 +-
.../HelpFiles/EM_FC_Sum_Scale.htm | 0
.../HelpFiles/EM_FC_Sum_SchedCalc.htm | 2 +-
.../HelpFiles/EM_FC_Sum_SetDefault.htm | 0
.../HelpFiles/EM_FC_Sum_Store.htm | 0
.../HelpFiles/EM_FC_Sum_Totals.htm | 0
.../HelpFiles/EM_FC_Sum_UnitLoop.htm | 0
.../HelpFiles/EM_FC_Sum_UpdateTU.htm | 0
.../HelpFiles/EM_FC_Sum_Uprate.htm | 15 +-
.../HelpFiles/EM_FC_SummaryOfFunctions.htm | 0
.../HelpFiles/EM_FC_Totals.htm | 0
.../HelpFiles/EM_FC_Uprate.htm | 69 +-
.../HelpFiles/EM_FC_WhatAndHow.htm | 0
.../HelpFiles/EM_FC_WhatAreFunctions.htm | 10 +-
.../HelpFiles/EM_FS_Branding.htm | 0
.../HelpFiles/EM_FS_CommandLine.htm | 0
.../HelpFiles/EM_FS_ConfigurationFile.htm | 4 +-
.../HelpFiles/EM_FS_FileStructure.htm | 0
.../HelpFiles/EM_FS_HeaderPage.htm | 4 +-
.../HelpFiles/EM_FS_InstallingEuromod.htm | 28 +-
.../HelpFiles/EM_FS_OrganisationOfFiles.htm | 22 +-
.../HelpFiles/EM_FS_ParameterFiles.htm | 0
.../HelpFiles/EM_FS_Software.htm | 4 +-
.../HelpFiles/EM_FS_VariablesFile.htm | 0
.../HelpFiles/EM_VC_AddProject.htm | 4 +-
.../HelpFiles/EM_VC_AdminContent.htm | 2 +-
.../HelpFiles/EM_VC_AdminUsers.htm | 13 +-
.../HelpFiles/EM_VC_ConnectingProject.htm | 4 +-
.../HelpFiles/EM_VC_DownloadRelease.htm | 0
.../HelpFiles/EM_VC_FormsFunctions.htm | 0
.../HelpFiles/EM_VC_HeaderPage.htm | 2 +-
.../HelpFiles/EM_VC_LogInOut.htm | 0
.../HelpFiles/EM_VC_MergeTool.htm | 97 +-
.../EM_VC_NewBundleFromLocalVersion.htm | 2 +-
.../HelpFiles/EM_VC_RemoveBundles.htm | 0
.../HelpFiles/EM_VC_RemoveProject.htm | 0
.../HelpFiles/EM_VC_Settings.htm | 0
.../HelpFiles/EM_VC_StartFinishMerging.htm | 22 +-
.../HelpFiles/EM_VC_VarMergeTool.htm | 50 +-
.../HelpFiles/EM_VC_WFI_Admin.htm | 2 +-
.../HelpFiles/EM_VC_WFI_ConnectingProject.htm | 4 +-
.../EM_VC_WFI_DownloadingRelease.htm | 12 +-
.../HelpFiles/EM_VC_WFI_General.htm | 0
.../HelpFiles/EM_VC_WFI_GeneratingRelease.htm | 2 +-
.../HelpFiles/EM_WW_AddingCountries.htm | 4 +-
.../HelpFiles/EM_WW_AddingFunctions.htm | 12 +-
.../HelpFiles/EM_WW_AddingParameters.htm | 20 +-
.../HelpFiles/EM_WW_AddingPolicies.htm | 5 +-
.../HelpFiles/EM_WW_AddingSystems.htm | 2 +-
.../HelpFiles/EM_WW_AdminProjects.htm | 4 +-
.../EM_WW_AdministratingAcronyms.htm | 81 +
.../EM_WW_AdministratingVariables.htm | 62 +
.../HelpFiles/EM_WW_Administration.htm | 0
EuromodHelp/HelpFiles/EM_WW_Applications.htm | 33 +
.../HelpFiles/EM_WW_BackupRestore.htm | 12 +-
.../HelpFiles/EM_WW_Bookmarks.htm | 4 +-
.../HelpFiles/EM_WW_ChangingParameters.htm | 45 +-
.../HelpFiles/EM_WW_ChangingPolicyView.htm | 0
.../HelpFiles/EM_WW_ChangingSettings.htm | 0
.../HelpFiles/EM_WW_ChangingTBS.htm | 0
.../HelpFiles/EM_WW_CleaningSystems.htm | 0
.../HelpFiles/EM_WW_CleaningVariables.htm | 0
.../HelpFiles/EM_WW_ColumnChooser.htm | 13 +-
.../EM_WW_ComparingCountryVersions.htm | 89 +-
.../HelpFiles/EM_WW_ComparingSystems.htm | 0
EuromodHelp/HelpFiles/EM_WW_ComponentUse.htm | 50 +
.../HelpFiles/EM_WW_ConditionalFormatting.htm | 14 +-
.../HelpFiles/EM_WW_Configuration.htm | 16 +-
.../HelpFiles/EM_WW_ConfiguringDatasets.htm | 23 +-
.../HelpFiles/EM_WW_CopyingFunctions.htm | 8 +-
.../EM_WW_CopyingParameterValues.htm | 16 +-
.../HelpFiles/EM_WW_CopyingPolicies.htm | 17 +-
.../HelpFiles/EM_WW_CountriesNames.htm | 3 +-
.../HelpFiles/EM_WW_DecimalSeparator.htm | 0
.../HelpFiles/EM_WW_DefiningIndirectTaxes.htm | 0
.../EM_WW_DefiningUpratingFactors.htm | 159 +-
.../HelpFiles/EM_WW_DeletingCountries.htm | 4 +-
.../HelpFiles/EM_WW_DeletingFunctions.htm | 16 +-
.../HelpFiles/EM_WW_DeletingParameters.htm | 16 +-
.../HelpFiles/EM_WW_DeletingPolicies.htm | 12 +-
.../HelpFiles/EM_WW_DeletingSystems.htm | 0
.../EM_WW_DisplayingFunctionSpecifiers.htm | 2 +-
.../HelpFiles/EM_WW_EUROMODStatistics.htm | 46 +
.../HelpFiles/EM_WW_ExpandCollapse.htm | 0
.../HelpFiles/EM_WW_Extensions.htm | 2 +-
EuromodHelp/HelpFiles/EM_WW_FindingErrors.htm | 67 +
.../HelpFiles/EM_WW_Formatting.htm | 0
.../HelpFiles/EM_WW_FunctionOrder.htm | 9 +-
.../HelpFiles/EM_WW_Groups.htm | 0
.../HelpFiles/EM_WW_HeaderPage.htm | 0
.../HelpFiles/EM_WW_HidingRows.htm | 22 +-
.../EM_WW_HypotheticalHouseholdTool.htm | 46 +
.../HelpFiles/EM_WW_ImportingCountries.htm | 53 +
.../EM_WW_ImportingExportingAddOns.htm | 0
.../EM_WW_ImportingExportingSystems.htm | 0
.../HelpFiles/EM_WW_ImportingVariables.htm | 73 +
.../HelpFiles/EM_WW_KeyboardShortcuts.htm | 0
.../HelpFiles/EM_WW_Macrovalidation.htm | 37 +
.../HelpFiles/EM_WW_MatrixViewIncomelists.htm | 2 +-
.../HelpFiles/EM_WW_NewProject.htm | 20 +-
.../HelpFiles/EM_WW_NodesColour.htm | 10 +-
.../HelpFiles/EM_WW_OpenOutputFile.htm | 28 +
.../HelpFiles/EM_WW_OpenProject.htm | 12 +-
.../HelpFiles/EM_WW_ParameterPresentation.htm | 4 +-
.../HelpFiles/EM_WW_PathsAndExit.htm | 0
EuromodHelp/HelpFiles/EM_WW_Plugins.htm | 22 +
.../HelpFiles/EM_WW_PolicyEffects.htm | 27 +-
.../HelpFiles/EM_WW_PolicyOrder.htm | 10 +-
.../HelpFiles/EM_WW_PrivateComments.htm | 5 +-
.../HelpFiles/EM_WW_PublicVersion.htm | 4 +-
.../HelpFiles/EM_WW_RenamingSystems.htm | 4 +-
.../HelpFiles/EM_WW_RunDialog.htm | 98 +-
.../HelpFiles/EM_WW_SaveAsText.htm | 2 +-
.../HelpFiles/EM_WW_Saving.htm | 21 +-
.../HelpFiles/EM_WW_SavingVariables.htm | 0
EuromodHelp/HelpFiles/EM_WW_SearchReplace.htm | 91 +
.../HelpFiles/EM_WW_Searching.htm | 0
.../HelpFiles/EM_WW_Selecting.htm | 0
.../HelpFiles/EM_WW_SetPolicyPrivate.htm | 8 +-
.../HelpFiles/EM_WW_SummaryStatistics.htm | 0
.../HelpFiles/EM_WW_SystemOrder.htm | 0
.../HelpFiles/EM_WW_SystemSettings.htm | 6 +-
.../HelpFiles/EM_WW_TextSize.htm | 0
.../HelpFiles/EM_WW_Undo.htm | 3 +-
.../HelpFiles/EM_WW_UpdatingProgress.htm | 34 +-
.../HelpFiles/EM_WW_UsingHelp.htm | 5 +
EuromodHelp/HelpFiles/EM_WW_Variables.htm | 56 +
EuromodHelp/HelpFiles/EUROMODHelp.hhc | 844 +
.../HelpFiles/EUROMODHelp.hhp | 8 +-
.../HelpFiles/files/policy_effects_1.png | Bin
.../HelpFiles/files/policy_effects_2.png | Bin
.../HelpFiles/files/style.css | 0
.../HelpFiles/files/style_orig.css | 0
.../HelpFiles/files/style_pdf.css | 5 +
.../HelpStructure/AutoRunHelpMaker.xlsm | Bin
.../HelpStructure/EM_HelpSystem_Structure.xls | Bin 77824 -> 78848 bytes
.../Gaensefuesschen/Gaensefuesschen.exe | Bin 0 -> 8808 bytes
.../Gaensefuesschen/Gaensefuesschen.pdb | Bin
.../Gaensefuesschen/Gaensefuesschen.sln | 0
.../Gaensefuesschen/Gaensefuesschen.suo | Bin
.../Gaensefuesschen/Gaensefuesschen.csproj | 0
.../Gaensefuesschen.csproj.user | 0
.../Gaensefuesschen/Program.cs | 0
.../Properties/AssemblyInfo.cs | 0
.../HelpStructure/ReadMeAutoRunHelpMaker.txt | 0
.../InDepthHelpMaker/In-depthAnalysisHelp.hhc | 0
.../InDepthHelpMaker/In-depthAnalysisHelp.hhp | 6 +-
.../InDepthHelpMaker/InDepthHelpMaker.csproj | 12 +
.../InDepthHelpMaker/Program.cs | 11 +-
.../Settings_BaselinesReforms.htm | 3 +
.../InDepthHelpMaker/Settings_Breakdowns.htm | 98 +
.../InDepthHelpMaker/Settings_Categories.htm | 0
.../Settings_Distributional.htm | 3 +-
.../InDepthHelpMaker/Settings_Fiscal.htm | 0
.../Settings_InequalityPoverty.htm | 10 +-
.../InDepthHelpMaker/Settings_Main.htm | 0
.../InDepthHelpMaker/Tables.htm | 0
.../Tables_Distributional.htm | 17 +
.../Tables_Distributional_21.htm | 0
.../Tables_Distributional_22.htm | 0
.../Tables_Distributional_23.htm | 0
.../Tables_Distributional_24.htm | 0
.../Tables_Distributional_25.htm | 0
.../Tables_Distributional_26.htm | 0
.../Tables_Distributional_278.htm | 0
.../InDepthHelpMaker/Tables_Fiscal.htm | 0
.../InDepthHelpMaker/Tables_Fiscal_11.htm | 0
.../InDepthHelpMaker/Tables_Fiscal_12.htm | 0
.../InDepthHelpMaker/Tables_Fiscal_13.htm | 0
.../InDepthHelpMaker/Tables_Fiscal_14.htm | 0
.../Tables_InequalityPoverty.htm | 20 +-
.../Tables_InequalityPoverty_31.htm | 19 +-
.../Tables_InequalityPoverty_32.htm | 0
.../Tables_InequalityPoverty_33.htm | 0
.../Tables_InequalityPoverty_34.htm | 0
.../Tables_InequalityPoverty_35.htm | 0
.../Tables_InequalityPoverty_36.htm | 0
.../InDepthHelpMaker/style.css | 5 +
Notice.txt | 2 +-
.../UserSelectable/EUROMOD_1default.xml | 3754 ++-
.../UserSelectable/EUROMOD_2reform.xml | 2442 +-
.../UserSelectable/EUROMOD_3multi.xml | 1935 +-
changelog.txt | 121 +
vcapi/VCAPI.cs | 27 +-
534 files changed, 209192 insertions(+), 10785 deletions(-)
delete mode 100644 EM_Help/HelpFiles/EM_BC_Introduction.htm
delete mode 100644 EM_Help/HelpFiles/EM_BC_PresentationTaxBen.htm
delete mode 100644 EM_Help/HelpFiles/EM_BC_UserInterface.htm
delete mode 100644 EM_Help/HelpFiles/EM_FC_ParameterTypes.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_AdministratingAcronyms.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_AdministratingVariables.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_Applications.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_ComponentUse.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_FindingErrors.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_ImportingCountries.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_ImportingVariables.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_Plugins.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_SearchReplace.htm
delete mode 100644 EM_Help/HelpFiles/EM_WW_Variables.htm
delete mode 100644 EM_Help/HelpFiles/EUROMODHelp.hhc
delete mode 100644 EM_Help/HelpStructure/Gaensefuesschen/Gaensefuesschen.exe
create mode 100644 EM_Libraries/EM_Common/Definitions/InDepthDefinitions.cs
delete mode 100644 EM_Libraries/EM_CommonMSWin/Properties/GlobalSuppressions.cs
delete mode 100644 EM_Libraries/EM_Crypt/EM_Crypt.cs
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/.nupkg.metadata
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/.signature.p7s
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/bouncycastle.netcore.1.8.6.nupkg
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/bouncycastle.netcore.1.8.6.nupkg.sha512
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/bouncycastle.netcore.nuspec
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/lib/Mono/BouncyCastle.Crypto.xml
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/lib/MonoAndroid/BouncyCastle.Crypto.xml
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/lib/MonoMac/BouncyCastle.Crypto.xml
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/lib/MonoTouch/BouncyCastle.Crypto.xml
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/lib/net20/BouncyCastle.Crypto.xml
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/lib/netstandard2.0/BouncyCastle.Crypto.xml
create mode 100644 EM_Libraries/EM_Crypt/packages/bouncycastle.netcore/1.8.6/lib/xamarinios/BouncyCastle.Crypto.xml
create mode 100644 EM_Libraries/EM_Statistics/Classes/PrettyInfo/PrettyInfo_BaseCountryShort.cs
create mode 100644 EM_Libraries/EM_Statistics/Classes/PrettyInfo/PrettyInfo_BaseSysList.cs
create mode 100644 EM_Libraries/EM_Statistics/ExternalStatistics/ExternalStatistic.cs
create mode 100644 EM_Libraries/EM_Statistics/ExternalStatistics/ExternalStatisticAggregate.cs
create mode 100644 EM_Libraries/EM_Statistics/ExternalStatistics/ExternalStatisticDistributional.cs
create mode 100644 EM_Libraries/EM_Statistics/ExternalStatistics/IlVarInfo.cs
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/BaselineReform/BaselineReformPackage.cs (86%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/BaselineReform/SelectBaselinesReforms.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/BaselineReform/SelectBaselinesReforms.cs (89%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/BaselineReform/SelectBaselinesReforms.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/BaselineReform/SystemInfo.cs (85%)
create mode 100644 EM_Libraries/EM_Statistics/InDepthAnalysis/Help.chm
create mode 100644 EM_Libraries/EM_Statistics/InDepthAnalysis/Helpers/Breakdowns.cs
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Helpers/CategoryDescriptionsForm.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Helpers/CategoryDescriptionsForm.cs (74%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Helpers/CategoryDescriptionsForm.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Helpers/EMVarInfo.cs (98%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Helpers/FormulaEditor.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Helpers/MergedDatasetWriter.cs (99%)
create mode 100644 EM_Libraries/EM_Statistics/InDepthAnalysis/InDepthAnalysis.cs
create mode 100644 EM_Libraries/EM_Statistics/InDepthAnalysis/InDepthAnalysis.ico
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/InDepthAnalysisForm.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/InDepthAnalysisForm.cs (95%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/InDepthAnalysisForm.resx (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/ISettings.cs (88%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/Settings.cs (85%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsDistributional.Designer.cs (93%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsDistributional.cs (79%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsDistributional.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsFiscal.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsFiscal.cs (89%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsFiscal.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsInequalityAndPoverty.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsInequalityAndPoverty.cs (78%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/InDepthAnalysis/Settings/SettingsInequalityAndPoverty.resx (100%)
create mode 100644 EM_Libraries/EM_Statistics/InDepthAnalysis/Settings/SettingsMacrovalidation.cs
rename EM_Plugins/StatisticsPresenter/StatisticsPresenter.ico => EM_Libraries/EM_Statistics/Resources/EUROMODStatistics.ico (100%)
rename {EM_Plugins/InDepthAnalysis => EM_Libraries/EM_Statistics/Resources}/InDepthAnalysis.ico (100%)
rename {EM_Plugins/InDepthAnalysis => EM_Libraries/EM_Statistics}/Resources/InDepthAnalysis.xml (75%)
create mode 100644 EM_Libraries/EM_Statistics/Resources/Macrovalidation.xml
create mode 100644 EM_Libraries/EM_Statistics/Resources/StatisticsPresenter.ico
rename {EM_Plugins/StatisticsPresenter => EM_Libraries/EM_Statistics}/Resources/dummy.html (100%)
rename {EM_Plugins/InDepthAnalysis => EM_Libraries/EM_Statistics}/Resources/existing.png (100%)
rename {EM_Plugins/InDepthAnalysis => EM_Libraries/EM_Statistics}/Resources/missing.png (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/PresenterForm.Designer.cs (98%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/PresenterForm.cs (95%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/PresenterForm.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectBaseAltsForm.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectBaseAltsForm.cs (94%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectBaseAltsForm.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectDefaultTemplateComboForm.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectDefaultTemplateComboForm.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectDefaultTemplateComboForm.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectFilesForm.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectFilesForm.cs (92%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectFilesForm.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectPackagesForm.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectPackagesForm.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/SelectPackagesForm.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/ShowInfoForm.Designer.cs (98%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/ShowInfoForm.cs (94%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/ShowInfoForm.resx (100%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/StatisticsPresenter.cs (81%)
create mode 100644 EM_Libraries/EM_Statistics/StatisticsPresenter/StatisticsPresenter.ico
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/TakeUserInput.Designer.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/TakeUserInput.cs (99%)
rename {EM_Plugins => EM_Libraries/EM_Statistics}/StatisticsPresenter/TakeUserInput.resx (100%)
create mode 100644 EM_Libraries/EM_XmlHandler/Executable/ExeXmlReader_ReadCAO/GetExtStatInfo.cs
rename EM_Plugins/Hypothetical Household/{OpenProjectForm.Designer.cs => SelectFolderForm.Designer.cs} (99%)
rename EM_Plugins/Hypothetical Household/{OpenProjectForm.cs => SelectFolderForm.cs} (79%)
rename EM_Plugins/Hypothetical Household/{OpenProjectForm.resx => SelectFolderForm.resx} (100%)
delete mode 100644 EM_Plugins/InDepthAnalysis/Help.chm
delete mode 100644 EM_Plugins/InDepthAnalysis/InDepthAnalysis.cs
delete mode 100644 EM_Plugins/InDepthAnalysis/InDepthAnalysis.csproj
delete mode 100644 EM_Plugins/InDepthAnalysis/InDepthHelpMaker/InDepthHelpMaker.csproj
delete mode 100644 EM_Plugins/InDepthAnalysis/Properties/AssemblyInfo.cs
delete mode 100644 EM_Plugins/InDepthAnalysis/Properties/Resources.Designer.cs
delete mode 100644 EM_Plugins/InDepthAnalysis/app.config
delete mode 100644 EM_Plugins/StatisticsPresenter/App.config
delete mode 100644 EM_Plugins/StatisticsPresenter/Properties/AssemblyInfo.cs
delete mode 100644 EM_Plugins/StatisticsPresenter/Resources.Designer.cs
delete mode 100644 EM_Plugins/StatisticsPresenter/Resources.resx
delete mode 100644 EM_Plugins/StatisticsPresenter/StatisticsPresenter.csproj
delete mode 100644 EM_Plugins/StatisticsPresenter/packages.config
create mode 100644 EM_UI/Dialogs/Tools/ChooseStatistics.Designer.cs
create mode 100644 EM_UI/Dialogs/Tools/ChooseStatistics.cs
rename EM_UI/{VersionControl/Dialogs/VCChangePassword.resx => Dialogs/Tools/ChooseStatistics.resx} (96%)
create mode 100644 EM_UI/Dialogs/Tools/MacrovalidationForm.Designer.cs
create mode 100644 EM_UI/Dialogs/Tools/MacrovalidationForm.cs
create mode 100644 EM_UI/Dialogs/Tools/MacrovalidationForm.resx
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffects.Asc.cs (98%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffects.Designer.cs (99%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffects.cs (99%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffects.resx (100%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsAlphaRange.Designer.cs (99%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsAlphaRange.cs (99%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsAlphaRange.resx (100%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsChooseMode.Designer.cs (99%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsChooseMode.cs (97%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsChooseMode.resx (100%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsEM2.cs (99%)
rename EM_UI/Dialogs/{ => Tools/PET}/PolicyEffectsEM3.cs (99%)
create mode 100644 EM_UI/ExternalStatistics/ExternalStatisticUtil.cs
create mode 100644 EM_UI/ExternalStatistics/ExternalStatisticsAction.cs
create mode 100644 EM_UI/ExternalStatistics/ExternalStatisticsComponent.cs
create mode 100644 EM_UI/ExternalStatistics/ExternalStatisticsForm.Designer.cs
create mode 100644 EM_UI/ExternalStatistics/ExternalStatisticsForm.cs
rename EM_Plugins/InDepthAnalysis/Properties/Resources.resx => EM_UI/ExternalStatistics/ExternalStatisticsForm.resx (58%)
create mode 100644 EM_UI/Icons/FunctionInconsistent.png
create mode 100644 EM_UI/Icons/Macrovalidation.ico
create mode 100644 EM_UI/Icons/PrivateFunctionInconsistent.png
create mode 100644 EM_UI/Icons/PrivateParameterInconsistent.png
create mode 100644 EM_UI/Icons/blueballInconsistent.png
create mode 100644 EM_UI/Icons/intelli-image-3.png
create mode 100644 EM_UI/Icons/intelli-image-4.png
create mode 100644 EM_UI/Resources/EUROMODStatistics.ico
create mode 100644 EM_UI/Resources/InDepthAnalysis.ico
create mode 100644 EM_UI/Resources/InDepthAnalysis.png
create mode 100644 EM_UI/Resources/StatisticsPresenter.png
delete mode 100644 EM_UI/VersionControl/Dialogs/VCChangePassword.Designer.cs
delete mode 100644 EM_UI/VersionControl/Dialogs/VCChangePassword.cs
rename {EM_Help => EuromodHelp}/EUROMOD_HelpOnHelp.docx (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_BC_InOut.htm (100%)
create mode 100644 EuromodHelp/HelpFiles/EM_BC_Introduction.htm
create mode 100644 EuromodHelp/HelpFiles/EM_BC_PresentationTaxBen.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_BC_Terminology.htm (97%)
create mode 100644 EuromodHelp/HelpFiles/EM_BC_UserInterface.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_AddHHMembers.htm (99%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_AddOn_Applic_AddOn_Pol_AddOn_Func_AddOn_Par.htm (86%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_AddOn_ExtensionSwitch.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Allocate.htm (99%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_ArithOp.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_BenCalc.htm (80%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Break.htm (88%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_CallProgramme.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_ChangeLog.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_ChangeParam.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_ChangeSwitch.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_CommonParameters.htm (77%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_CumulativeSum.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_DefIL.htm (97%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_DefInput.htm (99%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_DefOutput.htm (99%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_DefTU_UpdateTU.htm (84%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_DefVar_DefConst.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_DescriptionOfFunctions.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_DropUnit_KeepUnit.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Elig.htm (87%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_FootnoteParameters.htm (80%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Formula.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_GeneralFeatures.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_HeaderPage.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_ILVarOp.htm (99%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_IlArithOp.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_InitVars.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_InteractionsBetweenFunctions.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Loop_UnitLoop.htm (97%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Min_Max.htm (86%)
create mode 100644 EuromodHelp/HelpFiles/EM_FC_ParameterTypes.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_ParameterValues.htm (80%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Placeholders.htm (91%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Queries.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_RandSeed.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Scale.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_SchedCalc.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_SetDefault.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_SortsOfFunctions.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Store_Restore.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_AddHHMembers.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_AddOn_Applic.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_AddOn_ExtensionSwitch.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_AddOn_Func.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_AddOn_Par.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_AddOn_Pol.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Allocate.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_ArithOp.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_BenCalc.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Break.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_CallProgramme.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_ChangeParam.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_ChangeSwitch.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_CommonParameters.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_CumulativeSum.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_DefConst.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_DefIL.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_DefInput.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_DefOutput.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_DefTU.htm (85%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_DefVar.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_DropUnit.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Elig.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_ILVarOp.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_IlArithOp.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_InitVars.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_KeepUnit.htm (97%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Loop.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Max.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Min.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_RandSeed.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Restore.htm (85%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Scale.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_SchedCalc.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_SetDefault.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Store.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Totals.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_UnitLoop.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_UpdateTU.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Sum_Uprate.htm (88%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_SummaryOfFunctions.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Totals.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_Uprate.htm (83%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_WhatAndHow.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FC_WhatAreFunctions.htm (96%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_Branding.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_CommandLine.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_ConfigurationFile.htm (97%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_FileStructure.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_HeaderPage.htm (96%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_InstallingEuromod.htm (61%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_OrganisationOfFiles.htm (82%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_ParameterFiles.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_Software.htm (91%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_FS_VariablesFile.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_AddProject.htm (90%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_AdminContent.htm (94%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_AdminUsers.htm (89%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_ConnectingProject.htm (92%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_DownloadRelease.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_FormsFunctions.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_HeaderPage.htm (96%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_LogInOut.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_MergeTool.htm (80%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_NewBundleFromLocalVersion.htm (93%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_RemoveBundles.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_RemoveProject.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_Settings.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_StartFinishMerging.htm (90%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_VarMergeTool.htm (84%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_WFI_Admin.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_WFI_ConnectingProject.htm (95%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_WFI_DownloadingRelease.htm (88%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_WFI_General.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_VC_WFI_GeneratingRelease.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_AddingCountries.htm (86%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_AddingFunctions.htm (79%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_AddingParameters.htm (91%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_AddingPolicies.htm (85%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_AddingSystems.htm (95%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_AdminProjects.htm (92%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_AdministratingAcronyms.htm
create mode 100644 EuromodHelp/HelpFiles/EM_WW_AdministratingVariables.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Administration.htm (100%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_Applications.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_BackupRestore.htm (87%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Bookmarks.htm (91%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ChangingParameters.htm (87%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ChangingPolicyView.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ChangingSettings.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ChangingTBS.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_CleaningSystems.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_CleaningVariables.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ColumnChooser.htm (79%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ComparingCountryVersions.htm (64%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ComparingSystems.htm (100%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_ComponentUse.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ConditionalFormatting.htm (93%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Configuration.htm (83%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ConfiguringDatasets.htm (87%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_CopyingFunctions.htm (90%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_CopyingParameterValues.htm (92%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_CopyingPolicies.htm (90%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_CountriesNames.htm (96%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DecimalSeparator.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DefiningIndirectTaxes.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DefiningUpratingFactors.htm (64%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DeletingCountries.htm (82%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DeletingFunctions.htm (73%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DeletingParameters.htm (71%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DeletingPolicies.htm (74%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DeletingSystems.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_DisplayingFunctionSpecifiers.htm (96%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_EUROMODStatistics.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ExpandCollapse.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Extensions.htm (99%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_FindingErrors.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Formatting.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_FunctionOrder.htm (88%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Groups.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_HeaderPage.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_HidingRows.htm (94%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_HypotheticalHouseholdTool.htm
create mode 100644 EuromodHelp/HelpFiles/EM_WW_ImportingCountries.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ImportingExportingAddOns.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ImportingExportingSystems.htm (100%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_ImportingVariables.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_KeyboardShortcuts.htm (100%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_Macrovalidation.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_MatrixViewIncomelists.htm (90%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_NewProject.htm (84%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_NodesColour.htm (77%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_OpenOutputFile.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_OpenProject.htm (87%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_ParameterPresentation.htm (97%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_PathsAndExit.htm (100%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_Plugins.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_PolicyEffects.htm (85%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_PolicyOrder.htm (83%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_PrivateComments.htm (89%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_PublicVersion.htm (98%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_RenamingSystems.htm (90%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_RunDialog.htm (84%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_SaveAsText.htm (97%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Saving.htm (88%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_SavingVariables.htm (100%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_SearchReplace.htm
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Searching.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Selecting.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_SetPolicyPrivate.htm (66%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_SummaryStatistics.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_SystemOrder.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_SystemSettings.htm (94%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_TextSize.htm (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_Undo.htm (88%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_UpdatingProgress.htm (90%)
rename {EM_Help => EuromodHelp}/HelpFiles/EM_WW_UsingHelp.htm (78%)
create mode 100644 EuromodHelp/HelpFiles/EM_WW_Variables.htm
create mode 100644 EuromodHelp/HelpFiles/EUROMODHelp.hhc
rename {EM_Help => EuromodHelp}/HelpFiles/EUROMODHelp.hhp (96%)
rename {EM_Help => EuromodHelp}/HelpFiles/files/policy_effects_1.png (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/files/policy_effects_2.png (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/files/style.css (100%)
rename EM_Plugins/InDepthAnalysis/InDepthHelpMaker/style.css => EuromodHelp/HelpFiles/files/style_orig.css (100%)
rename {EM_Help => EuromodHelp}/HelpFiles/files/style_pdf.css (98%)
rename {EM_Help => EuromodHelp}/HelpStructure/AutoRunHelpMaker.xlsm (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/EM_HelpSystem_Structure.xls (59%)
create mode 100644 EuromodHelp/HelpStructure/Gaensefuesschen/Gaensefuesschen.exe
rename {EM_Help => EuromodHelp}/HelpStructure/Gaensefuesschen/Gaensefuesschen.pdb (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/Gaensefuesschen/Gaensefuesschen.sln (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/Gaensefuesschen/Gaensefuesschen.suo (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/Gaensefuesschen/Gaensefuesschen/Gaensefuesschen.csproj (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/Gaensefuesschen/Gaensefuesschen/Gaensefuesschen.csproj.user (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/Gaensefuesschen/Gaensefuesschen/Program.cs (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/Gaensefuesschen/Gaensefuesschen/Properties/AssemblyInfo.cs (100%)
rename {EM_Help => EuromodHelp}/HelpStructure/ReadMeAutoRunHelpMaker.txt (100%)
rename EM_Plugins/InDepthAnalysis/InDepthHelpMaker/Help.hhc => EuromodHelp/InDepthHelpMaker/In-depthAnalysisHelp.hhc (100%)
rename EM_Plugins/InDepthAnalysis/InDepthHelpMaker/Help.hhp => EuromodHelp/InDepthHelpMaker/In-depthAnalysisHelp.hhp (88%)
create mode 100644 EuromodHelp/InDepthHelpMaker/InDepthHelpMaker.csproj
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Program.cs (83%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Settings_BaselinesReforms.htm (74%)
create mode 100644 EuromodHelp/InDepthHelpMaker/Settings_Breakdowns.htm
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Settings_Categories.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Settings_Distributional.htm (94%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Settings_Fiscal.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Settings_InequalityPoverty.htm (85%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Settings_Main.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional.htm (66%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional_21.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional_22.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional_23.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional_24.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional_25.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional_26.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Distributional_278.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Fiscal.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Fiscal_11.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Fiscal_12.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Fiscal_13.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_Fiscal_14.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_InequalityPoverty.htm (85%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_InequalityPoverty_31.htm (66%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_InequalityPoverty_32.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_InequalityPoverty_33.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_InequalityPoverty_34.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_InequalityPoverty_35.htm (100%)
rename {EM_Plugins/InDepthAnalysis => EuromodHelp}/InDepthHelpMaker/Tables_InequalityPoverty_36.htm (100%)
rename EM_Help/HelpFiles/files/style_orig.css => EuromodHelp/InDepthHelpMaker/style.css (98%)
create mode 100644 changelog.txt
diff --git a/Components description and instructions to configure and run the EUROMOD source code.txt b/Components description and instructions to configure and run the EUROMOD source code.txt
index 991dc7d..1ef3a61 100644
--- a/Components description and instructions to configure and run the EUROMOD source code.txt
+++ b/Components description and instructions to configure and run the EUROMOD source code.txt
@@ -1,5 +1,4 @@
-EUROMOD (website: https://euromod-web.jrc.ec.europa.eu/ contact: JRC-EUROMOD@ec.europa.eu ) is a tax-benefit microsimulation model for the European Union and the UK that enables researchers and policy analysts to calculate,
-in a comparable manner, the effects of taxes and benefits on household incomes and work incentives for the population of each country and for the EU as a whole.
+EUROMOD (website: https://euromod-web.jrc.ec.europa.eu/ contact: JRC-EUROMOD@ec.europa.eu ) is a tax-benefit microsimulation model for the European Union that enables researchers and policy analysts to calculate, in a comparable manner, the effects of taxes and benefits on household incomes and work incentives for the population of each country and for the EU as a whole.
EUROMOD comprises a user interface, an executable, plugins and a specific file structure. This repository includes the source code of the software (user interface, executable, plugins and some additional libraries and files).
@@ -14,22 +13,15 @@ Elements included in the EUROMOD software source code:
- EM_Executable
- EM_ExecutableCaller
- EM_Transformer
-- EM_Help: EUROMOD help files.
+- EuromodHelp: EUROMOD help files.
- EM_Libraries: Libraries which are used in other components.
- EM_Plugins:
- Hypothetical Household: The Hypothetical Household Tool (HHoT) is a EUROMOD plugin for designing hypothetical households and generating data according to the chosen household characteristics.
This hypothetical household data can then be used to estimate the effects of taxes and benefits on household disposable income.
- Income List Components: The Income List Components plugin extracts information about the income lists used in the selected countries/years. In particular, it visualises the components of the income list.
- - StatisticsPresenter: The Statistics Presenter plugin is an analysis tool that produces a fixed set of statistics on income distribution based on (a) EUROMOD output file(s).
- VariablesChecker: The Variables Checker plugin provides methods for validating the EUROMOD variables file.
- Web Statistics: it generates summary tables with the baseline estimates on the distribution of different income components (from market income to disposable income)
as well as on the incidence of taxes and benefits across decile income groups. It also provides summary statistics on income inequality and poverty indicators, as well as on marginal effective tax rates.
- - In-depth Analysis: The In-depth Analysis plugin is an advanced Statistics presenter which provides additional indicators and allow extra flexibility in the definition of variables and population groups.
- The In-depth Analysis plugin was developed as a part of the project “Support for the Microsimulation Hub of the Council of Economic Advisors in Greece”,
- funded by the European Commission’s Structural Reform Support Programme and implemented by the Joint Research Centre
- through an administrative arrangement with DG REFORM. All parties agreed to incorporate the plugin to EUROMOD, which implies
- the public distribution of its compiled version under the EUROMOD End-user licence agreement and its source code under the European Union
- Public Licence (EUPL-1.2) or a later version of this licence.
- EM_UI: EUROMOD user interface.
- Executable: Source code of the EM2 executable (EUROMOD calculator engine EM2).
- externallibs: Ionic.Zip.dll (and Readme.txt) which are used in EUROMOD.
@@ -44,17 +36,27 @@ This software is not open source and it is not provided together with EUROMOD.
- Clone the repository.
- Make sure a valid version of DevExpress is installed in the machine.
-- Generate the help file (otherwise EUROMOD will display an error). In order to do so:
+- Generate the EUROMOD help file (otherwise EUROMOD will display an error). In order to do so:
1. Create a folder named "bin" in \EM_UI.
2. Create a folder named "help" in \EM_UI\bin\
3. Double click on the file \EM_HELP\HelpStructure\AutoRunHelpMaker.xlsm. This file contains a macro which will be automatically run when opening the files. Macros should be enabled.
This macro will create the EUROMOD help in the folder \EM_UI\bin\help which has been previously created.
The macro will use Microsoft HTML Help Workshop and it will expect it to be installed in
C:\Program Files (x86)\HTML Help Workshop\hhc.exe. This software is property of Microsoft and it is not provided together with EUROMOD.
-
+
+- Generate the In-depth help file (otherwise EUROMOD will display an error). In order to do so:
+ 1. Create a folder named "bin" in \EM_UI (if it does not exist).
+ 2. Create a folder named "help" in \EM_UI\bin\ (if it does not exist)
+ 3. Open the “InDepthHelpMaker” project in Visual Studio, build it and execute it. This will use the existing source files in “EuromodHelp\InDepthHelpMaker\” to generate the “In-depthAnalysisHelp.chm” file in the same folder. Once the help file is generated, you will need to manually move it in “\EM_UI\bin\help\”.
+ This project will use Microsoft HTML Help Workshop and it will expect it to be installed in C:\Program Files (x86)\HTML Help Workshop\hhc.exe. This software is property of Microsoft and it is not provided together with EUROMOD.
+
- Double click on the solution file EUROMOD development.sln to open the solution.
- Build the solution by selecting the Solution Configuration Debug and EM_UI.
- Start the solution.
-Note: In order to run the previous version of EUROMOD (EM2), the project under \Executable\core-executable needs to be compiled and the EUROMOD.exe
+Notes:
+
+- In order to run the previous version of EUROMOD (EM2), the project under \Executable\core-executable needs to be compiled and the EUROMOD.exe
file needs to be copied to \EM_UI\bin\x64\executable.
+
+- In order to use Statistics presenter, the templates from \Supporting Material\EM Templates\UserSelectable need to be copied to C:\ProgramData\EUROMOD\UserSelectableTemplates (folder "UserSelectableTemplates" needs to be created first).
diff --git a/EM_Help/HelpFiles/EM_BC_Introduction.htm b/EM_Help/HelpFiles/EM_BC_Introduction.htm
deleted file mode 100644
index 78e457d..0000000
--- a/EM_Help/HelpFiles/EM_BC_Introduction.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-EUROMOD Basic Concepts
-
-
-
-
-
-
-
EUROMOD Basic Concepts
-
-
What is EUROMOD?
-
-
EUROMOD is a tax-benefit microsimulation model for the European Union (EU) that enables researchers and policy analysts to calculate, in a comparable manner, the effects of taxes and benefits on household incomes and work incentives for the population of each country and for the EU as a whole. As well as calculating the effects of actual policies it is also used to evaluate the effects of tax-benefit policy reforms and other changes on poverty, inequality, incentives and government budgets.
-
-
What can EUROMOD do?
-
-
EUROMOD can be used in many different ways in different contexts. Examples include:
-
-
Standard
-
-
-
Estimation of poverty, inequality and redistribution statistics under actual conditions, previous or future tax-benefit rules
-
-
Budgetary effects
-
-
Effects of simple tax-benefit policy reforms (or illustrative changes to household composition and original income)
-
-
"Model family" calculations
-
-
Indicators of work incentives
-
-
More advanced
-
-
Complex policy reforms (e.g. effects of revenue-neutral changes to tax rates and social insurance regulations)
-
-
Policy swapping between countries (i.e. effects on country A of adopting a policy measure currently effective in country B) Generation of budget sets as input to labour supply or other models of behaviour change Generation of counterfactual income to answer "what if" questions Assessing effects and costs of EU-wide policy reforms.
-
-
Data imputation
-
-
Generation of gross income (by source) from net, or vice versa
Clicking a flag in the user interface's Countries ribbon opens EUROMOD's representation of the respective
-country's tax-benefit system. The countrys name and flag is shown right of the
-Run EUROMOD button, to indicate which
-country is loaded. Further countries can be loaded by clicking their flags.
-Each country is represented in its own window and one can switch between these
-windows by again clicking the respective flag or via the Windows taskbar.
-
-
The EUROMOD spine
-
-
The main part of the window displays the representation of
-the country's tax-benefit system - at the time of opening in a collapsed state.
-Thus it shows what in EUROMOD lingo is frequently referred to as the spine. The EUROMOD spine is the list of policies worked off in sequence when the
-model performs its calculations. The term policies
-refers as well to policies in a narrow sense, i.e. benefits and taxes, as to
-special EUROMOD policies. These special policies for example define which
-variables are contained in the output. See Special
-EUROMOD policies below for further information. Each row of the spine
-represents one policy.
-
-
EUROMOD policies, functions and parameters
-
-
Expanding a policy by clicking the little plus button left of the policy's
-name allows viewing the implementation of the policy. A policy is implemented
-by so-called functions. Each EUROMOD
-function is a self-contained building block that has its own parameters and represents
-a particular component of the respective policy. A typical social assistance
-benefit may for example be implemented by a function that determines
-eligibility for the benefit and a function that calculates the benefit amount
-for all eligible units. In fact these two functions: a function that determines
-eligibility/liability for benefits/taxes in a very general way and a function
-that calculates a wide range of benefits/taxes are the two most frequently used
-functions in EUROMOD. The purpose of using functions as building blocks of the
-model is to provide a general structure, which can be seen as using a
-standardised language to describe policy instruments. Once EUROMOD users are
-accustomed to this language, their understanding of other (foreign) countries'
-benefits and taxes, and how they are implemented in EUROMOD, improves
-considerably. The parameters of a function can be viewed by expanding it using
-the little plus button left of its
-name. The section EUROMOD Functions gives a
-detailed description of EUROMOD functions, including their use, the specific
-behaviour and the parameters they provide to guide this behaviour. Expanded
-policies and functions can be re-collapsed by the little minus buttons. Note that the policy and function worked on is
-displayed in the status bar.
-
-
EUROMOD systems
-
-
The changes of a country's tax-benefit system over time are
-captured by EUROMOD systems. A
-EUROMOD system either reflects the tax-benefit rules for a specific policy year
-(assuming annual adaptations of tax-benefit rules) or the rules for an actual
-(planned) or imaginary reform scenario. The columns of the country's view
-represent these EUROMOD systems. Thus the value of a specific parameter (e.g.
-the rate of a particular tax band) for specific systems is defined at the
-intersection points of the parameter's row and the respective systems' columns
-(e.g. may take the value of 10% for the 2009-system and the value of 11% for
-the 2010-system).
-
-
The fact that policy reforms are not always as simple as
-changing the value of a specific parameter is taken into account by so called switches. The intersection points of
-policies and functions with the systems represent these switches, i.e. they allow to switch policies and functions on or
-off dependent on the system. The switches
-also provide the settings n/a,
-standing for not applicable, and toggle,
-standing for temporarily switched off. More detailed explanations of these
-settings can be found in the section EUROMOD
-Functions - Common Parameters.
-
-
Special EUROMOD policies
-
-
As mentioned above, the EUROMOD spine comprises policies,
-which do not describe e.g. a tax or benefit. Instead they implement
-definitions, which are necessary for the model's calculation.
-
-
-
The policy ILDef_cc contains
-definitions of so called incomelists.
-Technically an incomelist is the aggregate of several variables, which are
-added or subtracted to build the aggregate. The term "income"list
-indicates that the most common applications of this (important EUROMOD) concept
-are income definitions, for example disposable income, taxable income, etc.
-
-
The policy TUDef_cc contains
-definitions of assessment units, which are in EUROMOD sometimes referred to as tax units (and are another important
-EUROMOD concept). Many taxes and especially benefits do not concern single
-individuals, but refer to bigger units, for example some sort of family
-definition. Assessment units allow for such definitions by specifying who
-belongs to the unit, who is a child, etc.
-
-
Datasets are usually used for
-implementing several systems, by up-dating monetary values to the corresponding
-year. The policy Uprate_cc contains such up-dating of monetary dataset
-variables.
The listed policies are standard, that means they are
-implemented for each country contained in EUROMOD. Some countries contain
-further special policies like for example ConstDef_cc,
-which defines basic values, which are used all over the implementation, e.g.
-minimum income amount, pension age, etc.
-
-
Technically there is no difference between special policies
-and standard policies, both use functions for their implementation and both
-need to be listed in the spine to be performed. Thus calling them special is
-just a matter of better comprehensibility. Moreover, the functions, which are in
-principle dedicated for the implementation of a special policy, like the
-function DefIL for the policy ILDef_cc, can be used in any other
-policy as well, if this seems appropriate.
The EUROMOD user interface is the central accession point of
-the model. Its purpose is to help users to orientate themselves within the
-options provided by the model and around the model.
-
-
The user interface's main window shows the following
-components:
-
-
The ribbon Countries is filled with flags for the implemented
- countries. The flags can be clicked to access the EUROMOD parameters of the
- respective country. EUROMOD parameters store the information the model needs
- for its calculations. How the user interface presents this information is
- explained in Presentation of countries'
- tax-benefit-systems.
The ribbon Country Tools enables access to a number of dialogs, which support working with a
- country's parameters. These dialogs allow for
-
-
configuring country settings (e.g. name, short
- name), system settings (e.g. currency, exchange rate to Euro) and the input
- datasets which can be used for simulating the country's tax benefit system (see
- section Working with EUROMOD - Changing
- Countries' Settings),
-
offer a number of search tools, which - besides
- allowing for standard searching and replacing - facilitate finding errors and
- assessing if and where certain EUROMOD components (e.g. variables) are used in
- the respective country's parameters (see section Working with EUROMOD - Searching),
-
offer a number of
- formatting tools, e.g. highlighting with colours and setting bookmarks (see
- section Working with EUROMOD -
- Formatting).
-
-
The ribbon Administration Tools enables
- access to dialogs which allow for:
The ribbon Applications enables access to
- a number of tools, which allow for analysing the EUROMOD output, respectively
- preparing the EUROMOD input (see section Working with EUROMOD - Applications). They comprise
-
-
a tool for generating simple summary statistics,
-
a tool for generating budget constraints,
-
a tool for generating hypothetical input data.
-
-
The main menu left of the Run EUROMOD button contains functionalities like saving countries'
- parameters, opening projects, changing configuration, getting help and
- information as well as exiting the programme. These functionalities are
- described at appropriate points in the section Working with EUROMOD.
Apart
-from classifying parameters with respect to their functionality (i.e. affecting
-output, limiting result, etc.) or into compulsory/optional, there is another
-possible grouping. Parameters can be classified by the values they take as
-follows:
-
-
Yes/no parameters
-
-
Such parameters allow only for two values: yes (or 1) and no (or 0).
-
-
Amount parameters
-
-
Amount parameters take either monetary or non-monetary
-amounts. Example 1 shows the tax schedule of a simple income tax policy. There
-are two bands: one for taxable income below 5,000 Euro annually and one for
-income above this amount. For the first band a tax of 10% of taxable income is
-due, for the second the rate is 25%. The parameters band_uplim and band_rate are amount parameters, where the former
-takes monetary amounts and the latter non-monetary amounts.[1]
-
-
-
Example 1:
-
-
Policy
-
Grp/No
-
SL_demo
-
Comment
-
-
-
SchedCalc
-
-
on
-
tax schedule
-
-
-
base
-
-
il_taxableY
-
-
-
-
band_upLim
-
1
-
5000#y
-
for annual taxable income up to 5,000
-
-
-
band_rate
-
1
-
0.1
-
the tax amounts to 10% of taxable income
-
-
-
band_rate
-
2
-
0.25
-
and 25% for income above this amount
-
-
-
output_var
-
-
tin_s
-
-
-
-
TAX_UNIT
-
-
tu_individual_sl
-
-
-
-
-
Usually amount parameter values are
-followed by their "period", for example the band limit of 5000 is
-followed by #y for yearly. EUROMOD internally converts
-all amounts to monthly, e.g. the 5000 are divided by 12. It is good practise to
-always indicate a period, though #m for monthly has
-no real effect, as no conversion to monthly is necessary. It is however more
-transparent to explicitly state whether amounts are annual, monthly or some
-other period. Of course there are amounts where a period does not make sense,
-as for example for the two rate parameters or capital values.
-
-
The period can take on the following values:
-
-
#m for monthly (no conversion)
-
#y for yearly (divided by 12, more precisely multiplied by 0.08333333333333)
-
#q for quarterly (divided by 3, more precisely multiplied by 0.3333333333333)
-
#w for weekly (multiplied by 4.34 =365/12/7)
-
#d for daily (multiplied by 30.5)
-
#l for labour day (multiplied by 21.73)
-
#s for labour day in a six days week (multiplied by 26.07)
-
#c for capital (no conversion)
-
-
-
Moreover each period can be used with r for rate, e.g. #mr for monthly rate. Rules for
-conversion are the same.
-
-
Note that, despite of numbers, constants as defined
-by func_DefConst can be used as amount parameter values.
-
-
Variable parameters
-
-
Variable parameters take EUROMOD
-variables as values (see EUROMOD Basic Concepts - EUROMOD terminology).
-In most of the examples we come across a very important variable
-parameter, the parameter output_var.
-If variable parameters are used with an assessment unit that comprises more
-than one person the question arises how to interpret this. This issue is dealt
-with in section EUROMOD Functions -
-Parameter values and the assessment unit.
-
-
Incomelist parameters
-
-
Incomelist parameters take EUROMOD
-incomelists as values. Incomelists
-are important EUROMOD concepts. They are usually defined in the special policy ILDef_cc of a countrys
-parameter file (see EUROMOD Basic
-Concepts - Presentation of countries' tax-benefit-systems). Section EUROMOD Functions - The system function DefIL describes how to define an incomelist.
-Generally speaking an incomelist is a variable, which
-is composed of other variables, e.g. the incomelist il_earns may be the sum of the
-variables yem (y=income, em=employment) and yse
-(se=self employment). The name of an incomelist by convention starts with il_ or ils_,
-where il_ is used for "normal" incomelists
-and ils_ for system incomelists. The
-latter are incomelists, which exist in all countries
-models and have a certain definition, for example ils_dispy is the incomelist
-for disposable income as defined in EUROMOD. In principle incomelists
-(once defined) are applied in the same way as variables, therefore there is roughly
-any parameter which takes only incomelists but not
-variables. Which leads to the next type ...
-
-
Variable-incomelist parameters
-
-
A few parameters take as well variables as incomelists as values. As an example, the parameter Share_Prop of the
-function Allocate
-features this type.
-
-
Name parameters
-
-
Such parameters allow for indicating names, e.g. the name of
-a file, incomelist, etc. As an example, the parameter
-File of the function DefOutput is a name
-parameter, taking the name of the output file.
-
-
Query parameters
-
-
EUROMOD offers a couple of so-called "queries"
-which allow for more complex questions, as for example how many children are
-there in the assessment unit. These queries are listed and described in the
-section EUROMOD Functions - Queries. The result
-of a query is either yes or no, e.g. for the query IsLoneParent, or some (monetary or non monetary) value, e.g. for the queries GetPartnerIncome respectively nDepChildrenInTu. Actually,
-there are no "pure" query parameters, i.e. parameters that only take
-queries as their values, rather queries are usually
-used within formulas and conditions. Which leads to the next
-two types ...
-
-
Formula parameters
-
-
Formula parameters are in fact little calculators. Example 2
-shows a somewhat more complex application, by calculating a benefit for persons
-in education, amounting to 500 Euro monthly, supplemented by half of the
-expenditure on education. Any other education benefit is deducted from the
-resulting amount, where a lower limit ensures that no negative benefit results.
-For determining whether a person is in education the formula applies a query (IsInEducation), the basic
-benefit is indicated as monetary amount (500#m), the supplement for expenditure on education is calculated
-by using a variable (xed)
-and dividing it by a non monetary amount (2). Finally, an incomelist is
-used to determine other education benefits (il_OthEducBen).
-
-
-
Example 2:
-
-
Policy
-
SL_demo
-
Comment
-
-
-
ArithOp
-
on
-
-
-
-
formula
-
IsInEducation * (500#m + xed / 2) il_OthEducBen
-
-
-
-
lowlim
-
0
-
-
-
-
output_var
-
stm01_s
-
-
-
-
TAX_UNIT
-
tu_individual_sl
-
-
-
-
-
In general formula parameters take
-amounts (monetary and non monetary), variables, incomelists and queries as operands and combine them by
-simple arithmetic operations to calculate some result. Consequently, formula
-parameters can be used as amount, variable, incomelist
-and query parameters (by using just one operand of the respective type and no
-arithmetic operations). In fact, there are no pure query parameters and very
-few pure amount and incomlist parameters. Section EUROMOD Functions - The policy function ArithOp provides a more detailed description of the
-formula parameter.
-
-
Condition parameters
-
-
Similar to formula parameters condition parameters take
-amounts, variables, incomelists and queries as
-operands. However, they combine them by logical and comparison operators to
-evaluate a condition with a yes/no result. Example 3 shows a somewhat
-more complex application, which tests whether there is at least one dependent
-child in the family and if so, whether earnings are below 15,000 Euro annually
-or unemployment benefits are received. A more detailed description of condition
-parameters is provided in the section EUROMOD Functions - The policy function Elig.
A few parameters take assessment units as their values, the most important is the parameter TAX_UNIT, which is described in more detail in section EUROMOD Functions - Common Parameters.
-The name of assessment units by convention starts with tu_.
-
-
Categorical parameters
-
-
Some parameters take a limited number of defined values, as
-for example the parameter who_must_be_elig,
-taking the values one_member
-/ one_adult / all_members / all_adults (also see section EUROMOD Functions - Common Parameters).
-
-
Footnote parameters
-
-
Finally, there are parameters, which serve the further
-specification of other parameters. They can be easily identified by names
-starting with the character #, e.g. #_amount. The application of such parameters is described
-in detail in section EUROMOD Functions -
-Footnote parameters for the further specification of operands.
-
-
-
-
-
-
-
-
-
-
[1]
-Actually, the parameters are formula parameters. They are
-used for exemplification here because there are rarely any pure amount
-parameters.
The following operations are performed with the variable administration tool. To open this
-tool press the button Variables in
-the ribbon Administration Tools (also
-see Working with EUROMOD
-- Administration of EUROMOD variables paragraph Administrating variables and acronyms in the EUROMOD user interface).
-
-
Listing of acronyms
-
-
The variable administration tool lists in its right part all
-acronyms available for generating variable names (see the Data Requirement
-Document (DRD) for detailed information concerning the generation of variable
-names). The acronyms are organised in a tree with three levels. The first level
-exhibits the variabletype, i.e. DEOMOGRAPHIC, TAX, INCOME, etc. The
-second level subdivides types into levels. The levels mainly serve a better
-overview.[1]
-Finally, the third level shows the acronyms themselves together with a verbal
-description, which is used to generate the Automatic
-Labels of the variables, which use the respective acronyms. If an acronym
-is categorical (e.g. gender has two categories: male and female), selecting
-this acronym in the Acronyms list
-displays the categories in the Categories
-list (locate below the Acronyms list).
-
-
Adding types
-
-
Click the button Add
-Type in the ribbon Acronyms of
-the variable administration tool. Alternatively use the key combination Alt-T. This appends a new empty type row
-at the end of the Acronyms list.
-
-
Changing types
-
-
To change a type's Description
-(DEOMOGRAPHIC, TAX, INCOME, etc.) or Acronym
-(D, T, Y, etc.) simply edit the respective cell. In the case of changing the Acronym the interface checks if the Acronym is already used by another type
-and, if so, issues a respective message and prevents the change to avoid
-ambiguousness. Moreover, the interface checks whether the Acronym is used in the current listing of variables. If so, a
-warning is issued, which lists the variables concerned. The user is still able
-to accomplish the change, however the description (Automatic Label) of the variables will
-show up question marks to indicate unknown acronyms.
-
-
Deleting types
-
-
Select the type to delete and click the button Delete Type in the ribbon Acronyms of the variable administration
-tool. Alternatively use the key combination Ctrl-Shift-T.
-The interface checks whether this type is used in the current listing of
-variables. If so, a warning is issued, which lists the variables concerned. The
-user is still able to accomplish the removal, however
-the description (Automatic Label) of
-the variables concerned will show up question marks to indicate unknown
-acronyms.
-
-
Adding levels
-
-
Click the button Add
-Level in the ribbon Acronyms of
-the variable administration tool. Alternatively use the key combination Alt-L. This adds a new empty level row.
-Note that, other than for types and acronyms, the order of levels is relevant,
-thus the interface does not simply append the row, but uses the selected row as
-orientation: if another level row or an acronym row is selected, the new row is
-inserted below the respective level. If a type row is selected, the level is
-inserted as the first level of this type.
-
-
Changing levels
-
-
To change a level's description,
-simply edit the respective cell. Note that, other than types and acronyms, levels
-do not possess an Acronym (thus the
-respective cell is not editable), reflecting that levels are not directly used
-in generating the Automatic Label of
-variables.[2]
-
-
Deleting levels
-
-
Select the level to delete and click the button Delete Level in the ribbon Acronyms of the variable administration
-tool. Alternatively use the key combination Ctrl-Shift-L.
-The interface checks whether acronyms of this level are used in the current
-listing of variables. If so, a warning is issued, which lists the variables
-concerned. The user is still able to accomplish the removal,
-however the description (Automatic Label)
-of the variables concerned will show up question marks to indicate unknown
-acronyms.
-
-
Adding acronyms
-
-
Select the level, where to add the new acronym (or select
-another acronym within the level) and click the button Add Acronym in the ribbon Acronyms
-of the variable administration tool. Alternatively use the key combination Alt-A. This appends a new empty acronym
-row at the end of the level.
-
-
Changing acronyms
-
-
To change an acronym's Description
-(age, gender, etc.) or Acronym (AG,
-GN, etc.) simply edit the respective cell. In the case of changing the Acronym the interface checks if the
-acronym is already used within this type or is incorrect, i.e. does not consist
-of two characters. If so, a respective message is issued and the change is
-prevented to avoid ambiguousness. Moreover, the interface checks whether an
-acronym is used in the current listing of variables. If so, a warning is
-issued, which lists the variables concerned. The user is still able to
-accomplish the change, however the description (Automatic Label) of the variables
-concerned will show up question marks to indicate unknown acronyms.
-
-
Deleting acronyms
-
-
Select the acronym to delete and click the button Delete Acronym in the ribbon Acronyms of the variable administration
-tool. Alternatively use the key combination Ctrl-Shift-A.
-The interface checks whether the acronym is used in the current listing of
-variables. If so, a warning is issued, which lists the variables concerned. The
-user is still able to accomplish the removal, however
-the description (Automatic Label) of
-the variables will show up question marks to indicate unknown acronyms.
-
-
Searching acronyms
-
-
The Search buttons at the top right of the
-ribbon Acronyms allow for searching
-acronyms.
-
-
The button Acronyms
-searches for the acronym as specified in the fields left of the buttons. This is also
-the default search if you press Enter in the search text field. Select
-the acronym type (DEOMOGRAPHIC, TAX, INCOME, etc.) in the upper field and the
-searched acronym in the field below. Pressing the button selects the matched acronym.
-Note that, if ALL ACRONYMS is selected instead of a specific type, several matches may
-be found, as acronyms need to be unique only within a type. If more than one occurrence
-is found, an info box appears showing all the matches. Matches will appear in black colour
-(blue when hovered) and clicking them will select the corresponding acronym in the acronym
-tree. Also note that a full acronym description tooltip appears if you hover the mouse over
-any of the matches.
-
-
The button Description
-searches for acronyms with a description as specified in the fields left of the
-button. Select the acronym type (DEOMOGRAPHIC, TAX, INCOME, etc.) in the upper
-field and the searched description in the field below. Note that search patterns ? and * can be used
-(and most likely will), where ? stands for one arbitrary character and * for any number of arbitrary characters (examples: *child*, *wom?n*). Pressing the button selects the matched acronym.
-If more than one occurrence is found, an info box appears showing all the matches.
-Matches will appear in black colour (blue when hovered) and clicking them will select
-the corresponding acronym in the acronym tree. Also note that a full acronym description
-tooltip appears if you hover the mouse over any of the matches.
-
The following operations are performed with the variable administration tool. To open this
-tool press the button Variables in
-the ribbon Administration Tools (also
-see Working with EUROMOD - Administration of
-EUROMOD variables paragraph Administrating
-variables and acronyms in the EUROMOD user interface).
-
-
Adding variables
-
-
Click the button Add
-Variable in the ribbon Variables of
-the variable administration tool. Alternatively use the key combination Alt-V. This adds an empty row to the
-list of variables. At first instance the row is added below the selected row.
-Note, however, that resorting the list (manually or by an automatic update due
-to another change) moves empty rows to the beginning (ascended sorting) or end
-(descended sorting) of the list of variables.
-
-
Changing the name of a
-variable
-
-
The name of a variable is changed by simply editing the
-respective cell.
-
-
If the name of an existing variable is edited, the acronyms
-currently used by this variable are highlighted in the list of acronyms. This
-indicates which acronyms can furthermore be used and which not. In this
-context, note that only acronyms of the same or a higher level as its precedent
-acronyms can be appended. See the Data Requirement Document (DRD) for detailed
-information concerning the generation of variable names.
-
-
Once editing is finished, the interface checks the validity
-of the new name. Firstly, it checks whether the type and acronyms used exist.
-Secondly, it checks whether the order of acronyms is correct. Finally, it
-checks whether this name already exists. If any of the checks fails a
-respective warning is issued, but it is still possible to accomplish the change.
-The interface automatically updates the variable's description (Automatic Label). For unknown types or
-acronyms question marks are displayed.
-
-
Note that changing the name is only possible without
-warning, if the variable was added during the current session of the
-administration tool. For existing variables a message warns about possibly
-renaming a variable used in country implementations.
-
-
Changing the monetary
-state of a variable
-
-
To change the state of a variable from non-monetary to
-monetary or vice-versa, check respectively uncheck the box alongside the
-variable name.
-
-
Changing the country
-specific descriptions of a variable
-
-
If a variable is selected, the Descriptions list (located below the Variables list) shows country specific descriptions for this
-variable. These descriptions can be changed by simply editing the respective
-cells.
-
-
Deleting variables
-
-
Select the variable to delete and click the button Delete Variable in the ribbon Variables of the variable administration
-tool. Alternatively use the key combination Ctrl-Shift-V.
-A message is issued to warn about possibly deleting a variable used in country
-implementations. This warning is however not shown, if the variable was added
-in the current session of the administration tool (and therefore cannot be used
-yet).
-
-
Filtering variables
-
-
To obtain a better overview the variables listed can be
-reduced to those having certain properties (monetary / non-monetary, taken from
-data / generated by the model) and types (DEMOGRAPHIC, LABOUT MARKET, ...,
-UNKNOWN). Moreover, variables can be restricted to those having a country
-specific description (for a specific country or for any country). Select the
-respective properties and/or types and click the button Apply Filters to list the variables fulfilling the criteria.
-
-
The buttons Select All
-Filters and Unselect All Filters
-serve the easier selection of filters by generating an original state (all
-filters selected or no filters selected) that then can be refined as required.
-
-
Sorting variables
-
-
By clicking the header of the Name column variables are sorted by name. A second click changes
-the sorting direction (from ascending to descending and vice versa). Variables
-can also be sorted by Automatic Label,
-but the result will not differ much from sorting by name.
-
-
Searching variables
-
-
The Search button
-at the top right of the ribbon Variables
-allows for checking the existence of the variable as specified in the field
-above the button. Note that it is possible to use the search patterns ? and *, where ? stands for one
-arbitrary character and * for any
-number of arbitrary characters. The search will select the first visible match
-of the search pattern. If more than one occurrence is found or if the only occurrence
-is hidden due to filtering, an info box appears showing all the matches. Hidden
-matches will appear in dark grey colour. Visible matches will appear in black colour
-(blue when hovered) and clicking them will select the corresponding variable in the
-variables table. Also note that a full variable description tooltip appears if you
-hover the mouse over any of the matches.
The user interface provides access to a couple of external
-tools implemented in MS-Excel. Currently available are a tool for generating
-hypothetical EUROMOD input data and a tool using EUROMOD's output for drawing
-budget constraint graphs. To access the tools, select the ribbon Applications and press the respective
-button.
Selecting the ribbon Country
-Tools and pressing the button Component
-Use opens the Component Use
-dialog. This dialog allows for checking which "components" are used for
-the implementation of the country in EUROMOD. The following components can be
-included into the check:
-
-
Included components
-
-
Variables:
-If this option is selected all EUROMOD variables, as listed in the variables
-file, are included into the check. As the checking for the use of all variables
-may cause that the check takes quite a lot of time, the variables can be
-restricted to those having country
-specific description. For closer information see Working with EUROMOD - Administration of EUROMOD
-variables. Moreover, the check-boxes monetary,
-non-monetary, simulated and non-simulated
-allow for further restriction to the variables which feature the respective
-characteristics.
Component named: This option allows for checking the use of a specific
-component, i.e. a specific variable, assessment unit, incomelist
-or query. Moreover, it allows for checking the use of variables and constants
-generated with the functions DefVar and DefConst (which are not
-taken into account by the option All Variables).
-
-
Ignore if Switched Off:
-Selecting this option means that components solely used in switched off
-policies respectively functions are not recognised as used.
-
-
Include Systems: The list allows for
-restricting the check for usage to the selected systems.
-
-
Listing of used components
-
-
Pressing the Start
-button starts the check. A progress bar is displayed to inform about the time
-still necessary for the check. Once the check is finished, components as
-selected are listed if they are used in the implementation of the country. If a
-component is used several times, it is listed as often as it is used, each time
-with the respective location of the use.
-
-
Jumping to a component
-
-
Selecting a specific use of a component and pressing the
-button Goto
-closes the dialog to jump to the selected use in the country's implementation.
-If the dialog is reopened (by pressing the button Component Use) it still shows the content of the last check, i.e.
-jumping to a component does not "destroy" the results of the check.
-The results of the last check are in general only cleared by a new check, but
-not for example by closing the dialog.
-
-
Storing results
-
-
Pressing the Store
-button allows for specifying a file where the current listing of component
-usage is stored in tabulated text format.
An error message of the EUROMOD executable has about the
-following format:
-
-
-
-
Error:
-
Variable or incomelist 'borer' not defined.
-
-
-
System:
-
at_2011
-
-
-
Policy:
-
tin_at; row 7
-
-
-
Function:
-
arithop; row 7.3
-
-
-
Parameter:
-
formula; row 7.3.2
-
-
-
Value:
-
borer
-
-
-
Identifier:
-
b10e103f-0652-4a77-b2ec-d021636b98f4
-
-
-
-
The error can be found in the user interface by either looking
-for the indicated row numbers or by searching the parameter or function by its
-identifier. The Search by Identifier
-dialog serves the latter approach. To open the dialog, select the ribbon Country Tools and press the button Search by ID in the Search group. Copy the Identifier
-(b10e103f-0652-4a77-b2ec-d021636b98f4 in the example) from the error message to
-the field Identifier and press Find to jump to
-the component.
-
-
Note that the dialog does not support finding an error,
-which was produced by running a system with an add-on (see Working with EUROMOD - Running EUROMOD paragraph
-Running add-on systems). In the case
-of add-on-systems the row numbers indicated by the error message refer to the
-order in which components are actually processed. This order is generated at
-run-time and therefore not visible "from outside". Similar is true
-for the identifier, as it is internally generated by the user interface and not
-visible from outside either.
-
-
Some comments on EUROMOD's error reporting
-
-
EUROMOD distinguishes two phases of error handling and two
-(actually three) types of errors. Error handling phase one comprises reading
-and checking parameters and reading data let's refer to it as read-time while phase two concerns
-computing the necessary calculations and outputting results let's refer to it
-as run-time. The two types of errors are critical and non-critical
-errors (the latter also referred to as warnings).
-
-
During read-time the model gathers all errors, independent
-of type, without stopping. Once the phase is finalised it always stops if there
-are critical errors, to issue respective error messages. If there are only
-non-critical errors it only stops if the box Do not stop on non-critical errors in the Advanced Options of the Run
-EUROMOD dialog is unticked (see Working with EUROMOD Running EUROMOD paragraph
-Advanced settings), otherwise and
-of course if there are no errors it continues. During run-time EUROMOD always
-stops immediately once a critical error occurs. Whether it stops on
-non-critical errors again depends on ticking Do not stop on non-critical errors: if not ticked it stops
-immediately, if ticked it continues and issues the gathered error messages
-after finishing the phase or once a critical error occurs. Finally, above a
-third type of error was mentioned this concerns "very critical"
-errors, which necessitate an immediate stop, independent of the phase.
-
-
Concluding, it may be informative to learn, which errors are
-classified as critical respectively non-critical by the model. Intuitively
-speaking one could say that EUROMOD is very strict during read-time and
-classifies most errors as critical. In contrast the model is rather lenient
-during run-time and considers errors as non-critical, as long as it finds a way
-to continue its calculations (warnings inform about the respective handling in
-their error message). The motivation for this is found in the fact that phase
-two takes much longer than phase one, i.e. the model tries to immediately
-inform the users after the short read-time that something went wrong, while
-they may confidently go for a coffee during run-time and will get a summary of
-errors once they are back. In reality running one system of a country (with a
-not too big dataset) usually takes a few minutes, which is unfortunately too
-short for the coffee. However, one could imagine a reform that comprises a lot
-of countries, systems or loops. In that case the user may first get the
-parameters right and have time for her coffee, while running this big reform.
To import a country to EUROMOD select the ribbon Administration Tools and click the
-button Import Country. This opens a
-dialog which requests two pieces of information:
Moreover, the folder may
-contain the countrys flag as an image file named cc.png.[1] If
-the folder does not contain a flag image, a default image with a question mark
-will be used.
-
-
Short Name
-
-
If the country does not already
-exist, the Short Name is the name of
-the Import Country Folder.[2] For
-example, if you are importing Barbados the short name would probably be BB. If the country is another version of
-an existing country, the Short Name indicates
-an alternative short name for this second version. For example, if you are
-using an alternative version of Belgium you may indicate B2 as Short Name.
-
-
Confirming the specifications with OK imports the country[3]
-and instructs you to go to the country gallery (i.e. the ribbon Countries) to load the imported country.
-
-
-
-
-
-
-
-
-
-
-
[1]cc stands for the country's short name (e.g. FR
-for France, EL for Greece, ...). The flag ought to be
-in portable network graphic format (png) and is ideally
-sized 28x17 pixels.
-
-
-
[2] and the country's acronym as used in the names of the country's XML- and
-flag-files.
-
-
-
[3] That means the user interface copies the folder into the countries'
-folder. Moreover, if the Short Name is
-different from the name of the Import
-Country Folder, it does all the renaming of files and adapting of parameter
-files for you.
The following operations are performed with the variable administration tool. To open this
-tool press the button Variables in
-the ribbon Administration Tools (also
-see Working with EUROMOD
-- Administration of EUROMOD variables paragraph Administrating variables and acronyms in the EUROMOD user interface).
-
-
To import variables from an external variables definition
-file (VarConfig.xml) select the item Import
-Variables from the variables administration tool's menu. This firstly
-allows the selection of the external variables definition file. Once the file
-is chosen, a dialog shows the possible changes, i.e. differences between the
-user interfaces internal variables definition file and the external one. This
-means, the dialog lists the variables and acronyms either existing only in the
-internal respectively external variables definition file or have different
-attributes in the two files.
-
-
Note that importing variables is only possible if no changes
-were accomplished in the current session of the variables administration tool,
-otherwise the menu item is disabled. In this case close and open the tool
-again, saving the changes if required.
-
-
Also note
-that, to begin with, it is assumed that the user wants to overtake all
-modifications from the external variables definition file. Respective changes
-are suggested in the Action columns.
-This behaviour can be changed by ticking/unticking
-the checkboxes in the Perform
-columns. This is supported by three buttons, which aim to make selecting more
-efficient.
-
-
Clicking the button Tick selected variables ticks the checkboxes of all selected rows
-in the variables list. Selected rows are characterised by blue background
-colour. Selecting a single row is accomplished by clicking it. Selecting
-multiple rows is accomplished by holding the Strg key and clicking the
-respective rows. Selecting a range of rows is accomplished by clicking the
-first row pressing and holding the Shift
-key and selecting the last row.
-
-
Clicking the button Untick selected variables unticks the
-checkboxes of all selected rows. See above for recognising and choosing
-selected rows.
-
-
Clicking the button Add only unticks the checkboxes of all
-variables and acronyms for which the Action
-column is set to delete.
-
-
-
List of possible changes in variables
-
The left part of the
-dialog shows which variables are different in the external and the internal
-variables definition file. There are following types of differences:
-
-
A variable exists in the external variables
-definition file only: The column Action
-suggests adding this variable.
-
-
A variable exists in the internal variables
-definition file only: The column Action
-suggests deleting this variable.
-
-
The monetary status of a variable is different:
-The column Action suggests changing
-the monetary status and the column Info
-informs about the direction of the change, i.e. to overtake the status defined
-in the external variables definition file.
-
-
One or more of the country specific descriptions
-of a variable are different: The column Action
-suggests changing the variable and the column Info tells that the difference is in different descriptions. The
-concrete differences are displayed in the Descriptions
-list below the Variables list.
-Note that, one can either overtake all descriptions of this variable from the
-external file (checkbox Perform
-ticked), or keep all descriptions of the internal file (checkbox Perform not ticked), partly overtaking
-is not foreseen.
-Also note, that it is possible (though not recommended) to import a variable
-definitions file that refers to a different set of countries (e.g. a country
-was added in the external version, which is not yet implemented in the internal
-version). In this case the importing tool issues a warning, telling that it
-cannot overtake country specific descriptions.
-
-
List of possible
-changes in acronyms
-
The right part of the dialog shows which acronyms
-are different in the external and the internal variables definition file. There
-are following types of differences:
-
-
A whole type of acronyms exists in the external
-variables definition file only: The column Action
-suggests adding this type (including all levels and acronyms contained).
-
-
A whole type of acronyms exists in the internal
-variables definition file only: The column Action
-suggests deleting this type (including all levels and acronyms contained).
-
-
The description of an acronym type is different
-(e.g. IN KIND changed to BENEFIT IN KIND): The column Action suggests changing the description and the column Info tells the new description. Note
-that a change of the shortcut of an acronym type (e.g. K for IN KIND) is
-treated as deleting the whole type and adding a new type with the new shortcut,
-as in fact all variable names using the acronyms of this type get invalid.
-
-
A whole level of acronyms exists in the external
-variables definition file only: The column Action
-suggests adding this level (including all acronyms contained). The tool tries
-to add the level at the same position as in the external file, by searching for a common predecessor level.
-
-
A whole level of acronyms exists in the internal
-variables definition file only: The column Action
-suggests deleting this level (including all acronyms contained).
-
-
An acronym exists in the external variables
-definition file only: The column Action
-suggests adding this acronym.
-
-
An acronym exists in the internal variables
-definition file only: The column Action
-suggests deleting this acronym.
-
-
The description of an acronym is different: The
-column Action suggests changing the
-description and the column Info tells
-the new description. Note that, similar to types, a change of the acronym
-itself is treated as deleting the acronym and adding a new acronym, as in fact
-all variable names using the acronym get invalid.
-
-
One or more of the categories of an acronym are
-different: The column Action suggests
-changing the acronym and the column Info
-tells that the difference is in different categories. The concrete differences
-are displayed in the Categories list
-below the Acronyms list.
-Note that, one can either overtake all categories of this acronym from the
-external file (checkbox Perform
-ticked), or keep all categories of the internal file (checkbox Perform not ticked), partly overtaking
-is not foreseen.
-
-
Performing the import
-
To accomplish the import, tick the checkboxes in the Perform columns as required, and press
-the button Import. For
-variables you can tick or untick several Perform boxes at once by first selecting
-the respective rows and then clicking the buttons Tick selected variables respectively Untick selected variables.
-
-
Note that it is not possible to undo the import via the
-undo-functionality. However, there is no automatic saving of the variables
-definitions file. That means closing the variables administration tool without
-saving can still restore the old state.
-Plug-ins are software components that extend the functionality of EUROMOD. While the core user interface concentrates on supporting the implementation, adaptation and running of countries' tax-benefit systems, plug-ins provide additional features like producing basic summary statistics, performing microvalidation, or generating hypothetical datasets. In the official release of v1.10 the only publicly available plug-in is the "Summary Statistics", but many more will be added in future releases to accommodate task-specific needs.
-
Selecting the ribbon Country
-Tools and pressing the button Search
-+ Replace opens the Search and
-Replace dialog. The dialog can also be accessed by pressing Ctrl-F to open it in the search mode and
-by Ctrl-H to open it in the replace
-mode.
-
-
Searching
-
-
To search for example for the string abc, type abc into the
-field Search and press either the
-button Search Next (or use the
-key-combination Alt-N) or the button Search Previous (key-combination Alt-P). This finds the cell nearest to
-the currently focused cell, which contains the string abc. Search Next finds the nearest cell after
-and Search Previous finds the nearest
-cell before the focused cell. "Finding" means that the respective
-cell is focused (red-dotted border) and made visible by expanding the parent
-nodes, if necessary, and scrolling to the position of the cell.
-
-
It is possible to use search patterns. That means ? can be used for symbolising one arbitrary character and * for symbolising any number of arbitrary
-characters. bch??_s, for example, finds bch00_s, bch01_s, bchba_s, ..., bchyc_s, while bch*_s
-finds the listed strings as well as bch_s, bchba01_s,
-..., bchucrg_s.
-
-
Note that any searched string or pattern is stored by the
-dialog, in the sense that one can pick it from the list, which is displayed by
-clicking the arrow button right of the Search
-field.
-
-
Specifying the search
-
-
The Search and Replace
-dialog offers several options to specify the search:
Selecting the option Visible Cells restricts the search to cells which are visible in
-the sense that they are not hidden because their parent node is collapsed. Note
-that cells hidden due to scrolling are still found (in fact the interface
-scrolls to the position of the found cell).
As a default the search refers to all columns,
-except those moved to the Hidden Systems
-Box (compare above).
-
-
Selecting the option System Columns effects that the search only takes system columns
-into account.
-
-
Selecting the option Policy Column effects that the search only takes the Policy column into account.
-
-
Selecting the option Comment Column effects that the search only takes the Comment column into account.
-
-
-
Search by ...
-
As a default (option Search by Columns) the search first
-finds all occurrences of the searched string or pattern in the first (affected)
-column, to then find all occurrences in the second column, etc. Selecting the
-option Search by Rows effects that
-the search first finds all occurrences in the first (affected) row, to then
-find all occurrences in the second row, etc.
-
-
Match Case
-
As a default the search is not
-case sensitive. Ticking the box Match
-Case enforces case sensitivity.
-
-
Match Entire Cell Content
-
As a default the
-searched string or pattern does not need to be the only content of the found
-cells. For example yem
-finds a cell containing yem
-as well as a cell containing yem*10%. Ticking
-the box Match Entire Cell Content effects
-that only cells, which contain only the searched string or pattern are found
-(i.e. the first match in the example).
-
-
Include Private Comments
-
As a default the
-search does not include private comments (see Working with EUROMOD Private comments).
-Ticking the box extends the search to jump to the respective cell in the Comment column, if the private comment matches
-the search criteria. Note that the box is not available in replace mode.
-
-
Replacing
-
-
Pressing the button Replace ... displays the field Replace by and the button Replace All. The field Replace by allows for indicating a
-string by which the string in the field Search
-is replaced. To start (single) replacing, press Search Next to find the first match.[1]
-Then press Replace to replace Search by Replace by in the found cell. This moves the focus automatically to
-the next matching cell (where Replace
-can be pressed again).
-
-
Pressing the button Replace All replaces all occurrences of Search by Replace by, taking into account the following restrictions (which
-also apply to single replacement).
-
-
Replacing
-does not allow for search patterns, i.e. ? and * cannot be used.
-
-
Matches
-in the Policy and Grp/No columns can only be replaced if the respective cell is editable, otherwise an error message is displayed. Please
-refer to Working with EUROMOD -
-Copying parameter values (and comments) paragraph Copying from and to the clipboard for restrictions on replacing values in
-the Policy and Grp/No column.
-
-
The
-search options as described above, in paragraph Specifying the search are valid for replacing as well.
-
-
The Search and Replace dialog does not provide a Search All option, however a similar functionality is provided by
-the Component Use dialog with the
-option Component named (see Working with EUROMOD - Checking component use).
-
-
-
-
-
-
-
-
-
-
[1]
-Note that you need to start the replacing by focusing a cell that matches Search - otherwise an error message is
-issued.
All countries implemented in EUROMOD use the same set of
-variables to store information taken from input data as well as generated by
-the model. For example, a variable called yem is used by each county to
-store employment income (taken from input data). As another example, a variable
-called bch_s
-stores child benefits calculated by the model. This approach does not only care
-for high comparability over countries but also supports exchangeability in
-facilitating task like, for example, taking some policy measure from one
-country and implementing it in another.
-
-
At first view the names of EUROMOD variables may seem rather
-none intuitive (e.g. dag for age). In
-fact, the names follow an elaborated naming scheme, which is described in
-detail in the Data Requirement Document (DRD). This brief description confines
-itself to mentioning some features, which are useful in identifying the meaning
-of a variable:
-
-
-
Variables generated by the model end with _s for simulated, whereas variables taken from input data
-do not have such an ending. For example bch is a
-child benefit taken from data, whereas bch_s
-is a simulated child benefit.
-
-
The first character of a variables name
-indicates its type, where b stands for benefit (e.g. bch: b=benefit, ch=child), t
-stands for tax (e.g. tin: t=tax, in=income), p stands for pension
-(e.g. poa: p=pension, oa=old age), d
-stands for demographic (e.g. dag: d=demographic, ag=age), l stands for labour market (e.g. les: l=labour
-market, es=economic status), y stands for income
-(e.g. yem: y=income, em=employment), a
-stands for assets (e.g. afc: a=assets, fc=financial
-capital), x stands for expenditure (e.g. xcc: x=expenditure, cc=child care), k stands for in kind (e.g. ked: k=in kind, ed=education) and s
-stands for system (e.g. stm01: s=system, tm=temporary variable).
-
-
The rest of the name is composed of
-two-character acronyms. Take for example the variable tsceehl_s: t stands for tax, sc stands for social insurance contributions, ee stands for employee, hl stands for health and _s stands for simulated.
-Thus the variable stores employee's health social insurance contributions as
-calculated by the model.
-
EUROMOD variables are stored in a special EUROMOD parameter
-file, the variable description file VarConfig.xml (see EUROMOD Installation and Architecture - EUROMOD
-content (parameter files) - Organisation of files for the storage
-place and EUROMOD Installation and Architecture - EUROMOD content (parameter
-files) - Format of the variables file for the content of this file). The file
-contains the names of the available variables together with their properties.
-Some of the properties serve the model to distinguish if certain routines
-should be applied on the variable, for example only monetary variables are
-up-rated. Others are mere information, for example, there is a verbal
-description of each variable (Automatic
-Label), and a special description for each country. Moreover, the variable
-description file stores the acronyms of which the variable names are composed.
-
-
Note that in addition to these standardised variables, there
-are variables which are defined during the model run using the functions DefVar
-and DefConst (see EUROMOD
-Basic Concepts EUROMOD terminology paragraph EUROMOD variables).
-
-
Administrating
-variables and acronyms in the EUROMOD user interface
-
-
The EUROMOD user interface provides a tool, which allows
-administrating the information stored in the variable description file. To
-assess this tool press the button Variables
-in the ribbon Administration Tools.
-
-
The left part of the tool's surface shows the list of all
-available EUROMOD variables. For each variable there is a
-checkbox indicating whether the variable is monetary (checked) or not (not
-checked) and a verbal description. This description is called Automatic Label, indicating that it is
-automatically generated out of the acronyms building the variable's name, thus
-the user cannot edit it. Moreover, if a variable is selected, country specific
-descriptions are listed below the list of variables. These descriptions are
-editable.
-
-
The right part of the tool's surface shows all available
-acronyms organised in a tree in three levels. The first level exhibits the type
-as described above (benefit, tax, income, ...). The
-second level subdivides types into so called "levels". The levels
-mainly serve a better overview.[1]
-Finally, the third level shows the acronyms themselves together with a verbal
-description, which is used to generate the Automatic
-Labels of the variables using the respective acronym. If an acronym is
-categorical (e.g. gender has two categories: male and female), selecting the
-acronym lists the respective categories below the list of acronyms.
-
-
Note the possibilities of adapting the size of the window,
-and therewith the lists, according to your
-requirements. In particular note that the window is vertically tiled, i.e. if
-you move the mouse between the upper (Variables,
-Acronyms) and lower lists (Descriptions,
-Categories) a cursor appears, which allows to resize the upper and lower
-window part.