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.

Sign up for GitHub

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

Jump to bottom

Prop #157

Merged
merged 17 commits into from
Apr 3, 2018
Merged

Prop #157

merged 17 commits into from
Apr 3, 2018

Commits on Feb 23, 2018

  1. initial propeller efficiency model

    mjburton committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    ca4d658 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2018

  1. modify tests

    mjburton committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    875e650 View commit details
    Browse the repository at this point in the history

  2. initial qprop

    mjburton committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    a06db84 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2018

  1. Add prop structure and performance models

    @courtin
    courtin committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    f30e2ea View commit details
    Browse the repository at this point in the history

  2. Add prop structure and performance models

    @courtin
    courtin committed Mar 19, 2018
    Configuration menu
    Copy the full SHA
    129cd22 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2018

  1. Updated propeller to base and performance class

    @courtin
    courtin committed Mar 25, 2018
    Configuration menu
    Copy the full SHA
    eb7c39d View commit details
    Browse the repository at this point in the history

  2. update units tests to include prop model

    mjburton committed Mar 25, 2018
    Configuration menu
    Copy the full SHA
    9bfa23c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'prop' of https://github.com/convexengineering/library i… 

    …nto prop
    mjburton committed Mar 25, 2018
    Configuration menu
    Copy the full SHA
    4d2da32 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2018

  1. Changes per mike's review

    @courtin
    courtin committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    3b2c57b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'prop' of github.com:convexengineering/gplibrary into prop

    @courtin
    courtin committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    1840d3e View commit details
    Browse the repository at this point in the history

  3. small changes

    mjburton committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    195883c View commit details
    Browse the repository at this point in the history

  4. remove qprop

    mjburton committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    602606f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into prop

    Michael Burton authored Mar 26, 2018
    Configuration menu
    Copy the full SHA
    0b3c8ae View commit details
    Browse the repository at this point in the history

  6. add static model in

    mjburton committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    c47db82 View commit details
    Browse the repository at this point in the history

  7. add missing __init__.py

    @bqpd
    bqpd committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    05cbb85 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2018

  1. update prop unit test

    mjburton committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    210802e View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. add fit csvs to setup.py (#159)

    @bqpd
    bqpd authored and Michael Burton committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    db5e4cb View commit details
    Browse the repository at this point in the history