Merge pull request GazzolaLab#316 from Ali-7800/113_dev_contact

Refactoring contact functions + tests
sy-cui · Nov 7, 2023 · 1da4dbc · 1da4dbc
2 parents 337ecba + e4be7f1
commit 1da4dbc
Show file tree

Hide file tree

Showing 12 changed files with 2,407 additions and 2,980 deletions.
diff --git a/elastica/_contact_functions.py b/elastica/_contact_functions.py
diff --git a/elastica/contact_forces.py b/elastica/contact_forces.py
diff --git a/elastica/interaction.py b/elastica/interaction.py
diff --git a/elastica/joint.py b/elastica/joint.py
diff --git a/tests/test_contact_classes.py b/tests/test_contact_classes.py
diff --git a/tests/test_contact_common_functions.py b/tests/test_contact_common_functions.py
diff --git a/tests/test_contact_functions.py b/tests/test_contact_functions.py
@@ -5,7 +5,7 @@
 from elastica.typing import RodBase
 from elastica.rigidbody import Cylinder, Sphere
 
-from elastica.contact_forces import (
+from elastica._contact_functions import (
     _calculate_contact_forces_rod_cylinder,
     _calculate_contact_forces_rod_rod,
     _calculate_contact_forces_self_rod,