September 2008 Commit Log

Number of Commits:

12

Number of Active Developers:

1

antonello 2008-09-30 11:48 #12 Rev.: 202

Changed labels to v 1.3.0

17 lines of code changed in 7 files:

• Doxyfile (+1 -1), NEWS (+6), regmas.kdevelop (+2 -2), windowsInstallerScript.nsi (+1 -1)
• doc: regmas.doxygen (+1 -1)
• doc/userManual: regmasUserManual.tex (+5 -3)
• src: MainWindow.cpp (+1 -1)

antonello 2008-09-21 13:03 #11 Rev.: 201

On code --> Corrected bug in the new multi-premium-by-activity system (sumOfHa are now reported correctly for the calculation of the average regional premium).
On data --> 2009 should not be considered as reference period for durum wheat supplementary payment.

20 lines of code changed in 3 files:

• data: regmasInput.ods (changed)
• src/agents: Agent_farmer.cpp (+3 -1), Manager_farmers.cpp (+17 -6)

antonello 2008-09-19 15:30 #10 Rev.: 200

The model has been generalized to "decouple" policy premiums from one specific activity.
Now each activity can have several "policy premiums", each one with his decoupling options and registers.
This has been introduced to allow the new coupled durum wheat payment to be considered separatly from the "old" coupled premium, as in the upcoming health check reform it is calculated on its own base.

157 lines of code changed in 9 files:

• data: regmasInput.ods (changed)
• src: BaseRegmas.h (+10), Opt.cpp (+3 -3), RegData.cpp (+46 -8), RegData.h (+5 -5)
• src/agents: Agent_farmer.cpp (+46 -21), Agent_farmer.h (+8 -4), Manager_farmers.cpp (+37 -18), Manager_farmers.h (+2 -2)

antonello 2008-09-18 15:17 #9 Rev.: 199

This implementation follows Health Check proposal COM(2008) 306 (20.May.2008):
- corrected bug regionalisation from 2010 instead of 2009
- reassigned "decoupled" durum wheat payment to farmers from 2010. Here is a little bit problem, as it is hard to model the new reference period for it (2005-2008) so I had to use the "old" one (2001-2003)

0 lines of code changed in 1 file:

• data: regmasInput.ods (changed)

antonello 2008-09-14 19:49 #8 Rev.: 198

removed old python scripts for output processing now useless

0 lines of code changed in 2 files:

• data/output/results: byYears.py (del), csv2sql.py (del)

antonello 2008-09-14 19:45 #7 Rev.: 197

More information outputed, but the output system show all its limits, and should be better generalised (with keys?)

259 lines of code changed in 7 files:

• data/output/results: agentsDetails_mask.csv (+9 -1), createSQLTable.py (new 95)
• src: Agent_base.cpp (+1 -2), Output.cpp (+135 -21), Output.h (+5 -3), RegData.cpp (+13), RegData.h (+1)

antonello 2008-09-13 22:54 #6 Rev.: 196

Added option to initialize the random seed generator (defualt false).
When this option is true, each repetition of a simulation has dofferent random values, leading to (hopefully slighly) different results.

5 lines of code changed in 2 files:

• data: regmasInput.ods (changed)
• src: Init.cpp (+5)

antonello 2008-09-13 15:21 #5 Rev.: 195

Dead agents rights added also in getAverageRightsByAct(actMouldCounter) when actMouldCounter is positive.
However, I don't thing it is ever called during the program (that function is always called with argument -1, meaning all activities)

3 lines of code changed in 1 file:

• src/agents: Manager_farmers.cpp (+3 -1)

antonello 2008-09-04 17:28 #4 Rev.: 194

printed also the totalPlots, as used quite frequently in the data post-processing..

8 lines of code changed in 1 file:

• src: Output.cpp (+8 -2)

antonello 2008-09-04 16:33 #3 Rev.: 193

removed an annoiyng debug cout

2 lines of code changed in 1 file:

• src: Opt.cpp (+2)

antonello 2008-09-04 16:27 #2 Rev.: 192

Deleted the working directory field, so kdevelop will automatically fill it with the full path (as it doesn't like local path) of the case.

5 lines of code changed in 1 file:

• regmas.kdevelop (+5 -5)

antonello 2008-09-02 17:43 #1 Rev.: 191

Added a (commented) section to add the data to a mysql server.
To improve also because the python script needs to be cleaned up.

6 lines of code changed in 1 file:

• doc/userManual: regmasUserManual.tex (+6)

August 2008 »