Skip to content

Commit

Permalink
clean-ups.
Browse files Browse the repository at this point in the history
  • Loading branch information
1ozturkbe committed Jun 5, 2018
1 parent b75a13d commit 3b75275
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gpkitmodels/SP/SimPleAC/SimPleAC.py
Expand Up @@ -90,7 +90,7 @@ def setup(self):
def test():
m = SimPleAC()
m.cost = m['W_f']
sol = m.localsolve(verbosity = 4)
sol = m.localsolve(verbosity = 2)

if __name__ == "__main__":
# Most basic way to execute the model
Expand Down
7 changes: 2 additions & 5 deletions gpkitmodels/SP/SimPleAC/SimPleAC_mission.py
@@ -1,10 +1,7 @@
import numpy as np
from gpkit import Model, Variable, SignomialsEnabled, SignomialEquality, VarKey, units,Vectorize
from gpkit.constraints.bounded import Bounded
from gpkit.constraints.tight import Tight
from gpkit.algorithms import relaxed_constants, post_process

import numpy as np
import matplotlib.pyplot as plt

# Importing models
from gpkitmodels.SP.atmosphere.atmosphere import Atmosphere
Expand Down Expand Up @@ -282,7 +279,7 @@ def test():
'T/O factor_m' :2,
})
m.cost = m['W_{f_m}']*units('1/N') + m['C_m']*m['t_m']
sol = m.localsolve(verbosity = 4)
sol = m.localsolve(verbosity = 2)


if __name__ == "__main__":
Expand Down
8 changes: 2 additions & 6 deletions gpkitmodels/SP/SimPleAC/SimPleAC_multimission.py
@@ -1,10 +1,6 @@
import numpy as np
from gpkit import Model, Variable, SignomialsEnabled, SignomialEquality, VarKey, units,Vectorize
from gpkit.constraints.bounded import Bounded
from gpkit.algorithms import relaxed_constants, post_process

import numpy as np
import matplotlib.pyplot as plt

from SimPleAC_mission import Mission, SimPleAC
from gpkitmodels.SP.atmosphere.atmosphere import Atmosphere

Expand Down Expand Up @@ -64,7 +60,7 @@ def test():
})
#m.cost = m['W_{f_{mm}}']*units('1/N') + sum(m.missions[i]['C_m']*m.missions[i]['t_m'] for i in range(0,Nmissions))
m.cost = (m.missions[0]['W_{f_m}']*units('1/N') + m.missions[1]['C_m']*m.missions[1]['t_m'])
sol = m.localsolve(verbosity = 4)
sol = m.localsolve(verbosity = 2)

if __name__ == "__main__":
Nmissions = 2
Expand Down

0 comments on commit 3b75275

Please sign in to comment.