Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restructure MCDA module and update use #677

Draft
wants to merge 411 commits into
base: main
Choose a base branch
from
Draft

Restructure MCDA module and update use #677

wants to merge 411 commits into from

Conversation

ConnectedSystems
Copy link
Collaborator

@ConnectedSystems ConnectedSystems commented Feb 11, 2024 •
edited
Loading

Restructure MCDA implementation for clarity, compilation efficiency and use of ease.

This PR tracks the following works:

  • Implement new types to support use of MCDA methods from JMcDM.jl (Implementation of new MCDA types #678)
  • Incorporate the above into scenario runs for ADRIA Domains
  • Update as necessary for other Domain types
  • Update to ensure standalone location analysis functions work as expected
  • Update tests or implement new ones as necessary
  • Update documentation

@ConnectedSystems ConnectedSystems marked this pull request as draft February 11, 2024 03:15
@ConnectedSystems ConnectedSystems mentioned this pull request Feb 11, 2024
Merged
@ConnectedSystems ConnectedSystems force-pushed the mcda-restructure branch 3 times, most recently from f4b8753 to 5d288cf Compare February 16, 2024 06:21
@ConnectedSystems ConnectedSystems mentioned this pull request Feb 19, 2024
Open
DanTanAtAims and others added 22 commits February 20, 2024 09:28
@DanTanAtAims
reverted changes to location_selection
b1c36ce
@DanTanAtAims
removed dead code
ebd7996
@ConnectedSystems
Remove MKL build
7bad4b5
@DanTanAtAims
Merge pull request #705 from open-AIMS/no-mkl
bc234ae 
Remove MKL from build process
@DanTanAtAims @Zapiano
Changed name of ReefModDomain to RMEDomain
ca2ab02 
Changed name of ReefModDomain to RMEDomain.
@DanTanAtAims @Zapiano
resolving merge confilct after name change
f4ff3cc
@DanTanAtAims @Zapiano
Initial commit for load_domain for ReefModDomain
11cf46a
@DanTanAtAims @Zapiano
added parallel threshold for new Domain ReefModDomain
e419d06
@DanTanAtAims @Zapiano
Bug Fix: load domain when scenario and domain scenario do no agree
ddf1b5f
@DanTanAtAims @Zapiano
removed infiltrator
5d7e82a
@DanTanAtAims @Zapiano
added domain naming in tests
98cbce6
@DanTanAtAims @Zapiano
moved DHWs switch to run_scenarios to prevent duplicate data loads in…
9ae311c 
… run_scenario

removed print statements
@DanTanAtAims @Zapiano
update documentation to reflect new method
b85caf2
@DanTanAtAims @Zapiano
Rebasing branch to up to date main.
b8d9672
@DanTanAtAims @Zapiano
removed infiltrator
941f637
@DanTanAtAims @Zapiano
removed unused file and code
1905f77 
removed unused file code
@DanTanAtAims @Zapiano
Resolve formatting issues
20e80d1
@DanTanAtAims @Zapiano
remove dev dependecies from package dependencies
e400f0f
@DanTanAtAims @Zapiano
removed needless dependencies on ReefMod Engine Data
dec411f
@DanTanAtAims @Zapiano
added site data to ReefModDomain loading
a34124b
@DanTanAtAims @Zapiano
added site data to ReefModDomain loading
9b4f03b 
load reef area and grazable from id_list
@DanTanAtAims @Zapiano
Update documentation to reflect domain changes
d756e77
ConnectedSystems and others added 28 commits March 2, 2024 19:49
@ConnectedSystems
Merge branch 'mcda-restructure' into mcda-merge
11df6cb
@ConnectedSystems
Remove unnecessary support for NamedDimsArray
80b6119
@ConnectedSystems
Add assertion check to depth bounds
773fdf2
@ConnectedSystems
Clean up flow for standalone location selection
2fb3e11
@ConnectedSystems
Reorder module imports for compatibility
c82afe4 
Some new methods need `DataCube` defined beforehand.
@ConnectedSystems
Update sampling name to not refer to "sites"
1309bfd
@ConnectedSystems
Update depth bounds handling to reduce repetitive code
a5c67a8 
Export depth threshold function for use
@ConnectedSystems
Update use of depth filtering
b39cd6d
@ConnectedSystems
Automatically handle constant values in location ranking
aad9350
@ConnectedSystems
Strip intervention prefixes from criteria names
ee0dc6f
@ConnectedSystems
Remove NamedDimsArray support
a6e1880
@ConnectedSystems
Update docstring
2fafaf0
@ConnectedSystems
Consolidate to Symbols
454148d
@ConnectedSystems
Add interface for selection scores with YAXArray
c40164f
@ConnectedSystems
Update location ranking
2fe47cb
@ConnectedSystems
Tentative aggregation method
b10fef2
@ConnectedSystems
Update use removing repetitive code
9792604
@ConnectedSystems
Update criteria identifiers to use common names
227bdd2
@ConnectedSystems
Add support for determining selection scores from scenario runs
d451c2f
@ConnectedSystems
Add support for determining selection frequencies
6c1f08e
@ConnectedSystems
Error if using incomplete method
d8b3ef8 
This analysis method may be removed.
@ConnectedSystems
Add more detail to docstring
e88bc21
@ConnectedSystems
Support temporal analysis
017beaf
@ConnectedSystems
Fix incorrect merge
f328b63
@ConnectedSystems
Whitespace
394437d
@ConnectedSystems
Locations that are not considered assigned 0 instead of n_locs+1
02b38fc
@ConnectedSystems
Account for variable number of decision years
a6a8807
@Zapiano
Merge pull request #699 from open-AIMS/mcda-standalone
8c94bc1 
Update support for standalone MCDA use
@Zapiano Zapiano mentioned this pull request Mar 12, 2024
Merged
@ConnectedSystems ConnectedSystems mentioned this pull request Mar 15, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ConnectedSystems @DanTanAtAims @Zapiano