Merge 0df34d2 into a9bb50b

docs/source/examples/issue_1513_output.txt

@@ -5,8 +5,8 @@ Optimal Cost
 
 Model Sensitivities (sorts models in sections below)
 -------------------
-  +3.0 : System.Fleet2
-  +1.0 : System.Fleet2.Vehicle
+  +1.0 : System.Fleet2
+       : System.Fleet2.Vehicle
 
 Free Variables
 --------------
@@ -30,7 +30,7 @@ y : [   -       +0.25    ]
 Most Sensitive Constraints
 --------------------------
        | System.Fleet2
-    +1 : z[0] ≥ a[0,0]·x[0]^-1·y[0,0] + y[1,0]/x[0]·a[1,0]
+    +1 : z[0] ≥ a[0,0]·y[0,0]/x[0] + y[1,0]/x[0]·a[1,0]
 
        | System.Fleet2.Vehicle
  +0.75 : a[0,0] ≥ 1
@@ -43,8 +43,8 @@ Optimal Cost
 
 Model Sensitivities (sorts models in sections below)
 -------------------
-  +3.0 : System2.Fleet2
-  +1.0 : System2.Fleet2.Vehicle
+  +1.0 : System2.Fleet2
+       : System2.Fleet2.Vehicle
 
 Free Variables
 --------------
@@ -71,9 +71,9 @@ y : [   -         -         -
 Most Sensitive Constraints
 --------------------------
        | System2.Fleet2
- +0.33 : z[0] ≥ a[0,0]·x[0]^-1·y[0,0] + y[1,0]/x[0]·a[1,0]
- +0.33 : z[1] ≥ a[0,1]·x[1]^-1·y[0,1] + y[1,1]/x[1]·a[1,1]
- +0.33 : z[2] ≥ a[0,2]·x[2]^-1·y[0,2] + y[1,2]/x[2]·a[1,2]
+ +0.33 : z[0] ≥ a[0,0]·y[0,0]/x[0] + y[1,0]/x[0]·a[1,0]
+ +0.33 : z[1] ≥ a[0,1]·y[0,1]/x[1] + y[1,1]/x[1]·a[1,1]
+ +0.33 : z[2] ≥ a[0,2]·y[0,2]/x[2] + y[1,2]/x[2]·a[1,2]
 
        | System2.Fleet2.Vehicle
  +0.25 : a[0,0] ≥ 1

docs/source/examples/issue_1522.py

@@ -1,5 +1,4 @@
 "Tests broadcast_sub function for returned-dictionary substitutions"
-import numpy as np
 from gpkit import Variable, Model, ConstraintSet, Vectorize
 from gpkit.small_scripts import broadcast_substitution
 

docs/source/examples/issue_1522_output.txt

@@ -3,11 +3,6 @@ Optimal Cost
 ------------
  15
 
-Model Sensitivities (sorts models in sections below)
--------------------
-  +1.0 : Yum1.Cake
-       : Yum1.Cake.Pie
-
 Free Variables
 --------------
   | Yum1.Cake
@@ -41,11 +36,6 @@ Optimal Cost
 ------------
  3
 
-Model Sensitivities (sorts models in sections below)
--------------------
-  +1.0 : Yum2.Cake
-       : Yum2.Cake.Pie
-
 Free Variables
 --------------
   | Yum2.Cake

docs/source/examples/performance_modeling_output.txt

@@ -24,35 +24,35 @@ Constraints
     (no constraints)
 
  Aircraft
-  Aircraft.W ≥ Aircraft.Fuselage.W + Aircraft.Wing.W
+  Aircraft.W ≥ Fuselage.W + Wing.W
   Fuselage
    (no constraints)
 
   Wing
    c = (S/A)^0.5
-   Aircraft.Wing.W ≥ S·Aircraft.Wing.rho
+   Wing.W ≥ S·Wing.rho
 
 Optimal Cost
 ------------
  1.091
 
 Free Variables
 --------------
-      | Mission.FlightSegment.AircraftP.WingAero
-    D : [ 2.74      2.73      2.72      2.72     ]  [lbf] drag force
-
       | Mission.FlightSegment.AircraftP
 Wburn : [ 0.274     0.273     0.272     0.272    ]  [lbf] segment fuel burn
 Wfuel : [ 1.09      0.817     0.544     0.272    ]  [lbf] fuel weight
 
+      | Mission.FlightSegment.AircraftP.WingAero
+    D : [ 2.74      2.73      2.72      2.72     ]  [lbf] drag force
+
+      | Aircraft
+    W : 144.1                                       [lbf] weight
+
       | Aircraft.Wing
     S : 44.14                                       [ft²] surface area
     W : 44.14                                       [lbf] weight
     c : 1.279                                       [ft]  mean chord
 
-      | Aircraft
-    W : 144.1                                       [lbf] weight
-
 Variable Sensitivities
 ----------------------
     | Aircraft.Fuselage
@@ -74,15 +74,15 @@ rho : [ -0.12     -0.11     -0.11     -0.11    ] air density
 Most Sensitive Constraints
 --------------------------
        | Aircraft
-  +1.4 : .W ≥ .Fuselage.W + .Wing.W
+  +1.4 : W ≥ Fuselage.W + Wing.W
 
        | Mission
     +1 : Wfuel[0] ≥ Wfuel[1] + Wburn[0]
  +0.75 : Wfuel[1] ≥ Wfuel[2] + Wburn[1]
   +0.5 : Wfuel[2] ≥ Wfuel[3] + Wburn[2]
 
        | Aircraft.Wing
- +0.43 : .W ≥ S·.rho
+ +0.43 : W ≥ S·rho
 
 Insensitive Constraints |below +1e-05|
 --------------------------------------
@@ -97,7 +97,7 @@ Constraint Differences
 @@ -31,3 +31,4 @@
    Wing
     c = (S/A)^0.5
-    Aircraft.Wing.W ≥ S·Aircraft.Wing.rho
+    Wing.W ≥ S·Wing.rho
 + Wburn[:] ≥ 0.2·D[:]
 
 **********************

docs/source/examples/relaxation_output.txt

@@ -128,12 +128,12 @@ Constraints
   "relaxation constraints":
     "x_max":
       Relax2.x_max ≥ 1
-      x_max ≥ Relax2.OriginalValues.x_max/Relax2.x_max
-      x_max ≤ Relax2.OriginalValues.x_max·Relax2.x_max
+      x_max ≥ OriginalValues.x_max/Relax2.x_max
+      x_max ≤ OriginalValues.x_max·Relax2.x_max
     "x_min":
       Relax2.x_min ≥ 1
-      x_min ≥ Relax2.OriginalValues.x_min/Relax2.x_min
-      x_min ≤ Relax2.OriginalValues.x_min·Relax2.x_min
+      x_min ≥ OriginalValues.x_min/Relax2.x_min
+      x_min ≤ OriginalValues.x_min·Relax2.x_min
 
 Optimal Cost
 ------------
@@ -147,11 +147,6 @@ Relaxed Constants
   x_min: relaxed from 2 to 1
 ~~~~~~~~
 
-Model Sensitivities (sorts models in sections below)
--------------------
-  +2.0 : Relax2.OriginalValues
- <1e-8 : Relax2
-
 Free Variables
 --------------
     x : 1
@@ -176,8 +171,8 @@ x_max : -0.99
 Most Sensitive Constraints
 --------------------------
     +1 : x ≥ x_min
-    +1 : x_min ≥ Relax2.OriginalValues.x_min/Relax2.x_min
+    +1 : x_min ≥ OriginalValues.x_min/Relax2.x_min
  +0.99 : x ≤ x_max
- +0.99 : x_max ≤ Relax2.OriginalValues.x_max·Relax2.x_max
+ +0.99 : x_max ≤ OriginalValues.x_max·Relax2.x_max