From 3b75275fc5e4309e1099336114bd2d554faa4ed7 Mon Sep 17 00:00:00 2001 From: 1ozturkbe <1ozturkbe@gmail.com> Date: Tue, 5 Jun 2018 12:36:28 -0400 Subject: [PATCH] clean-ups. --- gpkitmodels/SP/SimPleAC/SimPleAC.py | 2 +- gpkitmodels/SP/SimPleAC/SimPleAC_mission.py | 7 ++----- gpkitmodels/SP/SimPleAC/SimPleAC_multimission.py | 8 ++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gpkitmodels/SP/SimPleAC/SimPleAC.py b/gpkitmodels/SP/SimPleAC/SimPleAC.py index 0118099e..19d16ff7 100644 --- a/gpkitmodels/SP/SimPleAC/SimPleAC.py +++ b/gpkitmodels/SP/SimPleAC/SimPleAC.py @@ -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 diff --git a/gpkitmodels/SP/SimPleAC/SimPleAC_mission.py b/gpkitmodels/SP/SimPleAC/SimPleAC_mission.py index 98645de5..988d66ed 100644 --- a/gpkitmodels/SP/SimPleAC/SimPleAC_mission.py +++ b/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 @@ -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__": diff --git a/gpkitmodels/SP/SimPleAC/SimPleAC_multimission.py b/gpkitmodels/SP/SimPleAC/SimPleAC_multimission.py index 1289dbc3..d84685bc 100644 --- a/gpkitmodels/SP/SimPleAC/SimPleAC_multimission.py +++ b/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 @@ -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