Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

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

Snippets Groups Projects

c0b12b14

Commit c0b12b14 authored 2 years ago by Peter Alexander

Downloads
- Plain Diff

Merge commit 'd08baf4a'

parents b123d55b d08baf4a

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

GAMS/IntExtOpt.gms 5 additions, 2 deletions

GAMS/IntExtOpt.gms
GAMS/elasticDemand.gms 49 additions, 27 deletions

GAMS/elasticDemand.gms
scripts/compilePlum.sh 1 addition, 1 deletion

scripts/compilePlum.sh
scripts/concatOutputLc.sh 2 additions, 2 deletions

scripts/concatOutputLc.sh
scripts/runPlum.sh 3 additions, 3 deletions

scripts/runPlum.sh
src/ac/ed/lurg/ModelConfig.java 2 additions, 1 deletion

src/ac/ed/lurg/ModelConfig.java
src/ac/ed/lurg/country/CountryAgent.java 13 additions, 0 deletions

src/ac/ed/lurg/country/CountryAgent.java
src/ac/ed/lurg/country/crafty/CraftyProdManager.java 2 additions, 1 deletion

src/ac/ed/lurg/country/crafty/CraftyProdManager.java
src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java 22 additions, 5 deletions

src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
src/ac/ed/lurg/country/gams/GamsDemandOutput.java 0 additions, 6 deletions

src/ac/ed/lurg/country/gams/GamsDemandOutput.java
src/ac/ed/lurg/demand/ElasticDemandManager.java 2 additions, 12 deletions

src/ac/ed/lurg/demand/ElasticDemandManager.java

with 101 additions and 60 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