brocksam / pycollo

General-purpose optimal control, trajectory optimisation and parameter optimisation using direct collocation

https://brocksam.github.io/pycollo/

MIT License

8 stars 3 forks source link

Fix merge conflicts remaining from #22 #23

Closed brocksam closed 4 years ago

brocksam commented 4 years ago

This PR addressing merge conflicts that somehow remained after merging PR #22. This PR aims to get the CI on Travis passing again.

ghost commented 4 years ago

Warnings are found on analyzing the commit 50e8dbd.

1 warning:

⚠️ Goodcheck

We recommend to address them as possible, for example, update outdated dependencies, fix the tool's configuration, configure sider.yml, turn off unused tools, and so on.

If you are struggling with these errors or warnings, feel free to ask us via chat. 💬

codecov[bot] commented 4 years ago

Codecov Report

:exclamation: No coverage uploaded for pull request base (master@5e7f2a8). Click here to learn what that means. The diff coverage is n/a.

@@           Coverage Diff            @@
##             master     #23   +/-   ##
========================================
  Coverage          ?   24.7%           
========================================
  Files             ?      27           
  Lines             ?    5353           
  Branches          ?     646           
========================================
  Hits              ?    1323           
  Misses            ?    4017           
  Partials          ?      13