Davout 0.1.1.dev154__tar.gz → 0.1.1.dev156__tar.gz

{davout-0.1.1.dev154/source/Davout.egg-info → davout-0.1.1.dev156}/PKG-INFO

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

{davout-0.1.1.dev154 → davout-0.1.1.dev156}/pyproject.toml

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

{davout-0.1.1.dev154 → davout-0.1.1.dev156}/source/Davout/DeepMech/custom_architectures/SVD_quotient_space.py

@@ -1364,34 +1364,12 @@ class SVDQuotientSpace:
 
         average_raw_vector = tf.reduce_mean(raw_vector)
 
-        #"""
-        # Option 1
         # Concatenates the non-free component of the Householder vector
         # to the first position
 
         raw_vector = tf.math.l2_normalize(tf.concat([tf.sqrt(
         tf.math.square(average_raw_vector)+
-        self.householder_epsilon_squared)[None], raw_vector], axis=0))#"""
-
-        """
-        # Option 2
-        # Evaluates the first non-zero component squared
-
-        first_component_squared = (tf.math.square(average_raw_vector)+
-        self.householder_epsilon_squared)
-
-        # Evaluates the normalization factor
-
-        normalization_factor = tf.math.rsqrt(first_component_squared+
-        tf.reduce_sum(tf.math.square(raw_vector)))
-
-        # Recomputes the raw vector by concatenating the first non-zero
-        # component and making everything unitary
-
-        raw_vector = tf.concat([tf.sqrt(first_component_squared)[None]*
-        normalization_factor, raw_vector*normalization_factor], axis=0)
-
-        #"""
+        self.householder_epsilon_squared)[None], raw_vector], axis=0))
 
         # Rescales the raw vector to have unit norm, then adds the trai-
         # ling zeros and returns it
@@ -1433,24 +1411,10 @@ class SVDQuotientSpace:
         # only for the non-zero components and that the result is padded
         # to be added to the original input vector
 
-        """
-        # Option 1
         return input_vector+tf.pad(-(self.two*tf.einsum('bi,i->b', 
         input_vector[:,number_of_leading_zeros:], 
         householder_vector_core)[:,None]*householder_vector_core[None,:]
-        ), [[0,0], [number_of_leading_zeros,0]])#"""
-
-        #"""
-        # Option 2
-        active_input = input_vector[:,number_of_leading_zeros:]
-
-        update = -(self.two*tf.einsum('bi,i->b', active_input,
-        householder_vector_core)[:,None]*householder_vector_core[None,:])
-
-        return tf.ensure_shape(tf.concat([input_vector[:,
-        :number_of_leading_zeros], active_input+update], axis=1), 
-        input_vector.shape)
-        #"""
+        ), [[0,0], [number_of_leading_zeros,0]])
     
     # Defines a function to create a wrapper for the method that multi-
     # plies the input vector by an orthogonal matrix and, then, calls

{davout-0.1.1.dev154 → davout-0.1.1.dev156/source/Davout.egg-info}/PKG-INFO

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