Skip to content

change from 3 digits to 6 digits in print out#56

Merged
mjburton11 merged 9 commits intomasterfrom
sigfigs
Dec 4, 2016
Merged

change from 3 digits to 6 digits in print out#56
mjburton11 merged 9 commits intomasterfrom
sigfigs

Conversation

@mjburton11
Copy link

Increase the number of digits in the gpfit print out from 3 to 6. Increases fit accuracy.

@acdl-jenkins
Copy link

Can one of the admins verify this patch?

1 similar comment
@acdl-jenkins
Copy link

Can one of the admins verify this patch?

@mjburton11
Copy link
Author

@bqpd I need help making this nice and better before merging.

setup.py Outdated
@@ -0,0 +1,51 @@
"""Standard Python setup script for GPkit Models"""
Copy link
Contributor

Choose a reason for hiding this comment

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

GPkit Models -> GPfit?

setup.py Outdated
LONG_DESCRIPTION = """
GPkit Models is a library of geometric programming and signomial programming
models that can be manipulated and solved using
`GPfit <https://github.com/hoburg/gpfit/>`_.
Copy link
Contributor

Choose a reason for hiding this comment

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

lol waht

setup.py Outdated
author="MIT Department of Aeronautics and Astronautics",
author_email="gpfit@mit.edu",
url="https://www.gifhub.com/hoburg/gpfit",
install_requires=["numpy", "scipy", "pint"],
Copy link
Contributor

Choose a reason for hiding this comment

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

does it need scipy and pint?

Copy link
Author

Choose a reason for hiding this comment

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

So I saw scipy and left it in. Deleted pint.

setup.py Outdated
description="program to convert data into GP compatible functions that "
"can be used with GPkit.",
author="MIT Department of Aeronautics and Astronautics",
author_email="gpfit@mit.edu",
Copy link
Contributor

Choose a reason for hiding this comment

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

do we have this email address?

Copy link
Author

Choose a reason for hiding this comment

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

We don't, so I deleted it.

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

I'm going to try to rebase this to fix the merge conflicts.

@whoburg whoburg changed the title change from 3 digits to 6 digits in print out change from 3 digits to 6 digits in print out and add setup file Dec 4, 2016
@whoburg whoburg changed the title change from 3 digits to 6 digits in print out and add setup file change from 3 digits to 6 digits in print out Dec 4, 2016
@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

@mjburton11, gpfit alreadsy has a setup.py, so I'm dropping the two commits related to that

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

just force pushed, please delete and re-fetch any local copies of the sigfigs branch

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

test this please

1 similar comment
@galbramc
Copy link

galbramc commented Dec 4, 2016

test this please

@galbramc
Copy link

galbramc commented Dec 4, 2016

I realized I needed to update the gpfit scripts for mosek 8. I think I just got it.

@galbramc
Copy link

galbramc commented Dec 4, 2016

test this please

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

pylint is failing with 0 errors, 0 warnings?

@galbramc
Copy link

galbramc commented Dec 4, 2016

test this please

@galbramc
Copy link

galbramc commented Dec 4, 2016

hmm, it's not triggering the build for some reason...

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

just checked and acdl-jenkins does have admin access

@galbramc
Copy link

galbramc commented Dec 4, 2016

can you try pushing something to this PR

@galbramc
Copy link

galbramc commented Dec 4, 2016

very strange... let me reboot jenkins

@galbramc
Copy link

galbramc commented Dec 4, 2016

test this please

@galbramc
Copy link

galbramc commented Dec 4, 2016

not sure why this isn't starting, but Jenkins might think this PR is closed for some reason... That's all I can see from the log.

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

hm, should I try cherry-picking these commits to a new PR?

@galbramc
Copy link

galbramc commented Dec 4, 2016

Worth a try

@galbramc
Copy link

galbramc commented Dec 4, 2016

Maybe closing and reopening the PR?

@whoburg whoburg closed this Dec 4, 2016
@whoburg whoburg reopened this Dec 4, 2016
@acdl-jenkins
Copy link

Can one of the admins verify this patch?

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

add to whitelist

@galbramc
Copy link

galbramc commented Dec 4, 2016

That seems to have fixed it

@galbramc
Copy link

galbramc commented Dec 4, 2016

Test this please

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

easy there jenkins

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

@galbramc, why the disagreement in pylint status between macys and Reynolds?

@galbramc
Copy link

galbramc commented Dec 4, 2016

That's what that did. There was a new feature in the plugin to apparently show every single build in the matrix. That might be too much. Want me to turn it off?

@galbramc
Copy link

galbramc commented Dec 4, 2016

I'm going to turn that off again. Looks like information overload.

Looks like the counts are off for Reynolds. Could you create an "CI test" PR so I can reset the counts.

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

#58

@acdl-jenkins
Copy link

Testing jenkins privelages

@galbramc
Copy link

galbramc commented Dec 4, 2016

Test this please

@galbramc
Copy link

galbramc commented Dec 4, 2016

Alright, looks like you are good to go.

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

yes -- thanks!

Copy link
Collaborator

@whoburg whoburg left a comment

Choose a reason for hiding this comment

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

@mjburton11 or @bqpd, I approve. Is this ready to merge?

@bqpd
Copy link
Contributor

bqpd commented Dec 4, 2016

@mjburton11, it's all you.

@whoburg
Copy link
Collaborator

whoburg commented Dec 4, 2016

@mjburton11, please "squash and merge" as opposed to creating a merge commit (if ready to merge)

@mjburton11
Copy link
Author

I am ready to merge. How do I "squash and merge"?

@bqpd
Copy link
Contributor

bqpd commented Dec 4, 2016

Click the arrow next to
screenshot_2016-12-03_23-21-19
and click on "Squash and Merge", which will turn all this into a single commit. Edit that commit message to your liking, etc.

@mjburton11 mjburton11 merged commit 397b0d8 into master Dec 4, 2016
@bqpd bqpd deleted the sigfigs branch December 4, 2016 04:39
@bqpd bqpd restored the sigfigs branch December 4, 2016 04:39
@bqpd bqpd deleted the sigfigs branch December 4, 2016 04:39
@bqpd
Copy link
Contributor

bqpd commented Dec 4, 2016

@mjburton11, the last step is to delete the branch.

@mjburton11
Copy link
Author

right... sorry

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.

5 participants