Merge pull request #141 from bessagroup/pr/1.3.2

add overwrite run method to function

VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

docs/source/conf.py

@@ -24,8 +24,8 @@
 project = 'f3dasm'
 author = 'Martin van der Schelling'
 copyright = '2022, Martin van der Schelling'
-version = '1.3.1'
-release = '1.3.1'
+version = '1.3.2'
+release = '1.3.2'
 
 # -- General configuration ----------------------------------------------------
 

setup.cfg

@@ -24,6 +24,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Operating System :: Microsoft :: Windows
     Operating System :: POSIX :: Linux
     Operating System :: MacOS

src/f3dasm/__init__.py

@@ -37,7 +37,7 @@
 #
 # =============================================================================
 
-__version__ = '1.3.1'
+__version__ = '1.3.2'
 
 # Log welcome message and the version of f3dasm
 logger.info(f"Imported f3dasm (version: {__version__})")

src/f3dasm/datageneration/datagenerator.py

@@ -21,16 +21,16 @@
 class DataGenerator:
     """Base class for a data generator"""
 
-    def pre_process() -> None:
+    def pre_process(self, **kwargs) -> None:
         """Function that handles the pre-processing"""
         ...
         # raise NotImplementedError("No pre-process function implemented!")
 
-    def execute() -> None:
+    def execute(self, **kwargs) -> None:
         """Function that calls the FEM simulator the pre-processing"""
         raise NotImplementedError("No execute function implemented!")
 
-    def post_process() -> None:
+    def post_process(self, **kwargs) -> None:
         """Function that handles the post-processing"""
         ...
 

src/f3dasm/datageneration/functions/function.py

@@ -91,6 +91,9 @@ def execute(self, design: Design) -> Design:
         design['y'] = float(self(x).ravel())
         return design
 
+    def run(self, design: Design) -> Design:
+        return self.execute(design)
+
     def _retrieve_original_input(self, x: np.ndarray):
         """Retrieve the original input vector if the input is augmented