From 8cc534e914a6a9e6a6b23333dd60930a9c3f722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Wed, 9 Oct 2024 15:49:37 +0200 Subject: [PATCH] Bump main to gz-math 9.0.0~pre1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- CMakeLists.txt | 4 +- Changelog.md | 4 ++ examples/CMakeLists.txt | 4 +- examples/angle_example.py | 10 +-- examples/diff_drive_odometry.py | 2 +- examples/gauss_markov_process_example.py | 2 +- examples/kmeans.py | 2 +- examples/rand_example.py | 2 +- examples/vector2_example.py | 8 +-- examples/vector3_example.py | 6 +- package.xml | 4 +- src/python_pybind11/test/Angle_TEST.py | 2 +- .../test/AxisAlignedBox_TEST.py | 2 +- src/python_pybind11/test/Box_TEST.py | 18 +++--- src/python_pybind11/test/Capsule_TEST.py | 12 ++-- src/python_pybind11/test/Color_TEST.py | 4 +- src/python_pybind11/test/Cone_TEST.py | 12 ++-- .../test/CoordinateVector3_TEST.py | 2 +- src/python_pybind11/test/Cylinder_TEST.py | 12 ++-- .../test/DiffDriveOdometry_TEST.py | 2 +- src/python_pybind11/test/Ellipsoid_TEST.py | 6 +- src/python_pybind11/test/Filter_TEST.py | 14 ++--- src/python_pybind11/test/Frustum_TEST.py | 2 +- .../test/GaussMarkovProcess_TEST.py | 2 +- src/python_pybind11/test/Helpers_TEST.py | 2 +- src/python_pybind11/test/Inertial_TEST.py | 2 +- src/python_pybind11/test/Interval_TEST.py | 2 +- src/python_pybind11/test/Kmeans_TEST.py | 4 +- src/python_pybind11/test/Line2_TEST.py | 4 +- src/python_pybind11/test/Line3_TEST.py | 4 +- src/python_pybind11/test/MassMatrix3_TEST.py | 12 ++-- src/python_pybind11/test/Material_TEST.py | 62 +++++++++---------- src/python_pybind11/test/Matrix3_TEST.py | 6 +- src/python_pybind11/test/Matrix4_TEST.py | 8 +-- src/python_pybind11/test/Matrix6_TEST.py | 2 +- .../test/MecanumDriveOdometry_TEST.py | 2 +- .../test/MovingWindowFilter_TEST.py | 8 +-- src/python_pybind11/test/OrientedBox_TEST.py | 2 +- src/python_pybind11/test/PID_TEST.py | 2 +- src/python_pybind11/test/Plane_TEST.py | 2 +- src/python_pybind11/test/Polynomial3_TEST.py | 2 +- src/python_pybind11/test/Pose3_TEST.py | 6 +- src/python_pybind11/test/Quaternion_TEST.py | 10 +-- src/python_pybind11/test/Rand_TEST.py | 2 +- src/python_pybind11/test/Region3_TEST.py | 2 +- src/python_pybind11/test/RollingMean_TEST.py | 2 +- .../test/RotationSpline_TEST.py | 6 +- .../test/SemanticVersion_TEST.py | 2 +- src/python_pybind11/test/SignalStats_TEST.py | 16 ++--- src/python_pybind11/test/Sphere_TEST.py | 20 +++--- .../test/SphericalCoordinates_TEST.py | 2 +- src/python_pybind11/test/Spline_TEST.py | 4 +- src/python_pybind11/test/StopWatch_TEST.py | 2 +- src/python_pybind11/test/Temperature_TEST.py | 2 +- src/python_pybind11/test/Triangle3_TEST.py | 6 +- src/python_pybind11/test/Triangle_TEST.py | 6 +- src/python_pybind11/test/Vector2_TEST.py | 4 +- src/python_pybind11/test/Vector3Stats_TEST.py | 4 +- src/python_pybind11/test/Vector3_TEST.py | 4 +- src/python_pybind11/test/Vector4_TEST.py | 4 +- tutorials/cppgetstarted.md | 2 +- tutorials/example_angle.md | 2 +- tutorials/example_triangle.md | 2 +- tutorials/example_vector2.md | 2 +- tutorials/pythongetstarted.md | 8 +-- tutorials/rotation_example.md | 2 +- 66 files changed, 195 insertions(+), 191 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9fc1f82a..15d017d64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(gz-math8 VERSION 8.0.0) +project(gz-math9 VERSION 9.0.0) #============================================================================ # Find gz-cmake @@ -18,7 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -gz_configure_project(VERSION_SUFFIX) +gz_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options diff --git a/Changelog.md b/Changelog.md index 6d50ee8d7..bc8af8fb5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## Gazebo Math 9.x + +### Gazebo Math 9.0.0 (20XX-XX-XX) + ## Gazebo Math 8.x ### Gazebo Math 8.0.0 (2024-09-25) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 48ed8f365..0d34a260d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) project(gz-math-examples) # Find the Gazebo Math library -find_package(gz-math8 REQUIRED) -set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR}) +find_package(gz-math9 REQUIRED) +set(GZ_MATH_VER ${gz-math9_VERSION_MAJOR}) add_executable(additively_separable_scalar_field3_example additively_separable_scalar_field3_example.cc) target_link_libraries(additively_separable_scalar_field3_example gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}) diff --git a/examples/angle_example.py b/examples/angle_example.py index 6a781dc02..48a1ae512 100644 --- a/examples/angle_example.py +++ b/examples/angle_example.py @@ -21,12 +21,12 @@ # $ export PYTHONPATH=/usr/lib/python:$PYTHONPATH # -import gz.math8 +import gz.math9 -print("PI in degrees = {}\n".format(gz.math8.Angle.PI.degree())) +print("PI in degrees = {}\n".format(gz.math9.Angle.PI.degree())) -a1 = gz.math8.Angle(1.5707) -a2 = gz.math8.Angle(0.7854) +a1 = gz.math9.Angle(1.5707) +a2 = gz.math9.Angle(0.7854) print("a1 = {} radians, {} degrees\n".format(a1.radian(), a1.degree())) print("a2 = {} radians, {} degrees\n".format(a2.radian(), a2.degree())) print("a1 * a2 = {} radians, {} degrees\n".format((a1 * a2).radian(), @@ -36,7 +36,7 @@ print("a1 - a2 = {} radians, {} degrees\n".format((a1 - a2).radian(), (a1 - a2).degree())) -a3 = gz.math8.Angle(15.707) +a3 = gz.math9.Angle(15.707) print("a3 = {} radians, {} degrees\n".format(a3.radian(), a3.degree())) a3.normalize() print("a3.Normalize = {} radians, {} degrees\n".format(a3.radian(), diff --git a/examples/diff_drive_odometry.py b/examples/diff_drive_odometry.py index 58bc1d882..28166b5ca 100644 --- a/examples/diff_drive_odometry.py +++ b/examples/diff_drive_odometry.py @@ -23,7 +23,7 @@ import datetime import math -from gz.math8 import Angle, DiffDriveOdometry +from gz.math9 import Angle, DiffDriveOdometry odom = DiffDriveOdometry() diff --git a/examples/gauss_markov_process_example.py b/examples/gauss_markov_process_example.py index a86102ef1..dce6928f9 100644 --- a/examples/gauss_markov_process_example.py +++ b/examples/gauss_markov_process_example.py @@ -26,7 +26,7 @@ # 2. Use gnuplot to create a plot: # gnuplot -e 'set terminal jpeg; plot "plot.data" with lines' > out.jpg import datetime -from gz.math8 import GaussMarkovProcess +from gz.math9 import GaussMarkovProcess # Create the process with: # * Start value of 20.2 diff --git a/examples/kmeans.py b/examples/kmeans.py index f7f83f058..d77f5e451 100644 --- a/examples/kmeans.py +++ b/examples/kmeans.py @@ -13,7 +13,7 @@ # limitations under the License. -from gz.math8 import Kmeans, Vector3d +from gz.math9 import Kmeans, Vector3d # Create some observations. obs = list([]) diff --git a/examples/rand_example.py b/examples/rand_example.py index 4dca412b9..eca5f782b 100644 --- a/examples/rand_example.py +++ b/examples/rand_example.py @@ -22,7 +22,7 @@ # 2. Use gnuplot to create a plot: # gnuplot -c rand_view_normal.gp > normal.jpg # gnuplot -c rand_view_uniform.gp > uniform.jpg -from gz.math8 import Rand +from gz.math9 import Rand import sys if (len(sys.argv) < 2): diff --git a/examples/vector2_example.py b/examples/vector2_example.py index 1a748eaff..a5ee4eec3 100644 --- a/examples/vector2_example.py +++ b/examples/vector2_example.py @@ -20,11 +20,11 @@ # # $ export PYTHONPATH=/usr/lib/python:$PYTHONPATH # -import gz.math8 +import gz.math9 -va = gz.math8.Vector2d(1, 2) -vb = gz.math8.Vector2d(3, 4) -vc = gz.math8.Vector2d(vb) +va = gz.math9.Vector2d(1, 2) +vb = gz.math9.Vector2d(3, 4) +vc = gz.math9.Vector2d(vb) print("va = {} {}\n".format(va.x(), va.y())) print("vb = {} {}\n".format(vb.x(), vb.y())) diff --git a/examples/vector3_example.py b/examples/vector3_example.py index ffecc3786..c881536df 100644 --- a/examples/vector3_example.py +++ b/examples/vector3_example.py @@ -20,12 +20,12 @@ # # $ export PYTHONPATH=/usr/lib/python:$PYTHONPATH # -import gz.math8 +import gz.math9 -v1 = gz.math8.Vector3d(0, 0, 3) +v1 = gz.math9.Vector3d(0, 0, 3) print("v1 = {} {} {}\n".format(v1.x(), v1.y(), v1.z())) -v2 = gz.math8.Vector3d(4, 0, 0) +v2 = gz.math9.Vector3d(4, 0, 0) print("v2 = {} {} {}\n".format(v2.x(), v2.y(), v2.z())) v3 = v1 + v2 diff --git a/package.xml b/package.xml index 34fb9b8fd..f15ec8eea 100644 --- a/package.xml +++ b/package.xml @@ -1,8 +1,8 @@ - gz-math8 - 8.0.0 + gz-math9 + 9.0.0 Gazebo Math : Math classes and functions for robot applications Steve Peters Aditya Pande diff --git a/src/python_pybind11/test/Angle_TEST.py b/src/python_pybind11/test/Angle_TEST.py index fd04c31fe..b97a4e18d 100644 --- a/src/python_pybind11/test/Angle_TEST.py +++ b/src/python_pybind11/test/Angle_TEST.py @@ -14,7 +14,7 @@ import unittest import math -from gz.math8 import Angle +from gz.math9 import Angle class TestAngle(unittest.TestCase): diff --git a/src/python_pybind11/test/AxisAlignedBox_TEST.py b/src/python_pybind11/test/AxisAlignedBox_TEST.py index 29175d8a1..4843d72d6 100644 --- a/src/python_pybind11/test/AxisAlignedBox_TEST.py +++ b/src/python_pybind11/test/AxisAlignedBox_TEST.py @@ -15,7 +15,7 @@ import math import unittest -from gz.math8 import AxisAlignedBox, Helpers, Line3d, Vector3d +from gz.math9 import AxisAlignedBox, Helpers, Line3d, Vector3d class TestAxisAlignedBox(unittest.TestCase): diff --git a/src/python_pybind11/test/Box_TEST.py b/src/python_pybind11/test/Box_TEST.py index bf9c530c6..4f2478724 100644 --- a/src/python_pybind11/test/Box_TEST.py +++ b/src/python_pybind11/test/Box_TEST.py @@ -15,7 +15,7 @@ import unittest import gz -from gz.math8 import Boxd, MassMatrix3d, Material, Planed, Vector3d +from gz.math9 import Boxd, MassMatrix3d, Material, Planed, Vector3d class TestBox(unittest.TestCase): @@ -46,30 +46,30 @@ def test_constructor(self): self.assertEqual(box, box2) # Dimension and mat constructor - box = Boxd(1.0, 2.0, 5.0, Material(gz.math8.MaterialType.WOOD)) + box = Boxd(1.0, 2.0, 5.0, Material(gz.math9.MaterialType.WOOD)) self.assertEqual(Vector3d(1.0, 2.0, 5.0), box.size()) - self.assertEqual(Material(gz.math8.MaterialType.WOOD), box.material()) + self.assertEqual(Material(gz.math9.MaterialType.WOOD), box.material()) - box2 = Boxd(1.0, 2.0, 5.0, Material(gz.math8.MaterialType.WOOD)) + box2 = Boxd(1.0, 2.0, 5.0, Material(gz.math9.MaterialType.WOOD)) self.assertEqual(box, box2) # Vector Dimension and mat constructor - box = Boxd(Vector3d(2.2, 2.0, 10.0), Material(gz.math8.MaterialType.WOOD)) + box = Boxd(Vector3d(2.2, 2.0, 10.0), Material(gz.math9.MaterialType.WOOD)) self.assertEqual(Vector3d(2.2, 2.0, 10.0), box.size()) - self.assertEqual(Material(gz.math8.MaterialType.WOOD), box.material()) + self.assertEqual(Material(gz.math9.MaterialType.WOOD), box.material()) - box2 = Boxd(Vector3d(2.2, 2.0, 10.0), Material(gz.math8.MaterialType.WOOD)) + box2 = Boxd(Vector3d(2.2, 2.0, 10.0), Material(gz.math9.MaterialType.WOOD)) self.assertEqual(box, box2) def test_mutators(self): box = Boxd() box.set_size(100.1, 2.3, 5.6) - box.set_material(Material(gz.math8.MaterialType.PINE)) + box.set_material(Material(gz.math9.MaterialType.PINE)) self.assertEqual(100.1, box.size().x()) self.assertEqual(2.3, box.size().y()) self.assertEqual(5.6, box.size().z()) - self.assertEqual(Material(gz.math8.MaterialType.PINE), box.material()) + self.assertEqual(Material(gz.math9.MaterialType.PINE), box.material()) box.set_size(Vector3d(3.4, 1.2, 0.5)) self.assertEqual(3.4, box.size().x()) diff --git a/src/python_pybind11/test/Capsule_TEST.py b/src/python_pybind11/test/Capsule_TEST.py index d037b45aa..836d94507 100644 --- a/src/python_pybind11/test/Capsule_TEST.py +++ b/src/python_pybind11/test/Capsule_TEST.py @@ -15,7 +15,7 @@ import unittest import gz -from gz.math8 import Capsuled, Material, MassMatrix3d +from gz.math9 import Capsuled, Material, MassMatrix3d import math @@ -41,14 +41,14 @@ def test_constructor(self): # Length, radius, mat capsule = Capsuled(1.0, 2.0, - Material(gz.math8.MaterialType.WOOD)); + Material(gz.math9.MaterialType.WOOD)); self.assertEqual(1.0, capsule.length()); self.assertEqual(2.0, capsule.radius()); - self.assertEqual(Material(gz.math8.MaterialType.WOOD), + self.assertEqual(Material(gz.math9.MaterialType.WOOD), capsule.material()); capsule2 = Capsuled(1.0, 2.0, - Material(gz.math8.MaterialType.WOOD)); + Material(gz.math9.MaterialType.WOOD)); self.assertEqual(capsule, capsule2); @@ -60,11 +60,11 @@ def test_mutators(self): capsule.set_length(100.1); capsule.set_radius(.123); - capsule.set_material(Material(gz.math8.MaterialType.PINE)); + capsule.set_material(Material(gz.math9.MaterialType.PINE)); self.assertEqual(100.1, capsule.length()); self.assertEqual(.123, capsule.radius()); - self.assertEqual(Material(gz.math8.MaterialType.PINE), + self.assertEqual(Material(gz.math9.MaterialType.PINE), capsule.material()); diff --git a/src/python_pybind11/test/Color_TEST.py b/src/python_pybind11/test/Color_TEST.py index a3db3db3d..97d2f449c 100644 --- a/src/python_pybind11/test/Color_TEST.py +++ b/src/python_pybind11/test/Color_TEST.py @@ -14,8 +14,8 @@ import math import unittest -from gz.math8 import Color -from gz.math8 import Vector3f +from gz.math9 import Color +from gz.math9 import Vector3f class TestColor(unittest.TestCase): diff --git a/src/python_pybind11/test/Cone_TEST.py b/src/python_pybind11/test/Cone_TEST.py index 2492bc940..7a4bd02f6 100644 --- a/src/python_pybind11/test/Cone_TEST.py +++ b/src/python_pybind11/test/Cone_TEST.py @@ -18,7 +18,7 @@ import unittest import gz -from gz.math8 import Coned, MassMatrix3d, Material, Quaterniond +from gz.math9 import Coned, MassMatrix3d, Material, Quaterniond class TestCone(unittest.TestCase): @@ -56,14 +56,14 @@ def test_constructor(self): self.assertEqual(cone, cone2) # Length, radius, mat and rot constructor - cone = Coned(1.0, 2.0, Material(gz.math8.MaterialType.WOOD), + cone = Coned(1.0, 2.0, Material(gz.math9.MaterialType.WOOD), Quaterniond(0.1, 0.2, 0.3)) self.assertEqual(1.0, cone.length()) self.assertEqual(2.0, cone.radius()) self.assertEqual(Quaterniond(0.1, 0.2, 0.3), cone.rotational_offset()) - self.assertEqual(Material(gz.math8.MaterialType.WOOD), cone.mat()) + self.assertEqual(Material(gz.math9.MaterialType.WOOD), cone.mat()) - cone2 = Coned(1.0, 2.0, Material(gz.math8.MaterialType.WOOD), + cone2 = Coned(1.0, 2.0, Material(gz.math9.MaterialType.WOOD), Quaterniond(0.1, 0.2, 0.3)) self.assertEqual(cone, cone2) @@ -77,12 +77,12 @@ def test_mutators(self): cone.set_length(100.1) cone.set_radius(.123) cone.set_rotational_offset(Quaterniond(1.2, 2.3, 3.4)) - cone.set_mat(Material(gz.math8.MaterialType.PINE)) + cone.set_mat(Material(gz.math9.MaterialType.PINE)) self.assertEqual(100.1, cone.length()) self.assertEqual(.123, cone.radius()) self.assertEqual(Quaterniond(1.2, 2.3, 3.4), cone.rotational_offset()) - self.assertEqual(Material(gz.math8.MaterialType.PINE), cone.mat()) + self.assertEqual(Material(gz.math9.MaterialType.PINE), cone.mat()) def test_volume_and_density(self): mass = 1.0 diff --git a/src/python_pybind11/test/CoordinateVector3_TEST.py b/src/python_pybind11/test/CoordinateVector3_TEST.py index 55574c102..bce72d27b 100644 --- a/src/python_pybind11/test/CoordinateVector3_TEST.py +++ b/src/python_pybind11/test/CoordinateVector3_TEST.py @@ -16,7 +16,7 @@ import math import unittest -from gz.math8 import Angle, CoordinateVector3, Vector3d +from gz.math9 import Angle, CoordinateVector3, Vector3d class TestCoordinateVector3(unittest.TestCase): diff --git a/src/python_pybind11/test/Cylinder_TEST.py b/src/python_pybind11/test/Cylinder_TEST.py index 56bdc0226..3bdad648c 100644 --- a/src/python_pybind11/test/Cylinder_TEST.py +++ b/src/python_pybind11/test/Cylinder_TEST.py @@ -16,7 +16,7 @@ import unittest import gz -from gz.math8 import Cylinderd, MassMatrix3d, Material, Quaterniond +from gz.math9 import Cylinderd, MassMatrix3d, Material, Quaterniond class TestCylinder(unittest.TestCase): @@ -54,14 +54,14 @@ def test_constructor(self): self.assertEqual(cylinder, cylinder2) # Length, radius, mat and rot constructor - cylinder = Cylinderd(1.0, 2.0, Material(gz.math8.MaterialType.WOOD), + cylinder = Cylinderd(1.0, 2.0, Material(gz.math9.MaterialType.WOOD), Quaterniond(0.1, 0.2, 0.3)) self.assertEqual(1.0, cylinder.length()) self.assertEqual(2.0, cylinder.radius()) self.assertEqual(Quaterniond(0.1, 0.2, 0.3), cylinder.rotational_offset()) - self.assertEqual(Material(gz.math8.MaterialType.WOOD), cylinder.mat()) + self.assertEqual(Material(gz.math9.MaterialType.WOOD), cylinder.mat()) - cylinder2 = Cylinderd(1.0, 2.0, Material(gz.math8.MaterialType.WOOD), + cylinder2 = Cylinderd(1.0, 2.0, Material(gz.math9.MaterialType.WOOD), Quaterniond(0.1, 0.2, 0.3)) self.assertEqual(cylinder, cylinder2) @@ -75,12 +75,12 @@ def test_mutators(self): cylinder.set_length(100.1) cylinder.set_radius(.123) cylinder.set_rotational_offset(Quaterniond(1.2, 2.3, 3.4)) - cylinder.set_mat(Material(gz.math8.MaterialType.PINE)) + cylinder.set_mat(Material(gz.math9.MaterialType.PINE)) self.assertEqual(100.1, cylinder.length()) self.assertEqual(.123, cylinder.radius()) self.assertEqual(Quaterniond(1.2, 2.3, 3.4), cylinder.rotational_offset()) - self.assertEqual(Material(gz.math8.MaterialType.PINE), cylinder.mat()) + self.assertEqual(Material(gz.math9.MaterialType.PINE), cylinder.mat()) def test_volume_and_density(self): mass = 1.0 diff --git a/src/python_pybind11/test/DiffDriveOdometry_TEST.py b/src/python_pybind11/test/DiffDriveOdometry_TEST.py index 707a1363c..dbb555b62 100644 --- a/src/python_pybind11/test/DiffDriveOdometry_TEST.py +++ b/src/python_pybind11/test/DiffDriveOdometry_TEST.py @@ -17,7 +17,7 @@ import time import unittest -from gz.math8 import Angle, DiffDriveOdometry +from gz.math9 import Angle, DiffDriveOdometry class TestDiffDriveOdometry(unittest.TestCase): diff --git a/src/python_pybind11/test/Ellipsoid_TEST.py b/src/python_pybind11/test/Ellipsoid_TEST.py index a96401c3d..c04fc5cf1 100644 --- a/src/python_pybind11/test/Ellipsoid_TEST.py +++ b/src/python_pybind11/test/Ellipsoid_TEST.py @@ -15,7 +15,7 @@ import unittest import gz -from gz.math8 import Ellipsoidd, Material, MassMatrix3d, Vector3d +from gz.math9 import Ellipsoidd, Material, MassMatrix3d, Vector3d import math @@ -40,7 +40,7 @@ def test_constructor(self): # Vector3 of radii and material expectedRadii = Vector3d(1.0, 2.0, 3.0) - expectedMaterial = Material(gz.math8.MaterialType.WOOD) + expectedMaterial = Material(gz.math9.MaterialType.WOOD) ellipsoid = Ellipsoidd(expectedRadii, expectedMaterial) self.assertEqual(expectedRadii, ellipsoid.radii()) self.assertEqual(expectedMaterial, ellipsoid.material()) @@ -57,7 +57,7 @@ def test_mutators(self): expectedRadii = Vector3d(1.0, 2.0, 3.0) ellipsoid.set_radii(expectedRadii) - expectedMaterial = Material(gz.math8.MaterialType.PINE) + expectedMaterial = Material(gz.math9.MaterialType.PINE) ellipsoid.set_material(expectedMaterial) self.assertEqual(expectedRadii, ellipsoid.radii()) diff --git a/src/python_pybind11/test/Filter_TEST.py b/src/python_pybind11/test/Filter_TEST.py index e0bb73f3b..213f207b1 100644 --- a/src/python_pybind11/test/Filter_TEST.py +++ b/src/python_pybind11/test/Filter_TEST.py @@ -13,13 +13,13 @@ # limitations under the License. import unittest -from gz.math8 import BiQuadd -from gz.math8 import BiQuadVector3 -from gz.math8 import OnePoled -from gz.math8 import OnePoleQuaternion -from gz.math8 import OnePoleVector3 -from gz.math8 import Quaterniond -from gz.math8 import Vector3d +from gz.math9 import BiQuadd +from gz.math9 import BiQuadVector3 +from gz.math9 import OnePoled +from gz.math9 import OnePoleQuaternion +from gz.math9 import OnePoleVector3 +from gz.math9 import Quaterniond +from gz.math9 import Vector3d class TestFilter(unittest.TestCase): diff --git a/src/python_pybind11/test/Frustum_TEST.py b/src/python_pybind11/test/Frustum_TEST.py index 3104701f7..ff6405d50 100644 --- a/src/python_pybind11/test/Frustum_TEST.py +++ b/src/python_pybind11/test/Frustum_TEST.py @@ -15,7 +15,7 @@ import math import unittest -from gz.math8 import Angle, AxisAlignedBox, Frustum, FrustumPlane, Planed, Pose3d, Vector3d +from gz.math9 import Angle, AxisAlignedBox, Frustum, FrustumPlane, Planed, Pose3d, Vector3d class TestFrustrum(unittest.TestCase): diff --git a/src/python_pybind11/test/GaussMarkovProcess_TEST.py b/src/python_pybind11/test/GaussMarkovProcess_TEST.py index f82f03d89..d0966a05a 100644 --- a/src/python_pybind11/test/GaussMarkovProcess_TEST.py +++ b/src/python_pybind11/test/GaussMarkovProcess_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import unittest -from gz.math8 import GaussMarkovProcess +from gz.math9 import GaussMarkovProcess class TestGaussMarkovProcess(unittest.TestCase): diff --git a/src/python_pybind11/test/Helpers_TEST.py b/src/python_pybind11/test/Helpers_TEST.py index 840c23570..348fb97c6 100644 --- a/src/python_pybind11/test/Helpers_TEST.py +++ b/src/python_pybind11/test/Helpers_TEST.py @@ -15,7 +15,7 @@ import math import unittest -from gz.math8 import (Helpers, gz_box_volume, gz_box_volume_v, gz_cylinder_volume, +from gz.math9 import (Helpers, gz_box_volume, gz_box_volume_v, gz_cylinder_volume, gz_cone_volume, gz_sphere_volume, Vector3d, equal, fixnan, greater_or_near_equal, is_even, is_odd, is_power_of_two, isnan, is_time_string, less_or_near_equal, max, mean, min, diff --git a/src/python_pybind11/test/Inertial_TEST.py b/src/python_pybind11/test/Inertial_TEST.py index d4c8d8933..227a84c94 100644 --- a/src/python_pybind11/test/Inertial_TEST.py +++ b/src/python_pybind11/test/Inertial_TEST.py @@ -16,7 +16,7 @@ import math import unittest -from gz.math8 import Inertiald, Quaterniond, Pose3d, Matrix3d, MassMatrix3d, Vector3d +from gz.math9 import Inertiald, Quaterniond, Pose3d, Matrix3d, MassMatrix3d, Vector3d class TestInertial(unittest.TestCase): diff --git a/src/python_pybind11/test/Interval_TEST.py b/src/python_pybind11/test/Interval_TEST.py index 847c794e0..3f71bbbbe 100644 --- a/src/python_pybind11/test/Interval_TEST.py +++ b/src/python_pybind11/test/Interval_TEST.py @@ -14,7 +14,7 @@ import math import unittest -from gz.math8 import Intervald +from gz.math9 import Intervald class TestInterval(unittest.TestCase): diff --git a/src/python_pybind11/test/Kmeans_TEST.py b/src/python_pybind11/test/Kmeans_TEST.py index d7d639a2d..19202c49a 100644 --- a/src/python_pybind11/test/Kmeans_TEST.py +++ b/src/python_pybind11/test/Kmeans_TEST.py @@ -13,8 +13,8 @@ # limitations under the License. import unittest -from gz.math8 import Kmeans -from gz.math8 import Vector3d +from gz.math9 import Kmeans +from gz.math9 import Vector3d class TestKmeans(unittest.TestCase): diff --git a/src/python_pybind11/test/Line2_TEST.py b/src/python_pybind11/test/Line2_TEST.py index 9310893c6..41c9e72e8 100644 --- a/src/python_pybind11/test/Line2_TEST.py +++ b/src/python_pybind11/test/Line2_TEST.py @@ -14,8 +14,8 @@ import math import unittest -from gz.math8 import Line2d -from gz.math8 import Vector2d +from gz.math9 import Line2d +from gz.math9 import Vector2d class TestLine2d(unittest.TestCase): diff --git a/src/python_pybind11/test/Line3_TEST.py b/src/python_pybind11/test/Line3_TEST.py index 3f5fe4754..c7c8cc74d 100644 --- a/src/python_pybind11/test/Line3_TEST.py +++ b/src/python_pybind11/test/Line3_TEST.py @@ -14,8 +14,8 @@ import math import unittest -from gz.math8 import Line3d -from gz.math8 import Vector3d +from gz.math9 import Line3d +from gz.math9 import Vector3d class TestLine3d(unittest.TestCase): diff --git a/src/python_pybind11/test/MassMatrix3_TEST.py b/src/python_pybind11/test/MassMatrix3_TEST.py index b998d8d7c..afde177d0 100644 --- a/src/python_pybind11/test/MassMatrix3_TEST.py +++ b/src/python_pybind11/test/MassMatrix3_TEST.py @@ -16,12 +16,12 @@ import unittest import math -from gz.math8 import sort3 -from gz.math8 import MassMatrix3d -from gz.math8 import Material -from gz.math8 import Vector3d -from gz.math8 import Matrix3d -from gz.math8 import Quaterniond +from gz.math9 import sort3 +from gz.math9 import MassMatrix3d +from gz.math9 import Material +from gz.math9 import Vector3d +from gz.math9 import Matrix3d +from gz.math9 import Quaterniond GZ_PI = 3.14159265358979323846 GZ_PI_2 = 1.57079632679489661923 diff --git a/src/python_pybind11/test/Material_TEST.py b/src/python_pybind11/test/Material_TEST.py index c4d83b78e..2a82a1b53 100644 --- a/src/python_pybind11/test/Material_TEST.py +++ b/src/python_pybind11/test/Material_TEST.py @@ -15,64 +15,64 @@ import sys import unittest -import gz.math8 +import gz.math9 class TestMaterial(unittest.TestCase): def test_init(self): - mats = gz.math8.Material.predefined() + mats = gz.math9.Material.predefined() self.assertTrue(len(mats)) # Make sure that the number of elements in the MaterialType enum matches # the number of elements in the MaterialDensity::materials map. - self.assertEqual(gz.math8.MaterialType.UNKNOWN_MATERIAL, - gz.math8.MaterialType(len(mats))) + self.assertEqual(gz.math9.MaterialType.UNKNOWN_MATERIAL, + gz.math9.MaterialType(len(mats))) # Iterate over each element in the enum. Check the that enum value # matches the type value in the mats map. - for i in range(gz.math8.MaterialType.UNKNOWN_MATERIAL): + for i in range(gz.math9.MaterialType.UNKNOWN_MATERIAL): # Get the type of the material for MaterialType i. - self.assertEqual(gz.math8.MaterialType(i), - mats[gz.math8.MaterialType(i)].type()) + self.assertEqual(gz.math9.MaterialType(i), + mats[gz.math9.MaterialType(i)].type()) # The name should not be empty - self.assertTrue(mats[gz.math8.MaterialType(i)].name()) + self.assertTrue(mats[gz.math9.MaterialType(i)].name()) # The density should be less than the max double value and greater than # zero. - self.assertLess(mats[gz.math8.MaterialType(i)].density(), sys.float_info.max) - self.assertGreater(mats[gz.math8.MaterialType(i)].density(), 0.0) + self.assertLess(mats[gz.math9.MaterialType(i)].density(), sys.float_info.max) + self.assertGreater(mats[gz.math9.MaterialType(i)].density(), 0.0) - malicious = gz.math8.Material(gz.math8.MaterialType(42)) + malicious = gz.math9.Material(gz.math9.MaterialType(42)) self.assertEqual(-1.0, malicious.density()) self.assertEqual('', malicious.name()) - byDensity = gz.math8.Material(42.2) + byDensity = gz.math9.Material(42.2) self.assertEqual(42.2, byDensity.density()) - self.assertEqual(gz.math8.MaterialType.UNKNOWN_MATERIAL, byDensity.type()) + self.assertEqual(gz.math9.MaterialType.UNKNOWN_MATERIAL, byDensity.type()) def test_comparison(self): - aluminum = gz.math8.Material(gz.math8.MaterialType.ALUMINUM) + aluminum = gz.math9.Material(gz.math9.MaterialType.ALUMINUM) - modified = gz.math8.Material(aluminum) + modified = gz.math9.Material(aluminum) self.assertEqual(modified, aluminum) modified.set_density(1234.0) self.assertNotEqual(modified, aluminum) - modified = gz.math8.Material(aluminum) + modified = gz.math9.Material(aluminum) self.assertEqual(modified, aluminum) - modified.set_type(gz.math8.MaterialType.PINE) + modified.set_type(gz.math9.MaterialType.PINE) self.assertNotEqual(modified, aluminum) def test_accessors(self): - mat = gz.math8.Material("Aluminum") - mat1 = gz.math8.Material("aluminum") - mat2 = gz.math8.Material(gz.math8.MaterialType.ALUMINUM) - mat3 = gz.math8.Material(mat2) + mat = gz.math9.Material("Aluminum") + mat1 = gz.math9.Material("aluminum") + mat2 = gz.math9.Material(gz.math9.MaterialType.ALUMINUM) + mat3 = gz.math9.Material(mat2) self.assertAlmostEqual(2700.0, mat.density()) self.assertEqual(mat, mat1) @@ -80,31 +80,31 @@ def test_accessors(self): self.assertEqual(mat2, mat3) # Test constructor - mat4 = gz.math8.Material(mat3) + mat4 = gz.math9.Material(mat3) self.assertEqual(mat2, mat4) - mat5 = gz.math8.Material(mat4) + mat5 = gz.math9.Material(mat4) self.assertEqual(mat2, mat5) - mat = gz.math8.Material("Notfoundium") + mat = gz.math9.Material("Notfoundium") self.assertGreater(0.0, mat.density()) - self.assertEqual(gz.math8.MaterialType.UNKNOWN_MATERIAL, + self.assertEqual(gz.math9.MaterialType.UNKNOWN_MATERIAL, mat.type()) self.assertFalse(mat.name()) - material = gz.math8.Material() + material = gz.math9.Material() material.set_to_nearest_density(19300.0) - self.assertEqual(gz.math8.MaterialType.TUNGSTEN, material.type()) + self.assertEqual(gz.math9.MaterialType.TUNGSTEN, material.type()) self.assertAlmostEqual(19300.0, material.density()) - material = gz.math8.Material() + material = gz.math9.Material() material.set_to_nearest_density(1001001.001, 1e-3) - self.assertEqual(gz.math8.MaterialType.UNKNOWN_MATERIAL, + self.assertEqual(gz.math9.MaterialType.UNKNOWN_MATERIAL, material.type()) self.assertGreater(0.0, material.density()) - material = gz.math8.Material() + material = gz.math9.Material() material.set_to_nearest_density(1001001.001) - self.assertEqual(gz.math8.MaterialType.TUNGSTEN, material.type()) + self.assertEqual(gz.math9.MaterialType.TUNGSTEN, material.type()) self.assertAlmostEqual(19300, material.density()) diff --git a/src/python_pybind11/test/Matrix3_TEST.py b/src/python_pybind11/test/Matrix3_TEST.py index 3aaa1fef1..2343147e0 100644 --- a/src/python_pybind11/test/Matrix3_TEST.py +++ b/src/python_pybind11/test/Matrix3_TEST.py @@ -14,9 +14,9 @@ import math import unittest -from gz.math8 import Matrix3d, Matrix3f -from gz.math8 import Quaterniond -from gz.math8 import Vector3d +from gz.math9 import Matrix3d, Matrix3f +from gz.math9 import Quaterniond +from gz.math9 import Vector3d import numpy_helpers diff --git a/src/python_pybind11/test/Matrix4_TEST.py b/src/python_pybind11/test/Matrix4_TEST.py index 39b1c5ce0..528e3f16d 100644 --- a/src/python_pybind11/test/Matrix4_TEST.py +++ b/src/python_pybind11/test/Matrix4_TEST.py @@ -14,10 +14,10 @@ import math import unittest -from gz.math8 import Matrix4d, Matrix4f -from gz.math8 import Pose3d -from gz.math8 import Quaterniond -from gz.math8 import Vector3d +from gz.math9 import Matrix4d, Matrix4f +from gz.math9 import Pose3d +from gz.math9 import Quaterniond +from gz.math9 import Vector3d import numpy_helpers diff --git a/src/python_pybind11/test/Matrix6_TEST.py b/src/python_pybind11/test/Matrix6_TEST.py index fc4335a53..b4f525be6 100644 --- a/src/python_pybind11/test/Matrix6_TEST.py +++ b/src/python_pybind11/test/Matrix6_TEST.py @@ -14,7 +14,7 @@ import math import unittest -from gz.math8 import Matrix3d, Matrix6d, Matrix6dCorner, Matrix6f +from gz.math9 import Matrix3d, Matrix6d, Matrix6dCorner, Matrix6f import numpy_helpers diff --git a/src/python_pybind11/test/MecanumDriveOdometry_TEST.py b/src/python_pybind11/test/MecanumDriveOdometry_TEST.py index 952118d41..baa21f425 100644 --- a/src/python_pybind11/test/MecanumDriveOdometry_TEST.py +++ b/src/python_pybind11/test/MecanumDriveOdometry_TEST.py @@ -17,7 +17,7 @@ import time import unittest -from gz.math8 import MecanumDriveOdometry, Angle +from gz.math9 import MecanumDriveOdometry, Angle class TestMecanumDriveOdometry(unittest.TestCase): diff --git a/src/python_pybind11/test/MovingWindowFilter_TEST.py b/src/python_pybind11/test/MovingWindowFilter_TEST.py index 308c043d2..9e106406a 100644 --- a/src/python_pybind11/test/MovingWindowFilter_TEST.py +++ b/src/python_pybind11/test/MovingWindowFilter_TEST.py @@ -13,10 +13,10 @@ # limitations under the License. import unittest -from gz.math8 import MovingWindowFilterd -from gz.math8 import MovingWindowFilteri -from gz.math8 import MovingWindowFilterv3 -from gz.math8 import Vector3d +from gz.math9 import MovingWindowFilterd +from gz.math9 import MovingWindowFilteri +from gz.math9 import MovingWindowFilterv3 +from gz.math9 import Vector3d class TestFilter(unittest.TestCase): diff --git a/src/python_pybind11/test/OrientedBox_TEST.py b/src/python_pybind11/test/OrientedBox_TEST.py index f3a276827..d94f4bea2 100644 --- a/src/python_pybind11/test/OrientedBox_TEST.py +++ b/src/python_pybind11/test/OrientedBox_TEST.py @@ -15,7 +15,7 @@ import math import unittest -from gz.math8 import OrientedBoxd, MassMatrix3d, Material, Pose3d, Vector3d +from gz.math9 import OrientedBoxd, MassMatrix3d, Material, Pose3d, Vector3d g_tolerance = 1e-6 diff --git a/src/python_pybind11/test/PID_TEST.py b/src/python_pybind11/test/PID_TEST.py index 0cb11d347..591c78b07 100644 --- a/src/python_pybind11/test/PID_TEST.py +++ b/src/python_pybind11/test/PID_TEST.py @@ -14,7 +14,7 @@ import datetime import unittest -from gz.math8 import PID +from gz.math9 import PID class TestPID(unittest.TestCase): diff --git a/src/python_pybind11/test/Plane_TEST.py b/src/python_pybind11/test/Plane_TEST.py index fd35a0b01..284bc83f8 100644 --- a/src/python_pybind11/test/Plane_TEST.py +++ b/src/python_pybind11/test/Plane_TEST.py @@ -14,7 +14,7 @@ import unittest -from gz.math8 import AxisAlignedBox, Planed, PlaneSide, Vector2d, Vector3d +from gz.math9 import AxisAlignedBox, Planed, PlaneSide, Vector2d, Vector3d class TestPlane(unittest.TestCase): diff --git a/src/python_pybind11/test/Polynomial3_TEST.py b/src/python_pybind11/test/Polynomial3_TEST.py index f8a7361f6..f0d2818d5 100644 --- a/src/python_pybind11/test/Polynomial3_TEST.py +++ b/src/python_pybind11/test/Polynomial3_TEST.py @@ -14,7 +14,7 @@ import math import unittest -from gz.math8 import Helpers, Intervald, Polynomial3d, Vector4d, isnan +from gz.math9 import Helpers, Intervald, Polynomial3d, Vector4d, isnan class TestInterval(unittest.TestCase): diff --git a/src/python_pybind11/test/Pose3_TEST.py b/src/python_pybind11/test/Pose3_TEST.py index b4fcc29c3..84004df60 100644 --- a/src/python_pybind11/test/Pose3_TEST.py +++ b/src/python_pybind11/test/Pose3_TEST.py @@ -14,9 +14,9 @@ import math import unittest -from gz.math8 import Pose3d -from gz.math8 import Quaterniond -from gz.math8 import Vector3d +from gz.math9 import Pose3d +from gz.math9 import Quaterniond +from gz.math9 import Vector3d class TestPose3(unittest.TestCase): diff --git a/src/python_pybind11/test/Quaternion_TEST.py b/src/python_pybind11/test/Quaternion_TEST.py index c6f55418f..126238997 100644 --- a/src/python_pybind11/test/Quaternion_TEST.py +++ b/src/python_pybind11/test/Quaternion_TEST.py @@ -14,11 +14,11 @@ import math import unittest -from gz.math8 import Matrix3d -from gz.math8 import Matrix4d -from gz.math8 import Quaterniond -from gz.math8 import Quaternionf -from gz.math8 import Vector3d +from gz.math9 import Matrix3d +from gz.math9 import Matrix4d +from gz.math9 import Quaterniond +from gz.math9 import Quaternionf +from gz.math9 import Vector3d class TestQuaternion(unittest.TestCase): diff --git a/src/python_pybind11/test/Rand_TEST.py b/src/python_pybind11/test/Rand_TEST.py index a8f76f1b8..8cb5988ba 100644 --- a/src/python_pybind11/test/Rand_TEST.py +++ b/src/python_pybind11/test/Rand_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import unittest -from gz.math8 import Rand +from gz.math9 import Rand class TestRand(unittest.TestCase): diff --git a/src/python_pybind11/test/Region3_TEST.py b/src/python_pybind11/test/Region3_TEST.py index 6cc2dd001..40261dcde 100644 --- a/src/python_pybind11/test/Region3_TEST.py +++ b/src/python_pybind11/test/Region3_TEST.py @@ -14,7 +14,7 @@ import unittest -from gz.math8 import Intervald, Region3d, Vector3d +from gz.math9 import Intervald, Region3d, Vector3d class TestRegion3(unittest.TestCase): diff --git a/src/python_pybind11/test/RollingMean_TEST.py b/src/python_pybind11/test/RollingMean_TEST.py index 8655b3189..1d78d5ccb 100644 --- a/src/python_pybind11/test/RollingMean_TEST.py +++ b/src/python_pybind11/test/RollingMean_TEST.py @@ -14,7 +14,7 @@ import math import unittest -from gz.math8 import RollingMean +from gz.math9 import RollingMean class TestRollingMean(unittest.TestCase): diff --git a/src/python_pybind11/test/RotationSpline_TEST.py b/src/python_pybind11/test/RotationSpline_TEST.py index 56619f4d6..aca7c8e8f 100644 --- a/src/python_pybind11/test/RotationSpline_TEST.py +++ b/src/python_pybind11/test/RotationSpline_TEST.py @@ -13,9 +13,9 @@ # limitations under the License. import unittest -from gz.math8 import Quaterniond -from gz.math8 import RotationSpline -from gz.math8 import Vector3d +from gz.math9 import Quaterniond +from gz.math9 import RotationSpline +from gz.math9 import Vector3d class TestRotationSpline(unittest.TestCase): diff --git a/src/python_pybind11/test/SemanticVersion_TEST.py b/src/python_pybind11/test/SemanticVersion_TEST.py index cffe42ade..79107ea28 100644 --- a/src/python_pybind11/test/SemanticVersion_TEST.py +++ b/src/python_pybind11/test/SemanticVersion_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import unittest -from gz.math8 import SemanticVersion +from gz.math9 import SemanticVersion class TestSemanticVersion(unittest.TestCase): diff --git a/src/python_pybind11/test/SignalStats_TEST.py b/src/python_pybind11/test/SignalStats_TEST.py index 93de1c9dd..192b34ab7 100644 --- a/src/python_pybind11/test/SignalStats_TEST.py +++ b/src/python_pybind11/test/SignalStats_TEST.py @@ -14,14 +14,14 @@ import math import unittest -from gz.math8 import Rand -from gz.math8 import SignalMaxAbsoluteValue -from gz.math8 import SignalMaximum -from gz.math8 import SignalMean -from gz.math8 import SignalMinimum -from gz.math8 import SignalRootMeanSquare -from gz.math8 import SignalStats -from gz.math8 import SignalVariance +from gz.math9 import Rand +from gz.math9 import SignalMaxAbsoluteValue +from gz.math9 import SignalMaximum +from gz.math9 import SignalMean +from gz.math9 import SignalMinimum +from gz.math9 import SignalRootMeanSquare +from gz.math9 import SignalStats +from gz.math9 import SignalVariance class TestSignalStats(unittest.TestCase): diff --git a/src/python_pybind11/test/Sphere_TEST.py b/src/python_pybind11/test/Sphere_TEST.py index 647733003..ca70fbd60 100644 --- a/src/python_pybind11/test/Sphere_TEST.py +++ b/src/python_pybind11/test/Sphere_TEST.py @@ -16,7 +16,7 @@ import unittest import gz -from gz.math8 import MassMatrix3d, Material, Planed, Sphered, Vector2d, Vector3d +from gz.math9 import MassMatrix3d, Material, Planed, Sphered, Vector2d, Vector3d class TestSphere(unittest.TestCase): @@ -39,28 +39,28 @@ def test_constructor(self): self.assertEqual(sphere, sphere2) # Radius and mat - sphere = Sphered(1.0, Material(gz.math8.MaterialType.WOOD)) + sphere = Sphered(1.0, Material(gz.math9.MaterialType.WOOD)) self.assertEqual(1.0, sphere.radius()) - self.assertEqual(Material(gz.math8.MaterialType.WOOD), sphere.material()) + self.assertEqual(Material(gz.math9.MaterialType.WOOD), sphere.material()) - sphere2 = Sphered(1.0, Material(gz.math8.MaterialType.WOOD)) + sphere2 = Sphered(1.0, Material(gz.math9.MaterialType.WOOD)) self.assertEqual(sphere, sphere2) def test_comparison(self): - wood = Sphered(0.1, Material(gz.math8.MaterialType.WOOD)) + wood = Sphered(0.1, Material(gz.math9.MaterialType.WOOD)) modified = wood self.assertEqual(wood, modified) modified.set_radius(1.0) - wood = Sphered(0.1, Material(gz.math8.MaterialType.WOOD)) + wood = Sphered(0.1, Material(gz.math9.MaterialType.WOOD)) self.assertNotEqual(wood, modified) modified = wood - wood = Sphered(0.1, Material(gz.math8.MaterialType.WOOD)) + wood = Sphered(0.1, Material(gz.math9.MaterialType.WOOD)) self.assertEqual(wood, modified) - modified.set_material(Material(gz.math8.MaterialType.PINE)) + modified.set_material(Material(gz.math9.MaterialType.PINE)) self.assertNotEqual(wood, modified) def test_mutators(self): @@ -69,10 +69,10 @@ def test_mutators(self): self.assertEqual(Material(), sphere.material()) sphere.set_radius(.123) - sphere.set_material(Material(gz.math8.MaterialType.PINE)) + sphere.set_material(Material(gz.math9.MaterialType.PINE)) self.assertEqual(.123, sphere.radius()) - self.assertEqual(Material(gz.math8.MaterialType.PINE), sphere.material()) + self.assertEqual(Material(gz.math9.MaterialType.PINE), sphere.material()) def test_volume_and_density(self): mass = 1.0 diff --git a/src/python_pybind11/test/SphericalCoordinates_TEST.py b/src/python_pybind11/test/SphericalCoordinates_TEST.py index 4b4591263..feb659e77 100644 --- a/src/python_pybind11/test/SphericalCoordinates_TEST.py +++ b/src/python_pybind11/test/SphericalCoordinates_TEST.py @@ -16,7 +16,7 @@ import unittest import warnings -from gz.math8 import Angle, CoordinateVector3, SphericalCoordinates, Vector3d +from gz.math9 import Angle, CoordinateVector3, SphericalCoordinates, Vector3d def ignore_deprecation_warnings(test_func): diff --git a/src/python_pybind11/test/Spline_TEST.py b/src/python_pybind11/test/Spline_TEST.py index d33e5911e..8778a3776 100644 --- a/src/python_pybind11/test/Spline_TEST.py +++ b/src/python_pybind11/test/Spline_TEST.py @@ -14,8 +14,8 @@ import math import unittest -from gz.math8 import Spline -from gz.math8 import Vector3d +from gz.math9 import Spline +from gz.math9 import Vector3d class TestSpline(unittest.TestCase): diff --git a/src/python_pybind11/test/StopWatch_TEST.py b/src/python_pybind11/test/StopWatch_TEST.py index 19127ddfe..bfea1f9c8 100644 --- a/src/python_pybind11/test/StopWatch_TEST.py +++ b/src/python_pybind11/test/StopWatch_TEST.py @@ -16,7 +16,7 @@ import unittest from datetime import datetime, timedelta -from gz.math8 import Stopwatch +from gz.math9 import Stopwatch class TestBox(unittest.TestCase): diff --git a/src/python_pybind11/test/Temperature_TEST.py b/src/python_pybind11/test/Temperature_TEST.py index ceaaba4eb..bbbbd1d4d 100644 --- a/src/python_pybind11/test/Temperature_TEST.py +++ b/src/python_pybind11/test/Temperature_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import unittest -from gz.math8 import Temperature +from gz.math9 import Temperature class TestTemperature(unittest.TestCase): diff --git a/src/python_pybind11/test/Triangle3_TEST.py b/src/python_pybind11/test/Triangle3_TEST.py index 60a145a67..4657f4243 100644 --- a/src/python_pybind11/test/Triangle3_TEST.py +++ b/src/python_pybind11/test/Triangle3_TEST.py @@ -14,9 +14,9 @@ import math import unittest -from gz.math8 import Line3d -from gz.math8 import Triangle3d -from gz.math8 import Vector3d +from gz.math9 import Line3d +from gz.math9 import Triangle3d +from gz.math9 import Vector3d class TestTriangle(unittest.TestCase): diff --git a/src/python_pybind11/test/Triangle_TEST.py b/src/python_pybind11/test/Triangle_TEST.py index 721ff22ae..2ac8bdbe6 100644 --- a/src/python_pybind11/test/Triangle_TEST.py +++ b/src/python_pybind11/test/Triangle_TEST.py @@ -14,9 +14,9 @@ import math import unittest -from gz.math8 import Line2d -from gz.math8 import Triangled -from gz.math8 import Vector2d +from gz.math9 import Line2d +from gz.math9 import Triangled +from gz.math9 import Vector2d class TestTriangle(unittest.TestCase): diff --git a/src/python_pybind11/test/Vector2_TEST.py b/src/python_pybind11/test/Vector2_TEST.py index 3b67a78ad..eaadf0d24 100644 --- a/src/python_pybind11/test/Vector2_TEST.py +++ b/src/python_pybind11/test/Vector2_TEST.py @@ -16,8 +16,8 @@ import math import unittest -from gz.math8 import Vector2d -from gz.math8 import Vector2f +from gz.math9 import Vector2d +from gz.math9 import Vector2f import numpy_helpers diff --git a/src/python_pybind11/test/Vector3Stats_TEST.py b/src/python_pybind11/test/Vector3Stats_TEST.py index 83d4268fd..6a6a873b0 100644 --- a/src/python_pybind11/test/Vector3Stats_TEST.py +++ b/src/python_pybind11/test/Vector3Stats_TEST.py @@ -13,8 +13,8 @@ # limitations under the License. import unittest -from gz.math8 import Vector3d -from gz.math8 import Vector3Stats +from gz.math9 import Vector3d +from gz.math9 import Vector3Stats class TestVector3Stats(unittest.TestCase): diff --git a/src/python_pybind11/test/Vector3_TEST.py b/src/python_pybind11/test/Vector3_TEST.py index 000d3243c..ba6d28381 100644 --- a/src/python_pybind11/test/Vector3_TEST.py +++ b/src/python_pybind11/test/Vector3_TEST.py @@ -17,8 +17,8 @@ import unittest import numpy_helpers -from gz.math8 import Vector3d -from gz.math8 import Vector3f +from gz.math9 import Vector3d +from gz.math9 import Vector3f class TestVector3(unittest.TestCase): diff --git a/src/python_pybind11/test/Vector4_TEST.py b/src/python_pybind11/test/Vector4_TEST.py index e6e273a25..e873e4dbc 100644 --- a/src/python_pybind11/test/Vector4_TEST.py +++ b/src/python_pybind11/test/Vector4_TEST.py @@ -17,8 +17,8 @@ import unittest import numpy_helpers -from gz.math8 import Vector4d -from gz.math8 import Vector4f +from gz.math9 import Vector4d +from gz.math9 import Vector4f class TestVector4(unittest.TestCase): diff --git a/tutorials/cppgetstarted.md b/tutorials/cppgetstarted.md index 39afb8f76..43facca87 100644 --- a/tutorials/cppgetstarted.md +++ b/tutorials/cppgetstarted.md @@ -70,7 +70,7 @@ int main() To compile this code on UNIX with pkg-config, use the following command: ```{.bash} -c++ $(pkg-config --cflags gz-math8) main.cpp -o main +c++ $(pkg-config --cflags gz-math9) main.cpp -o main ``` The program can then be run as: diff --git a/tutorials/example_angle.md b/tutorials/example_angle.md index 5827504cf..6cbc6f9fe 100644 --- a/tutorials/example_angle.md +++ b/tutorials/example_angle.md @@ -9,7 +9,7 @@ This tutorial explains how to use the `Angle` class from Gazebo Math library. Go to `gz-math/examples` and use `cmake` to compile the code: ```{.sh} -git clone https://github.com/gazebosim/gz-math/ -b gz-math8 +git clone https://github.com/gazebosim/gz-math/ -b gz-math9 cd gz-math/examples mkdir build cd build diff --git a/tutorials/example_triangle.md b/tutorials/example_triangle.md index e42ffe93d..9d8767dcb 100644 --- a/tutorials/example_triangle.md +++ b/tutorials/example_triangle.md @@ -7,7 +7,7 @@ This tutorial explains how to use the `Triangle` class from Gazebo Math library. Go to `gz-math/examples` and use `cmake` to compile the code: ```{.sh} -git clone https://github.com/gazebosim/gz-math/ -b gz-math8 +git clone https://github.com/gazebosim/gz-math/ -b gz-math9 cd gz-math/examples mkdir build cd build diff --git a/tutorials/example_vector2.md b/tutorials/example_vector2.md index 484b69872..1b1df9302 100644 --- a/tutorials/example_vector2.md +++ b/tutorials/example_vector2.md @@ -9,7 +9,7 @@ This tutorial explains how to use the `Vector2` class from Gazebo Math library. To compile the code, go to `gz-math/examples` and use `cmake`: ```bash -git clone https://github.com/gazebosim/gz-math/ -b gz-math8 +git clone https://github.com/gazebosim/gz-math/ -b gz-math9 cd gz-math/examples mkdir build cd build diff --git a/tutorials/pythongetstarted.md b/tutorials/pythongetstarted.md index db0b8e725..32b7835dc 100644 --- a/tutorials/pythongetstarted.md +++ b/tutorials/pythongetstarted.md @@ -25,12 +25,12 @@ if __name__ == "__main__": main() ``` -The easiest way to include Gazebo Math is through `import gz.math8`. +The easiest way to include Gazebo Math is through `import gz.math9`. At this point your main file should look like ```python -import gz.math8 +import gz.math9 def main(): pass @@ -46,7 +46,7 @@ and `Vector3i` (Vector3 using integers). The result of this addition will be a main file similar to the following. ```python -from gz.math8 import Vector3d +from gz.math9 import Vector3d def main(): point1 = Vector3d(1, 3, 5) @@ -60,7 +60,7 @@ Finally, we can compute the distance between `point1` and `point2` using the `gz.math.Vector3.distance()` function and output the distance value. ```python -from gz.math8 import Vector3d +from gz.math9 import Vector3d def main(): point1 = Vector3d(1, 3, 5) diff --git a/tutorials/rotation_example.md b/tutorials/rotation_example.md index ecb892bd9..c8edfac04 100644 --- a/tutorials/rotation_example.md +++ b/tutorials/rotation_example.md @@ -7,7 +7,7 @@ This example explains how to use quaternions and euler angles, and how to conver Go to `gz-math/examples` and use `cmake` to compile the code: ```{.sh} -git clone https://github.com/gazebosim/gz-math/ -b gz-math8 +git clone https://github.com/gazebosim/gz-math/ -b gz-math9 cd gz-math/examples mkdir build cd build