Skip to content

Conversation

rjplevin
Copy link
Collaborator

The long awaited composite mega-super-mondo-merge.

rjplevin added 20 commits June 5, 2019 14:56
…t, e.g., "/my/comp/path:datum" in set_param! and connect_param!.
…omponentDef

- Add getindex/setindex/haskey for CompositeComponentDef's to operate on namespace rather than always assuming this identifies a sub-comp.
- Move dimensions-related code to separate file
- Replace numcomponents() with length()
# Conflicts:
#	src/core/build.jl
#	src/core/connections.jl
#	src/core/defs.jl
#	src/core/model.jl
#	src/core/time.jl
#	src/core/types.jl
#	test/test_getdataframe.jl
#	test/test_parametertypes.jl
#	test/test_timesteps.jl
- Made ComponentInstance a superclass to both LeafComponentInstance and CompositeComponentInstance.
- Backed out support for linking multiple sub-comp params to a single param in a super-comp.
…gle namespace dictionary

  instead, and modified several methods to accommodate this change. The methods param_dict()
  and var_dict() are used to produce these type-specific lists.
- All tests currently passing.
…of pairs of the form name-in-subcomponent => name-in-composite.

Note that this feature is not completely implemented yet and needs to be compatible with the new semantics in @defcomposite.
…ined in @defcomposite.

- All tests are passing again.
# Conflicts:
#	src/Mimi.jl
#	src/core/defcomp.jl
#	src/core/defs.jl
#	src/core/model.jl
#	src/core/time.jl
#	src/core/types.jl
#	src/explorer/buildspecs.jl
#	src/mcs/defmcs.jl
#	src/mcs/mcs.jl
#	src/mcs/montecarlo.jl
#	src/utils/getdataframe.jl
#	test/mcs/test_defmcs.jl
#	test/test_explorer_model.jl
#	test/test_metainfo.jl
#	test/test_metainfo_variabletimestep.jl
@davidanthoff
Copy link
Collaborator

I think the next step here is to modify https://github.com/mimiframework/Mimi.jl/blob/master/test/dependencies/run_dependency_tests.jl such that it uses a branch of FUND that works with this version of Mimi.jl. I think simply replacing the second element in the tuple that is currently a version string should do the trick.

Or, alternatively we merge the FUND branch, tag a new release, and then also update that file here to pick up the newer version.

@codecov-io
Copy link

codecov-io commented Oct 4, 2019

Codecov Report

Merging #556 into master will decrease coverage by 6.83%.
The diff coverage is 72.6%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #556      +/-   ##
==========================================
- Coverage   84.06%   77.22%   -6.84%     
==========================================
  Files          27       39      +12     
  Lines        2146     2582     +436     
==========================================
+ Hits         1804     1994     +190     
- Misses        342      588     +246
Impacted Files Coverage Δ
src/components/adder.jl 0% <ø> (ø) ⬆️
src/Mimi.jl 100% <ø> (ø) ⬆️
src/mcs/mcs_types.jl 80.85% <100%> (ø) ⬆️
src/mcs/montecarlo.jl 81.55% <100%> (-0.38%) ⬇️
src/utils/getdataframe.jl 74.69% <100%> (-17.07%) ⬇️
src/core/types/time.jl 100% <100%> (ø)
src/core/types/model.jl 100% <100%> (ø)
src/explorer/buildspecs.jl 95.05% <100%> (ø) ⬆️
src/utils/plotting.jl 41.66% <100%> (+5.3%) ⬆️
src/utils/misc.jl 71.42% <16.66%> (-15.53%) ⬇️
... and 37 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dc8a2f3...9fe5472. Read the comment docs.

@davidanthoff davidanthoff added this to the v1.0.0 milestone Oct 4, 2019
@rjplevin rjplevin merged commit 8425214 into master Oct 4, 2019
@rjplevin rjplevin deleted the class-based branch October 4, 2019 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants