Skip to content

Changes combined.R to use model_read_lib#69

Merged
ddkapan merged 5 commits intocalacademy-research:mainfrom
matt-har-vey:combined-use-lib
Apr 7, 2022
Merged

Changes combined.R to use model_read_lib#69
ddkapan merged 5 commits intocalacademy-research:mainfrom
matt-har-vey:combined-use-lib

Conversation

@matt-har-vey
Copy link
Copy Markdown
Collaborator

It lets you switch the species and year.

This will wait for PR#68 to be merged before it is merged. The only differences between that PR and this one are the ones in combined.R.

Also we'll still want to test on on Mark's official tall CSV.

This implements a library for reading ML outputs and also includes point
counts, because using the same approach for indexing helps with
consistency.
This adds symlinks from the models/input/ directory that point into the
output/ directories where those files were generated.

Note that this makes a bit of a mess in .gitignore.
This is a bug that did not show itself when this was being called from a
test script where species (plural) had been defined locally but revealed
itself when combined.R was ported.

It is indended that outerIndices specify which species and years to
include and that readMl get to know those in case it can use them to
make the query more efficient.
With the right tall input CSV, this now means that combined.R can be run
for any single species or year.

This leaves one TODO for a cleaner way to work around the "reference"
data $indices returned by readCombined.
@matt-har-vey matt-har-vey requested review from ddkapan and mkclapp April 5, 2022 23:37
@matt-har-vey
Copy link
Copy Markdown
Collaborator Author

I can't figure out how to change the base branch "diff base" to another pull request. The best way to see the changes here is to only look at commits 3e3d533 and later.

Comment thread models/input/PC_delinted.csv
Comment thread models/input/aru2point.csv
@ddkapan
Copy link
Copy Markdown
Collaborator

ddkapan commented Apr 7, 2022

Ditto for PR 69, correct?

Hi @mkclapp & @matth79, Let me know what you all decided. If nothing more is necessary, once we get your review (e.g. all good or whatever), Mary, I can merge the pull request.

Copy link
Copy Markdown
Collaborator

@mkclapp mkclapp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK to merge as is- after merge I will open a new issue re: when and where we use drive_sync and delete/modify that code from this script once consensus is reached about that.

@ddkapan
Copy link
Copy Markdown
Collaborator

ddkapan commented Apr 7, 2022

Awesome sounds great!

@ddkapan ddkapan merged commit 00d6184 into calacademy-research:main Apr 7, 2022
@matt-har-vey matt-har-vey deleted the combined-use-lib branch April 8, 2022 04:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants