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.

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

Prepare integration of main.py and survey.py #44

Merged
merged 4 commits into from
Apr 27, 2021

Conversation

mcoughlin
Copy link
Collaborator

Integration of main.py and survey.py.

@lpsinger
Copy link
Contributor

Please rebase. Sorry, I made some changes to main.py last night!

@codecov
Copy link

codecov bot commented Apr 27, 2021

Codecov Report

Merging #44 (04013d4) into main (d3d3ef9) will increase coverage by 1.25%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main      #44      +/-   ##
==========================================
+ Coverage   25.46%   26.71%   +1.25%     
==========================================
  Files          29       28       -1     
  Lines        1453     1355      -98     
==========================================
- Hits          370      362       -8     
+ Misses       1083      993      -90     
Impacted Files Coverage Δ
dorado/scheduling/scripts/main.py 9.64% <0.00%> (-0.36%) ⬇️
dorado/scheduling/scripts/simsurvey.py 9.13% <0.00%> (-0.04%) ⬇️

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 d3d3ef9...04013d4. Read the comment docs.

dorado/scheduling/scripts/main.py Outdated Show resolved Hide resolved
dorado/scheduling/scripts/main.py Outdated Show resolved Hide resolved
dorado/scheduling/scripts/main.py Outdated Show resolved Hide resolved
@lpsinger
Copy link
Contributor

Did you try this out with both the --skygrid-method and --skygrid-file options?

@mcoughlin
Copy link
Collaborator Author

Yes both seem to run alright.

@lpsinger
Copy link
Contributor

I approved it, but there are still some merge conflicts.

@mcoughlin
Copy link
Collaborator Author

I see:
This branch has no conflicts with the base branch
Merging can be performed automatically.
? or are there issues?

@lpsinger
Copy link
Contributor

This branch has no conflicts with the base branch

Screen Shot 2021-04-27 at 11 49 58

@mcoughlin mcoughlin merged commit ec4b5a3 into nasa:main Apr 27, 2021
@lpsinger
Copy link
Contributor

Thank you, @mcoughlin! Let's keep looking for opportunities to consolidate functionality.

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.

None yet

2 participants