Davout 0.1.1.dev146__tar.gz → 0.1.1.dev147__tar.gz

{davout-0.1.1.dev146/source/Davout.egg-info → davout-0.1.1.dev147}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev146
+Version: 0.1.1.dev147
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>

{davout-0.1.1.dev146 → davout-0.1.1.dev147}/pyproject.toml

@@ -63,7 +63,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Davout"
-version = "0.1.1.dev146"
+version = "0.1.1.dev147"
 description = "Scientific computing utilities combining FEM, ANN and tooling"
 readme = "README.md"
 authors = [

{davout-0.1.1.dev146 → davout-0.1.1.dev147}/source/Davout/DeepMech/aa_tests/tests_tool_box/test_SVD_based_NNs.py

@@ -6,11 +6,11 @@ import os
 
 import tensorflow as tf
 
-from ...tool_box import ANN_tools, training_tools, parameters_tools, differentiation_tools
+from .....Davout.DeepMech.tool_box import ANN_tools, training_tools, parameters_tools, differentiation_tools
 
-from ....PythonicUtilities.testing_tools import run_class_of_tests, evaluate_function_performance
+from .....Davout.PythonicUtilities.testing_tools import run_class_of_tests, evaluate_function_performance
 
-from ....PythonicUtilities.path_tools import get_parent_path_of_file
+from .....Davout.PythonicUtilities.path_tools import get_parent_path_of_file
 
 # Defines a function to test the SVD-based architecture
 
@@ -351,6 +351,12 @@ class TestSVDArchitecture:
 
         n_evaluation_runs = 100
 
+        # Selects the method for building each Householder vector from 
+        # the flat tensor of DOFs of each Householder chain
+
+        householder_vector_builder_method = ("get_householder_vector_f"+
+        "rom_parameters")
+
         # Sets sets of architectures
 
         number_of_neurons_hidden_layer_main_network_performance = [[500],
@@ -509,7 +515,8 @@ class TestSVDArchitecture:
             "ce", "weights modulating function": 
             modulating_function_performance, "Householder epsilon": 1.0, 
             "activations accessory layer list": 
-            accessory_activation_list_performance}  
+            accessory_activation_list_performance, "householder vector"+
+            " builder method": householder_vector_builder_method}  
 
             # Assembles the model
 

{davout-0.1.1.dev146 → davout-0.1.1.dev147}/source/Davout/DeepMech/custom_architectures/SVD_quotient_space.py

@@ -34,14 +34,19 @@ class SVDQuotientSpace:
         "ts matrix", "default": "identity"}, "Householder epsilon": {
         "type": float, "description": "Float number with the tolerance"+
         " to the calculation of the non-free component of each Househo"+
-        "lder vector", "default": 1.0}}, "custom_architecture", "SVDQu"+
-        "otientSpace")
+        "lder vector", "default": 1.0}, "householder vector builder me"+
+        "thod": {"type": str, "description": "String with the name of "+
+        "the function that constructs each Householder vector from the"+
+        " flat tensor of DOFs of the Householder chain for each orthog"+
+        "onal matrix", "default": "get_householder_vector_from_paramet"+
+        "ers"}}, "custom_architecture", "SVDQuotientSpace")
 
         # Selects the method for computing the Householder vectors from
         # the flat tensor of parameters
 
-        self.method_for_householder_vector_from_parameters = (
-        self.get_householder_vector_from_parameters)
+        self.method_for_householder_vector_from_parameters = getattr(
+        self, architecture_info_dict["householder vector builder metho"+
+        "d"])
         
         # Stores variables that will be used in the get_config for seri-
         # alization and class rebuilding

{davout-0.1.1.dev146 → davout-0.1.1.dev147}/source/Davout/PythonicUtilities/testing_tools.py

@@ -155,6 +155,10 @@ def evaluate_function_performance(function_object, n_warm_up_runs=1,
 n_evaluation_runs=10, confidence_level=0.95, 
 n_evaluations_to_show_memory_data=None, ten_notation=" E"):
 
+    # Instantiates the class of colors in the terminal
+
+    terminal_color = TerminalColor()
+
     # Iterates over the warm-up runs to get all possible graphs compiled
 
     print("Starts the "+str(n_warm_up_runs)+" warm-up runs\n")
@@ -176,13 +180,14 @@ n_evaluations_to_show_memory_data=None, ten_notation=" E"):
     completion_time = current_computer_time+datetime.timedelta(seconds=
     estimated_time)
 
-    print("The "+str(n_warm_up_runs)+" warm-up runs took "+str(
-    warm_up_time)+" seconds. Thus, it is estimated\nthat the "+str(
-    n_evaluation_runs)+" will took "+str(estimated_time)+" seconds\nNo"+
-    "w, the computer strikes its clock at "+str(
-    current_computer_time.strftime('%H:%M:%S'))+";\nthe evaluations ar"+
-    "e estimated to be completed at "+str(completion_time.strftime('%H'+
-    ':%M:%S'))+"\n")
+    print("The "+str(n_warm_up_runs)+" warm-up runs took "+
+    terminal_color(warm_up_time, "green")+" seconds. Thus, it is estim"+
+    "ated\nthat the "+terminal_color(n_evaluation_runs, "yellow")+"eva"+
+    "luation runs will took "+terminal_color(estimated_time, "bold red")
+    +" seconds\nNow, the computer strikes its clock at "+terminal_color(
+    current_computer_time.strftime('%H:%M:%S'), "bold light blue")+";"+
+    "\nthe evaluations are estimated to be completed at "+terminal_color(
+    completion_time.strftime('%H:%M:%S'), "bold red")+"\n")
 
     # Collects all memory garbage to avoid any information leakage that
     # might affect future computations

{davout-0.1.1.dev146 → davout-0.1.1.dev147/source/Davout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev146
+Version: 0.1.1.dev147
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>