Refactored food demand calculation. Improved consistency of demand fractions.

GAMS/IntExtOpt.gms

data/animal_numbers.csv

data/base_consump.csv

data/base_demand_fracts.csv

data/bio_demand.csv

data/calories_per_t.csv

data/com_curves.csv

data/net_imports.csv

data/production.csv

src/ac/ed/lurg/ModelConfig.java

src/ac/ed/lurg/ModelMain.java

src/ac/ed/lurg/country/AbstractCountryAgent.java

src/ac/ed/lurg/country/CountryAgent.java

src/ac/ed/lurg/country/CountryPrice.java

src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java

src/ac/ed/lurg/country/gams/GamsCommodityDemand.java

src/ac/ed/lurg/country/gams/GamsCountryInput.java

src/ac/ed/lurg/country/gams/GamsDemandInput.java

src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java

src/ac/ed/lurg/country/gams/GamsDemandOutput.java