Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2 (ed34f530) · Commits · Land Use Lab / PLUM · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

PLUM
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

ed34f530

Commit ed34f530 authored 4 years ago by rhenry2

Downloads
- Plain Diff

Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2

parents bba5e9ca 4e99b473

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

debug_config.properties 7 additions, 12 deletions

debug_config.properties
src/ac/ed/lurg/ModelConfig.java 6 additions, 1 deletion

src/ac/ed/lurg/ModelConfig.java
src/ac/ed/lurg/country/CountryAgent.java 0 additions, 1 deletion

src/ac/ed/lurg/country/CountryAgent.java
src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java 35 additions, 8 deletions

src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
src/ac/ed/lurg/country/gams/TauCalculationManager.java 81 additions, 0 deletions

src/ac/ed/lurg/country/gams/TauCalculationManager.java
src/ac/ed/lurg/types/CommodityType.java 4 additions, 0 deletions

src/ac/ed/lurg/types/CommodityType.java
src/ac/ed/lurg/yield/YieldClusterPoint.java 0 additions, 1 deletion

src/ac/ed/lurg/yield/YieldClusterPoint.java

with 133 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment