Deriving RollPass and ThreeRollPass from Common Base (#244)

* bump version to 2.2a

* derive RollPass and ThreeRollBase from common base class

* adapt hooking point to base class

* fix

* fixed longitudinal angle calculation

* fix contact contour lines

---------

Co-authored-by: Christoph Renzing <christoph.renzing@imf.tu-freiberg.de>

Author: axtimhaus

hatch.toml

@@ -11,7 +11,7 @@ path = ".venv"
 dependencies = [
     "ipython ~= 8.0",
     "pytest ~= 7.0",
-    "pyroll-report ~= 2.0.0",
+    "pyroll-report ~= 2.0",
     "jupyter",
 ]
 features = ["plotly", "matplotlib"]
@@ -20,6 +20,7 @@ features = ["plotly", "matplotlib"]
 path = ""
 dependencies = [
     "pytest ~= 7.0",
+    "pyroll-report ~= 2.0",
 ]
 
 [[envs.test.matrix]]

pyroll/core/__init__.py

@@ -2,7 +2,7 @@
 
 from .grooves import *
 from .transport import Transport, CoolingPipe
-from .roll_pass import RollPass, DeformationUnit, ThreeRollPass
+from .roll_pass import BaseRollPass, RollPass, DeformationUnit, ThreeRollPass
 from .unit import Unit
 from .roll import Roll
 from .profile import *
@@ -12,25 +12,25 @@
 from .disk_elements import DiskElementUnit
 from .config import Config, config
 
-VERSION = "2.1.8"
+VERSION = "2.2.0a0"
 
 root_hooks.extend(
     [
-        RollPass.roll_force,
-        RollPass.Roll.roll_torque,
-        RollPass.elongation_efficiency,
+        BaseRollPass.roll_force,
+        BaseRollPass.Roll.roll_torque,
+        BaseRollPass.elongation_efficiency,
         Unit.power,
         Unit.OutProfile.cross_section,
         Unit.OutProfile.classifiers,
         Unit.OutProfile.strain,
         Unit.OutProfile.length,
         Unit.OutProfile.t,
-        RollPass.strain_rate,
-        RollPass.OutProfile.filling_ratio,
-        RollPass.OutProfile.cross_section_filling_ratio,
-        RollPass.OutProfile.filling_error,
-        RollPass.OutProfile.cross_section_error,
-        RollPass.OutProfile.velocity,
+        BaseRollPass.strain_rate,
+        BaseRollPass.OutProfile.filling_ratio,
+        BaseRollPass.OutProfile.cross_section_filling_ratio,
+        BaseRollPass.OutProfile.filling_error,
+        BaseRollPass.OutProfile.cross_section_error,
+        BaseRollPass.OutProfile.velocity,
         PassSequence.log_elongation,
     ]
 )

pyroll/core/roll_pass/__init__.py

@@ -1,3 +1,4 @@
+from .base import BaseRollPass
 from .roll_pass import RollPass
 from .three_roll_pass import ThreeRollPass
 from .deformation_unit import DeformationUnit