Rm old linear crossings
@@ -250,45 +250,6 @@ def calc_segments(x, v):
# think! nanargmax makes everythign super ugly because numpy changed the wraning
# in all nan slices to a valueerror...it's nans, aaarghgghg
-
-def calc_linear_crossing(m, left_v, right_v):
- """
- Computes the intersection between two line segments, defined by two common
- x points, and the values of both segments at both x points
-
- Parameters
- ----------
- m : list or np.array, length 2
- The two common x coordinates. m[0] < m[1] is assumed
- left_v :list or np.array, length 2
- y values of the two segments at m[0]
- right_v : list or np.array, length 2
- y values of the two segments at m[1]
-
- Returns
- -------
- (m_int, v_int): a tuple with the corrdinates of the intercept.
- if there is no intercept in the interval [m[0],m[1]], (None,None)
-
- """
-
- # Find slopes of both segments
- delta_m = m[1] - m[0]
- s0 = (right_v[0] - left_v[0]) / delta_m
- s1 = (right_v[1] - left_v[1]) / delta_m
-
- if s1 == s0:
- if left_v[0] == left_v[1]:
- return (m[0], left_v[0])
- else:
- return (None, None)
- else:
- # Find h where intercept happens at m[0] + h
- h = (left_v[0] - left_v[1]) / (s1 - s0)
- if h >= 0 and h <= (m[1] - m[0]):
- return (m[0] + h, left_v[0] + h * s0)
-
-
def calc_multiline_envelope(M, C, V_T, commonM, find_crossings=False):
"""
Do the envelope step of the DCEGM algorithm. Takes in market ressources,
