26
26
except ImportError :
27
27
from .tools import cached_property
28
28
29
- try :
30
- from functools import cached_property
31
- except ImportError :
32
- from .tools import cached_property
33
-
34
29
35
30
class Flight :
36
31
"""Keeps all flight information and has a method to simulate flight.
@@ -2287,7 +2282,7 @@ def maxRailButton1NormalForce(self):
2287
2282
if self .outOfRailTimeIndex == 0 :
2288
2283
return 0
2289
2284
else :
2290
- return np . max ( self .railButton1NormalForce )
2285
+ return self .railButton1NormalForce . max
2291
2286
2292
2287
@cached_property
2293
2288
def maxRailButton1ShearForce (self ):
@@ -2299,7 +2294,7 @@ def maxRailButton1ShearForce(self):
2299
2294
if self .outOfRailTimeIndex == 0 :
2300
2295
return 0
2301
2296
else :
2302
- return np . max ( self .railButton1ShearForce )
2297
+ return self .railButton1ShearForce . max
2303
2298
2304
2299
@cached_property
2305
2300
def maxRailButton2NormalForce (self ):
@@ -2311,7 +2306,7 @@ def maxRailButton2NormalForce(self):
2311
2306
if self .outOfRailTimeIndex == 0 :
2312
2307
return 0
2313
2308
else :
2314
- return np . max ( self .railButton2NormalForce )
2309
+ return self .railButton2NormalForce . max
2315
2310
2316
2311
@cached_property
2317
2312
def maxRailButton2ShearForce (self ):
@@ -2323,7 +2318,7 @@ def maxRailButton2ShearForce(self):
2323
2318
if self .outOfRailTimeIndex == 0 :
2324
2319
return 0
2325
2320
else :
2326
- return np . max ( self .railButton2ShearForce )
2321
+ return self .railButton2ShearForce . max
2327
2322
2328
2323
@funcify_method (
2329
2324
"Time (s)" , "Horizontal Distance to Launch Point (m)" , "spline" , "constant"
0 commit comments