Code

Add fair distribution options#751

Code

Merged

visr merged 35 commits intomainDeltares/Ribasim:mainfrom fair_distributionDeltares/Ribasim:fair_distributionCopy head branch name to clipboardNov 20, 2023

+221-113

Commits

Commits on Nov 6, 2023

• Add allocation output

  SouthEndMusic

  committed
  d7af65a

  Copy full SHA for d7af65a

• Merge branch 'main' into allocation_output_file

  SouthEndMusic

  committed
  c043d16

  Copy full SHA for c043d16

Commits on Nov 7, 2023

• Add test

  SouthEndMusic

  committed
  b0c549a

  Copy full SHA for b0c549a

• Merge branch 'main' into allocation_output_file

  SouthEndMusic

  committed
  061e6f8

  Copy full SHA for 061e6f8

• Tests completed

  SouthEndMusic

  committed
  442a52b

  Copy full SHA for 442a52b

• Test adjusted

  SouthEndMusic

  committed
  9f3033e

  Copy full SHA for 9f3033e

• Add fair distribution options

  SouthEndMusic

  committed
  4d7123c

  Copy full SHA for 4d7123c

Commits on Nov 8, 2023

• Towards fair distribution options

  SouthEndMusic

  committed
  3554b53

  Copy full SHA for 3554b53

• Merge branch 'main' into allocation_output_file

  SouthEndMusic

  committed
  9e27e9c

  Copy full SHA for 9e27e9c

• Let allocation default to allocated = demand

  SouthEndMusic

  committed
  c7115c5

  Copy full SHA for c7115c5

• Merge branch 'main' into allocation_output_file

  SouthEndMusic

  committed
  f827910

  Copy full SHA for f827910

• Take minimum of current demand and optimized allocation

  SouthEndMusic

  committed
  6e3252c

  Copy full SHA for 6e3252c

• docs update

  SouthEndMusic

  committed
  bcfc493

  Copy full SHA for bcfc493

• Merge branch 'main' into fair_distribution

  SouthEndMusic

  committed
  70484e1

  Copy full SHA for 70484e1

• Use JuMP.@objective

  SouthEndMusic

  committed
  558e421

  Copy full SHA for 558e421

• Merge branch 'allocation_output_file' into fair_distribution

  SouthEndMusic

  committed
  e572e9e

  Copy full SHA for e572e9e

Commits on Nov 10, 2023

• Towards testing all objective types

  SouthEndMusic

  committed
  8a8c63b

  Copy full SHA for 8a8c63b

Commits on Nov 13, 2023

• Merge branch 'main' into fair_distribution

  SouthEndMusic

  committed
  c35399b

  Copy full SHA for c35399b

• Manifest fix

  SouthEndMusic

  committed
  dc1c09f

  Copy full SHA for dc1c09f

Commits on Nov 14, 2023

• Make all allocation objective functions run without error

  SouthEndMusic

  committed
  29c2b09

  Copy full SHA for 29c2b09

• Merge branch 'main' into fair_distribution

  SouthEndMusic

  committed
  87e9d0b

  Copy full SHA for 87e9d0b

• Add docstrings

  SouthEndMusic

  committed
  d51fee7

  Copy full SHA for d51fee7

• Add tests

  SouthEndMusic

  committed
  9467f2e

  Copy full SHA for 9467f2e

• Some more tests

  SouthEndMusic

  committed
  186dcc7

  Copy full SHA for 186dcc7

• Docs update

  SouthEndMusic

  committed
  132660e

  Copy full SHA for 132660e

• division by 0 clarification

  SouthEndMusic

  committed
  62480c2

  Copy full SHA for 62480c2

• Absolute value clarification

  SouthEndMusic

  committed
  71dc2c0

  Copy full SHA for 71dc2c0

Commits on Nov 16, 2023

• Merge branch 'main' into fair_distribution

  SouthEndMusic

  committed
  c81afe9

  Copy full SHA for c81afe9

• Merge branch 'main' into fair_distribution

  visr

  committed
  6289c0e

  Copy full SHA for 6289c0e

Commits on Nov 17, 2023

• Merge branch 'main' into fair_distribution

  SouthEndMusic

  committed
  f76ddca

  Copy full SHA for f76ddca

• Merge branch 'fair_distribution' of https://github.com/Deltares/Ribasim into fair_distribution

  SouthEndMusic

  committed
  8a96333

  Copy full SHA for 8a96333

• Comments adressed

  SouthEndMusic

  committed
  11baf16

  Copy full SHA for 11baf16

Commits on Nov 20, 2023

• Merge branch 'main' into fair_distribution

  SouthEndMusic

  committed
  b6237b1

  Copy full SHA for b6237b1

• Run Julia tests in parallel (#803)

  Show description for 4071b07
  

  visr

  and

  evetion

  committed
  4071b07

  Copy full SHA for 4071b07

• Merge branch 'main' into fair_distribution

  visr

  authored
  fd767a3

  Copy full SHA for fd767a3