Davout 0.1.1.dev175__tar.gz → 0.1.1.dev177__tar.gz

{davout-0.1.1.dev175/source/Davout.egg-info → davout-0.1.1.dev177}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev175
+Version: 0.1.1.dev177
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>
@@ -65,6 +65,11 @@ such as FEniCS, TensorFlow, GMSH, ParaView, and matplotlib.
 # Installation using pip
 pip install Davout
 
+Or for a special dev version (123 for example). Check the pyproject.toml file to consult the
+latest version at the line 'version = "0.1.1.dev123"':
+
+pip install Davout==0.1.1.dev123
+
 # Installation using installer file
 Download the zip file, unzip it and move it to a suitable directory.
 Open the Davout folder, where setup.py is located. Open this path in

{davout-0.1.1.dev175 → davout-0.1.1.dev177}/README.md

@@ -46,6 +46,11 @@ such as FEniCS, TensorFlow, GMSH, ParaView, and matplotlib.
 # Installation using pip
 pip install Davout
 
+Or for a special dev version (123 for example). Check the pyproject.toml file to consult the
+latest version at the line 'version = "0.1.1.dev123"':
+
+pip install Davout==0.1.1.dev123
+
 # Installation using installer file
 Download the zip file, unzip it and move it to a suitable directory.
 Open the Davout folder, where setup.py is located. Open this path in

{davout-0.1.1.dev175 → davout-0.1.1.dev177}/pyproject.toml

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

{davout-0.1.1.dev175 → davout-0.1.1.dev177}/source/Davout/GraphUtilities/aa_tests/tests_plotting_tools.py

@@ -2,6 +2,8 @@
 
 import numpy as np
 
+from scipy.optimize import curve_fit
+
 from ...PythonicUtilities.path_tools import get_parent_path_of_file
 
 from ...PythonicUtilities.testing_tools import run_class_of_tests
@@ -57,7 +59,8 @@ class TestPlots:
         y_data = [[1.0, 2.0, 3.0], [1.0, 4.0, 6.0]]
 
         plotting_tools.plane_plot(x_data=x_data, y_data=y_data, 
-        file_name="test_two_curves_list")
+        file_name="test_two_curves_list", label=["Exponential $a=24.83$", 
+        "Numerical data"])
 
     # Defines a function to test the plot of a curve with error bar
     
@@ -285,6 +288,95 @@ class TestPlots:
         title="$E^{p}\\left(\mathbf{D},\mathbf{x}_{c}\\right)$",
         color_map="coolwarm", aspect_ratio=1.0)
 
+    def test_curve_fitting(self):
+
+        #############################################################
+        # Defines a cdde that generates the graph of the rate failures
+        # of the simulation, to comprove that increasing the p exponent 
+        # of the Lp norm, the parameters set region approaches to the 
+        # hypercube topology
+        #############################################################
+
+        p = [2, 4, 8, 16, 32]
+
+        # Dados feitos no lagrange
+
+        #error_rate = [0.12, 9.12, 18.58, 22.38, 24.29]
+
+        # Dados feitos no pc do rafael
+
+        error_rate = [0.12, 6.66, 17.82, 22.89, 24.71]
+
+        def Logistic(x, a, b, c):
+
+            return(a/(1+(1/(np.exp(b*x+c)))))
+
+        def Hiperbole(x, a, b,c):
+
+            return (c/(x+b))+a
+
+        def Exponential(x, a, b, c):
+
+            return (a-1/np.exp((b*x)+c))
+
+        curve_function = Exponential
+
+        # 2. Aplicar a regressão usando o curve_fit
+        # 'popt' retornará os parâmetros otimizados (a, b)
+        # 'pcov' retornará a matriz de covariância (incerteza do ajuste)
+
+        popt, pcov = curve_fit(curve_function, p, error_rate)
+
+        # Extraindo os coeficientes encontrados
+        a_opt, b_opt, c_opt = popt
+
+        print(f"Coeficientes encontrados: a = {a_opt:.4f}, b = {b_opt:.4f}, c = {c_opt:.4f}")
+
+        # 3. Gerar a curva ajustada para o plot com uma malha fina
+        x_fit = np.linspace(min(p), max(p), 500)
+        y_fit = curve_function(x_fit, a_opt, b_opt, c_opt)
+
+        p1=plotting_tools.plane_plot(
+                x_data=x_fit,#[np.array(p), x_fit], 
+                y_data=y_fit,#[np.array(error_rate), y_fit], 
+                file_name="error_rate_failure_Lp_norm.pdf", 
+                parent_path=get_parent_path_of_file(),  # Saves in the folder path
+                color_map="coolwarm", 
+                color=1.0,
+                label=str(curve_function.__name__)+" $a="+str(round(a_opt, 2))+"$",
+                verbose=True, 
+                highlight_points=False,
+                x_label="$p$", 
+                y_label="Error rate $\\Brackets{\\%}$", 
+                x_ticksLabels=p,
+                y_ticksLabels=error_rate,
+                transparent_background=True,
+                latex_package="[nohyperref]{LaTeXUtilities}", 
+                dpi=1000
+            )
+
+        plotting_tools.plane_plot(
+                x_data=p,#[np.array(p), x_fit], 
+                y_data=error_rate,#[np.array(error_rate), y_fit], 
+                file_name="error_rate_failure_Lp_norm.png", 
+                parent_path=get_parent_path_of_file(),  # Saves in the folder path
+                color_map="coolwarm", 
+                color=0.0,
+                element_style="x",
+                element_size=5.0,
+                plot_type="scatter",
+                verbose=True, 
+                label="Numerical data",
+                x_label="$p$", 
+                y_label="Error rate $\\Brackets{\\%}$", 
+                x_ticksLabels=p,
+                y_ticksLabels=error_rate,
+                latex_package="[nohyperref]{LaTeXUtilities}",
+                transparent_background=True,
+                dpi=1000,
+                plot_object=p1
+            )
+
 # Runs all tests
 
 if __name__=="__main__":

{davout-0.1.1.dev175 → davout-0.1.1.dev177}/source/Davout/GraphUtilities/plotting_tools.py

@@ -48,7 +48,8 @@ os.environ.get("TEXINPUTS", ""))
 matplotlib.rcParams.update({"text.usetex": True, "font.family": "serif",
 "font.serif": ["Computer Modern Roman"], "axes.labelsize": 14, "fo"+
 "nt.size": 14, "legend.fontsize": 12, "xtick.labelsize": 12, "ytic"+
-"k.labelsize": 12, "text.latex.preamble": r"\usepackage{LaTeXUtilities}"})
+"k.labelsize": 12, "text.latex.preamble": r"\usepackage[nohyperref]{La"+
+"TeXUtilities}"})
 
 ########################################################################
 #                          Bidimensional plots                         #
@@ -402,13 +403,30 @@ transparent_background=False):
 
             multiple_curves = len(x_data)
 
+    # Gets the import preamble of the LaTeX package
+
+    preamble_import = "" 
+
+    # Checks if there are brackets that indicate options 
+
+    if "[" in latex_package:
+
+        # Puts the package directly 
+
+        preamble_import = r"\usepackage"+str(latex_package)
+
+    # Otherwise, puts the brackets
+
+    else:
+
+        preamble_import = r"\usepackage{"+str(latex_package)+"}"
+
     # Sets the graph to be plotted in LaTeX style
 
     plt.rcParams.update({"text.usetex": True, "font.family": "serif",
     "font.serif": ["Computer Modern Roman"], "axes.labelsize": 14, "fo"+
     "nt.size": 14, "legend.fontsize": 12, "xtick.labelsize": 12, "ytic"+
-    "k.labelsize": 12, "text.latex.preamble": r"\usepackage{"+str(
-    latex_package)+"}"})
+    "k.labelsize": 12, "text.latex.preamble": preamble_import})
 
     # Gets the color map
 

{davout-0.1.1.dev175 → davout-0.1.1.dev177}/source/Davout/GraphUtilities/tool_box/text_excerpt_tools.py

@@ -4,6 +4,8 @@ from copy import deepcopy
 
 from .collage_classes import milimeters_to_points
 
+from matplotlib.transforms import Affine2D
+
 # Defines a function to plot excerpts of text from a list
 
 def plot_text_excerpts(general_axes, input_text_list, alignments_class, 
@@ -159,6 +161,20 @@ color_class, verbose, depth_order):
 
         color = color_class(color)
 
+        # Verifies if aspect ration (width/height) was given
+
+        aspect_ratio = 1.0
+
+        if "aspect ratio" in input_dictionary:
+
+            aspect_ratio = input_dictionary["aspect ratio"]
+
+        # Creates the linear transform to scale the text expert according
+        # to the aspect ratio
+
+        text_transform = (Affine2D().scale(aspect_ratio, 1.0)+
+        general_axes.transData)
+
         # Adds the text input
 
         if verbose:
@@ -168,7 +184,6 @@ color_class, verbose, depth_order):
 
         general_axes.text(position[0], position[1], input_text, fontsize=
         font_size, ha=ha, va=va, rotation=angle, rotation_mode="anchor", 
-        zorder=local_depth_order, transform=general_axes.transData,
-        color=color)
+        zorder=local_depth_order, transform=text_transform, color=color)
 
     return general_axes, depth_order

{davout-0.1.1.dev175 → davout-0.1.1.dev177}/source/Davout/LaTeXUtilities/LaTeXUtilities.sty

@@ -12,6 +12,15 @@
 
 \newcommand{\LU@babelLang}{english}
 
+% Initializes the option to import hyperref or not. Hyperref will be
+% automatically imported unless this package is imported as
+% \usepackage[nohyperref]{LaTeXUtilities}
+
+\newif\ifLU@hyperref
+\LU@hyperreftrue
+
+\DeclareOption{nohyperref}{\LU@hyperreffalse}
+
 % Declares the options
 
 \DeclareOption{english}{\renewcommand{\LU@babelLang}{english}}
@@ -54,7 +63,12 @@
 \RequirePackage{mathrsfs}
 %\RequirePackage{authblk}
 \RequirePackage{accents}
-\RequirePackage{hyperref}
+
+% Imports hyperref if necessary
+\ifLU@hyperref
+    \RequirePackage{hyperref}
+\fi
+
 \RequirePackage{algpseudocode}
 \RequirePackage{algorithm}
 \RequirePackage[algo2e,ruled,linesnumbered]{algorithm2e}
@@ -754,6 +768,10 @@ top=3cm, bottom=2cm}}\onehalfspacing\setlength{\parindent}{1.25cm}%
 
 \newcommand{\EulerAlmansi}{\boldsymbol{e}}
 
+% xiii) Inifinitesimal strain tensor
+
+\newcommand{\InfinitesimalStrain}{\boldsymbol{\varepsilon}}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                            Optimization                            %%
@@ -927,6 +945,13 @@ $\displaystyle\left\{\begin{aligned}
 \definecolor{Yellow4}{rgb}{1.0,0.6,0.333}
 \definecolor{Yellow5}{rgb}{1.0,0.498,0.165}
 
+% Blues
+\definecolor{Blue1}{rgb}{0.835,0.898,1.0}
+\definecolor{Blue2}{rgb}{0.667,0.800,1.0}
+\definecolor{Blue3}{rgb}{0.502,0.702,1.0}
+\definecolor{Blue4}{rgb}{0.333,0.600,1.0}
+\definecolor{Blue5}{rgb}{0.165,0.498,1.0}
+
 % Defines a set of environments with three shades of shadows
 
 \newenvironment{LightShade}{\definecolor{shadecolor}{rgb}{%
@@ -1132,6 +1157,21 @@ colback=Red1, colbacktitle=Red2, colframe=black, coltitle=black,
 title=\textit{\textbf{\ExerciseName\;\theexercise}}, halign title=left, 
 lefttitle=0pt, width=\linewidth, boxrule=0.5pt, arc=0pt, left=2pt}
 
+% Environment to create a blue-colored box as wide as the page for pro-
+% jects. Creates the counter of project boxes
+
+\newcounter{project}[section]
+
+\renewcommand{\theproject}{\thesection.\arabic{project}}
+
+\newcommand{\ProjectName}{Project}
+
+\newtcolorbox{ProjectBox}{before title=\refstepcounter{project},
+% Updates the project counter
+colback=Blue1, colbacktitle=Blue3, colframe=black, coltitle=black, 
+title=\textit{\textbf{\ProjectName\;\theproject}}, halign title=left, 
+lefttitle=0pt, width=\linewidth, boxrule=0.5pt, arc=0pt, left=2pt}
+
 % Environment to create a grey box as wide as the page for remarks.
 % Creates the counter of remark boxes
 

{davout-0.1.1.dev175 → davout-0.1.1.dev177/source/Davout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev175
+Version: 0.1.1.dev177
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>
@@ -65,6 +65,11 @@ such as FEniCS, TensorFlow, GMSH, ParaView, and matplotlib.
 # Installation using pip
 pip install Davout
 
+Or for a special dev version (123 for example). Check the pyproject.toml file to consult the
+latest version at the line 'version = "0.1.1.dev123"':
+
+pip install Davout==0.1.1.dev123
+
 # Installation using installer file
 Download the zip file, unzip it and move it to a suitable directory.
 Open the Davout folder, where setup.py is located. Open this path in