convexengineering / gplibrary

Useful subsystem models
MIT License
10 stars 11 forks source link

Cost + Range model #19

Closed mjburton11 closed 8 years ago

mjburton11 commented 8 years ago

I'm so sorry. Tried to make this as a ipython but when I created the pull request something happened and it included a lot of unnecessary stuff. I also need help getting this working because I'm not sure what the errors mean or how I can fix them. Also, I would like to try and add the DAPCA4Cost model to the modular stuff that Ned is working on but I'm not sure if I can/should do that because it hasn't been put into master yet.

whoburg commented 8 years ago

@mjburton11, looks like this includes more commits than it needs to, and it also now has a merge conflict.

Which of the 16 commits are actually new changes intended to be introduced by this PR? We can cherry-pick them into a new PR to clean things up a bit.

If any of this is confusing just bring your laptop by and I'll help sort it out.

mjburton11 commented 8 years ago

Going to start over.