From 809aea93790e63de62bd3a5fa471e76214587c31 Mon Sep 17 00:00:00 2001 From: Peter Sharpe Date: Wed, 3 Apr 2024 00:45:53 -0400 Subject: [PATCH] refactors np.Inf -> np.inf, in accordance with deprecation in upcoming NumPy 2.0 --- .../aero_2D/airfoil_optimizer/airfoil_optimizer.py | 2 +- aerosandbox/aerodynamics/aero_3D/aero_buildup.py | 2 +- aerosandbox/geometry/wing.py | 4 ++-- aerosandbox/tools/pretty_plots/plots/contour.py | 2 +- .../pretty_plots/utilities/natural_univariate_spline.py | 2 +- .../nd_rosenbrock/run_times.py | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aerosandbox/aerodynamics/aero_2D/airfoil_optimizer/airfoil_optimizer.py b/aerosandbox/aerodynamics/aero_2D/airfoil_optimizer/airfoil_optimizer.py index 0e9165323..3546f4de2 100644 --- a/aerosandbox/aerodynamics/aero_2D/airfoil_optimizer/airfoil_optimizer.py +++ b/aerosandbox/aerodynamics/aero_2D/airfoil_optimizer/airfoil_optimizer.py @@ -123,7 +123,7 @@ def augmented_objective(x): repanel=False ) if np.isnan(xfoil["Cd"]).any(): - return np.Inf + return np.inf objective = np.sqrt(np.mean(xfoil["Cd"] ** 2)) # RMS diff --git a/aerosandbox/aerodynamics/aero_3D/aero_buildup.py b/aerosandbox/aerodynamics/aero_3D/aero_buildup.py index 35bfe74f5..6a888d4af 100644 --- a/aerosandbox/aerodynamics/aero_3D/aero_buildup.py +++ b/aerosandbox/aerodynamics/aero_3D/aero_buildup.py @@ -557,7 +557,7 @@ def wing_aerodynamics(self, ) half_span = sum(sectional_spans) if len(wing.xsecs) > 0: - span_inboard_to_YZ_plane = np.Inf + span_inboard_to_YZ_plane = np.inf for i in range(len(wing.xsecs)): span_inboard_to_YZ_plane = np.minimum( span_inboard_to_YZ_plane, diff --git a/aerosandbox/geometry/wing.py b/aerosandbox/geometry/wing.py index d9ec2bbef..5069baf78 100644 --- a/aerosandbox/geometry/wing.py +++ b/aerosandbox/geometry/wing.py @@ -276,7 +276,7 @@ def span(self, if include_centerline_distance and len(self.xsecs) > 0: - half_span_to_XZ_plane = np.Inf + half_span_to_XZ_plane = np.inf for i in i_range: half_span_to_XZ_plane = np.minimum( @@ -403,7 +403,7 @@ def area(self, if include_centerline_distance and len(self.xsecs) > 0: - half_span_to_centerline = np.Inf + half_span_to_centerline = np.inf for i in range(len(self.xsecs)): quarter_chord_location = self._compute_xyz_of_WingXSec( diff --git a/aerosandbox/tools/pretty_plots/plots/contour.py b/aerosandbox/tools/pretty_plots/plots/contour.py index 40112024f..30b299fc2 100644 --- a/aerosandbox/tools/pretty_plots/plots/contour.py +++ b/aerosandbox/tools/pretty_plots/plots/contour.py @@ -19,7 +19,7 @@ def contour( extendrect: bool = True, linelabels_format: Union[str, Callable[[float], str]] = eng_string, linelabels_fontsize: float = 8, - max_side_length_nondim: float = np.Inf, + max_side_length_nondim: float = np.inf, colorbar_label: str = None, x_log_scale: bool = False, y_log_scale: bool = False, diff --git a/aerosandbox/tools/pretty_plots/utilities/natural_univariate_spline.py b/aerosandbox/tools/pretty_plots/utilities/natural_univariate_spline.py index 7743d4018..b43ab7c25 100644 --- a/aerosandbox/tools/pretty_plots/utilities/natural_univariate_spline.py +++ b/aerosandbox/tools/pretty_plots/utilities/natural_univariate_spline.py @@ -87,7 +87,7 @@ def __init__(self, [spline(spline.x[-1], 1)], [spline(spline.x[-1])] ]), - x=np.array([np.Inf]) + x=np.array([np.inf]) ) ### Add spline knots for natural negative extrapolation diff --git a/tutorial/01 - Optimization and Math/01 - Optimization Benchmark Problems/nd_rosenbrock/run_times.py b/tutorial/01 - Optimization and Math/01 - Optimization Benchmark Problems/nd_rosenbrock/run_times.py index 5720c6a6d..6b3256ae3 100644 --- a/tutorial/01 - Optimization and Math/01 - Optimization Benchmark Problems/nd_rosenbrock/run_times.py +++ b/tutorial/01 - Optimization and Math/01 - Optimization Benchmark Problems/nd_rosenbrock/run_times.py @@ -41,7 +41,7 @@ def solve_scipy_bfgs(N=10): method="BFGS", tol=1e-8, options=dict( - maxiter=np.Inf, + maxiter=np.inf, ) ) @@ -74,8 +74,8 @@ def solve_scipy_nm(N=10): x0=get_initial_guess(N), method="Nelder-Mead", options=dict( - maxiter=np.Inf, - maxfev=np.Inf, + maxiter=np.inf, + maxfev=np.inf, xatol=1e-8, adaptive=True, )