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.

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

Merged
merged 18 commits into from
Oct 18, 2017
Merged

Merging SimPleAC to master pt. 3 #120

merged 18 commits into from
Oct 18, 2017

Conversation

1ozturkbe
Copy link
Contributor

Why was this so hard...

import numpy as np
import matplotlib.pyplot as plt

def SimPleAC():
Copy link
Contributor

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?

Copy link
Contributor Author

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.

Copy link
Contributor Author

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@acdl-jenkins
Copy link

Can one of the admins verify this patch?

@bqpd
Copy link
Contributor

bqpd commented Oct 12, 2017

add to whitelist

@bqpd
Copy link
Contributor

bqpd commented Oct 12, 2017

test models please

1 similar comment
@bqpd
Copy link
Contributor

bqpd commented Oct 12, 2017

test models please

@1ozturkbe
Copy link
Contributor Author

@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?

@bqpd
Copy link
Contributor

bqpd commented Oct 17, 2017 via email

@bqpd
Copy link
Contributor

bqpd commented Oct 17, 2017

test models please

@1ozturkbe
Copy link
Contributor Author

@bqpd I believe this is ready to rumble! Please review the pdf!

@bqpd
Copy link
Contributor

bqpd commented Oct 18, 2017

add to whitelist

@bqpd
Copy link
Contributor

bqpd commented Oct 18, 2017

test models please

bqpd
bqpd previously requested changes Oct 18, 2017
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]
Copy link
Contributor

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

Copy link
Contributor Author

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.

Copy link
Contributor

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)

@@ -0,0 +1,363 @@
\documentclass[]{article}
Copy link
Contributor

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

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).
Copy link
Contributor

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"?

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
Copy link
Contributor

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?


```

Valid objective functions
Copy link
Contributor

Choose a reason for hiding this comment

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

Absolutely love this section.

@bqpd
Copy link
Contributor

bqpd commented Oct 18, 2017

test models please

@1ozturkbe 1ozturkbe dismissed bqpd’s stale review October 18, 2017 16:11

Fixed this issue.

@1ozturkbe
Copy link
Contributor Author

test models please

@1ozturkbe
Copy link
Contributor Author

@bqpd I have responded to all of your comments, and README.md.py runs.

Copy link
Contributor

@bqpd bqpd left a comment

Choose a reason for hiding this comment

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

Looks great!

@1ozturkbe 1ozturkbe merged commit 81caea6 into master Oct 18, 2017
@1ozturkbe
Copy link
Contributor Author

Poop, wanted to squash merge, but it seems like it merged item by item without asking. Sorry...

@1ozturkbe 1ozturkbe deleted the SPaircraft branch May 24, 2018 20:24
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.

None yet

3 participants