-
Notifications
You must be signed in to change notification settings - Fork 11
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
Merging SimPleAC to master pt. 3 #120
Conversation
gpkitmodels/SP/SimPleAC/SimPleAC.py
Outdated
import numpy as np | ||
import matplotlib.pyplot as plt | ||
|
||
def SimPleAC(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe make this inherit from Model instead of being a function?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had some weird bugs with that recently, don't know why. I am planning on changing it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not planning on merging this until I clean up the write-up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Can one of the admins verify this patch? |
add to whitelist |
test models please |
1 similar comment
test models please |
@bqpd I am still having trouble generating the pdf from README.md. Perhaps I can bug you for a few minutes after our meeting with Bob tomorrow? |
for sure!
|
test models please |
@bqpd I believe this is ready to rumble! Please review the pdf! |
add to whitelist |
test models please |
constraints += [W_w_surf >= W_W_coeff2 * S, | ||
W_w_strc**2. >= W_W_coeff1**2./ tau**2. * | ||
(N_ult**2. * A ** 3. * ((W_0+V_f_fuse*g*rho_f) * W * S)), | ||
W_w >= W_w_surf + W_w_strc] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the .md seems to miss returning the constraints? This markdown file should be able to fully replace the .py file, so that only one has to be maintained
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. That means that I will have to have all of the variable definitions in there too. Seems like a lot of clutter for doing a model write-up, but alright.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can skip them in the PDF by starting a python block with the comment #inPDF: skip
(there's also #inPDF: replace with $FOO.tex
, which is handy)
gpkitmodels/SP/SimPleAC/simpleac.tex
Outdated
@@ -0,0 +1,363 @@ | |||
\documentclass[]{article} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this file should be removed
gpkitmodels/SP/SimPleAC/README.md
Outdated
SimPleAC | ||
======== | ||
|
||
In this example, we modify the simple wing model proposed by Prof. Warren Hoburg in his thesis to create a simple aircraft model compatible with signomial programming (SP). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
replace "compatible with" with "incorporating"?
gpkitmodels/SP/SimPleAC/README.md
Outdated
where the $CDA_0$ is linearly proportional to the volume of fuel in the fuselage: | ||
|
||
\begin{equation} | ||
V_{f_{fuse}} \leq 10 CDA_0 \times meters |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about CDA_0 \times 10 \mathrm{[meters]}
, or something like that?
gpkitmodels/SP/SimPleAC/README.md
Outdated
|
||
``` | ||
|
||
Valid objective functions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Absolutely love this section.
test models please |
test models please |
@bqpd I have responded to all of your comments, and README.md.py runs. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great!
Poop, wanted to squash merge, but it seems like it merged item by item without asking. Sorry... |
Why was this so hard...