Fixing relaxed and atmosphere refs, working with gpkit.alg.

convexengineering · Jun 3, 2018 · c8871f7 · c8871f7
1 parent f30e520
commit c8871f7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 61 deletions.
diff --git a/gpkitmodels/SP/SimPleAC/SimPleAC_mission.py b/gpkitmodels/SP/SimPleAC/SimPleAC_mission.py
@@ -1,13 +1,13 @@
 from gpkit import Model, Variable, SignomialsEnabled, SignomialEquality, VarKey, units,Vectorize
 from gpkit.constraints.bounded import Bounded
 from gpkit.constraints.tight import Tight
-from relaxed_constants import relaxed_constants, post_process
+from gpkit.algorithms import relaxed_constants, post_process
 
 import numpy as np
 import matplotlib.pyplot as plt
 
 # Importing models
-from atmosphere import Atmosphere
+from gpkitmodels.SP.atmosphere.atmosphere import Atmosphere
 
 # SimPleAC with mission design and flight segments, and lapse rate and BSFC model (3.4.2)
 

diff --git a/gpkitmodels/SP/SimPleAC/SimPleAC_multimission.py b/gpkitmodels/SP/SimPleAC/SimPleAC_multimission.py
@@ -1,12 +1,12 @@
 from gpkit import Model, Variable, SignomialsEnabled, SignomialEquality, VarKey, units,Vectorize
 from gpkit.constraints.bounded import Bounded
-from relaxed_constants import relaxed_constants, post_process
+from gpkit.algorithms import relaxed_constants, post_process
 
 import numpy as np
 import matplotlib.pyplot as plt
 
 from SimPleAC_mission import Mission, SimPleAC
-from atmosphere import Atmosphere
+from gpkitmodels.SP.atmosphere.atmosphere import Atmosphere
 
 # SimPleAC with multimission design (3.5)
 

diff --git a/gpkitmodels/SP/SimPleAC/atmosphere.py b/gpkitmodels/SP/SimPleAC/atmosphere.py
diff --git a/gpkitmodels/SP/atmosphere/__init__.py b/gpkitmodels/SP/atmosphere/__init__.py