setup.cfg

@@ -1,49 +0,0 @@
-[metadata]
-name = pytestpavement
-description = Analysis Pavment Test Data
-author = Markus Clauß
-author_email = markus.clauss@tu-dresden.de
-url = https://git.linsenbruch.myds.me/Arbeit/pytest
-platforms = any
-classifiers =
-    Development Status :: 5 - Production/Stable
-    Intended Audience :: Science/Research
-    Topic :: Scientific/Engineering
-    License :: OSI Approved :: BSD License
-    Operating System :: OS Independent
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: Implementation :: PyPy
-keywords = 
-project_urls =
-    Source = https://git.linsenbruch.myds.me/Arbeit/pytest
-
-[options]
-packages = find:
-python_requires = >=3.9
-setup_requires = setuptools_scm
-install_requires =
-    lmfit
-    pandas
-    numpy
-    scipy
-    matplotlib
-    seaborn
-    mongoengine
-
-[options.packages.find]
-where=src
-
-[rstcheck]
-report=warning
-ignore_substitutions=release
-ignore_roles=scipydoc,numpydoc
-ignore_directives=autoclass,autodoc,autofunction,automethod,jupyter-execute,math
-
-[flake8]
-ignore = E121,E123,E126,E226,W503,W504,E501,E731

setup.py

@@ -1,6 +1,21 @@
 #!/usr/bin/env python
 
-import setuptools
+from setuptools import find_packages, setup
 
-if __name__ == "__main__":
+setup(
-    setuptools.setup()
+    name='PyTestPavement',
+    version='0.1',
+    author='Markus Clauß',
+    author_email='markus.clauss@tu-dresden.de',
+    install_requires=[
+        'lmfit',
+        'pandas',
+        'numpy',
+        'scipy',
+        'matplotlib',  #remove later
+        'seaborn',  #remove later
+        'mongoengine',
+    ],
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
+    include_package_data=True)

src/pytestpavement/functions/citt.py

@@ -8,9 +8,3 @@ def stiffness_tp26(T, f, Emax, Emin, phi, z0, z1, T0=20.0):
     E = Emin + (Emax - Emin) / (1 + np.exp(z0 * x + z1))
 
     return E
-
-
-def calc_nu(T):
-    #TODO: Prüfen ob Formel stimmt!
-    nu = 0.15 + (0.35) / (1 + np.exp(3.1849 - 0.04233 * (9 / 5 * T + 32)))
-    return nu

src/pytestpavement/labtests/base.py

@@ -318,22 +318,14 @@ class DataSineLoad():
                     'Number of load cycles smaller than selectect values')
 
         if not isinstance(self.data, list):
-            if self.number_of_load_cycles_for_analysis > 1:
             df_sel = [
-                    sel_df(self.data,
+                sel_df(self.data, num=self.number_of_load_cycles_for_analysis)
-                           num=self.number_of_load_cycles_for_analysis)
             ]
-            else:
-                df_sel = [self.data]
 
         else:
             df_sel = []
             for d in self.data:
-                if self.number_of_load_cycles_for_analysis > 1:
+                d_sel = sel_df(d, num=self.number_of_load_cycles_for_analysis)
-                    d_sel = sel_df(d,
-                                   num=self.number_of_load_cycles_for_analysis)
-                else:
-                    d_sel = d
 
                 df_sel.append(d_sel)
 

src/pytestpavement/models/citt.py

@@ -2,7 +2,6 @@ import datetime
 
 from mongoengine import *
 
-from .data import CITTSiffness
 from .material import Material
 
 
@@ -42,43 +41,40 @@ class CITTSiffness(CyclicIndirectTensileTest):
     sigma_set = FloatField()
     T_set = FloatField()
 
-    N_from = IntField()
-    N_to = IntField()
-
-    data = LazyReferenceField(CITTSiffness,
-                              required=True,
-                              reverse_delete_rule=CASCADE)
-
     #results
     stiffness = FloatField()
-    nu = FloatField()
-    phase = FloatField()
     #fit parameter
     ## F
-    F_amp = FloatField()
+    fit_a_F = FloatField()
-    F_freq = FloatField()
+    fit_b_F = FloatField()
-    F_phase = FloatField()
+    fit_d_F = FloatField()
-    F_offset = FloatField()
+    fit_e_F = FloatField()
-    F_slope = FloatField()
+    fit_f_F = FloatField()
-    F_r2 = FloatField()
+    r2_F = FloatField()
     ## S1
-    s_hor_1_amp = FloatField()
+    fit_a_s_hor_1 = FloatField()
-    s_hor_1_freq = FloatField()
+    fit_b_s_hor_1 = FloatField()
-    s_hor_1_phase = FloatField()
+    fit_d_s_hor_1 = FloatField()
-    s_hor_1_offset = FloatField()
+    fit_e_s_hor_1 = FloatField()
-    s_hor_1_slope = FloatField()
+    fit_f_s_hor_1 = FloatField()
-    s_hor_1_r2 = FloatField()
+    r2_s_hor_1 = FloatField()
     ## S2
-    s_hor_2_amp = FloatField()
+    fit_a_s_hor_2 = FloatField()
-    s_hor_2_freq = FloatField()
+    fit_b_s_hor_2 = FloatField()
-    s_hor_2_phase = FloatField()
+    fit_d_s_hor_2 = FloatField()
-    s_hor_2_offset = FloatField()
+    fit_e_s_hor_2 = FloatField()
-    s_hor_2_slope = FloatField()
+    fit_f_s_hor_2 = FloatField()
-    s_hor_2_r2 = FloatField()
+    r2_s_hor_2 = FloatField()
     ## S-Sum
-    s_hor_amp = FloatField()
+    fit_a_s_hor_sum = FloatField()
-    s_hor_freq = FloatField()
+    fit_b_s_hor_sum = FloatField()
-    s_hor_phase = FloatField()
+    fit_d_s_hor_sum = FloatField()
-    s_hor_offset = FloatField()
+    fit_e_s_hor_sum = FloatField()
-    s_hor_slope = FloatField()
+    fit_f_s_hor_sum = FloatField()
-    s_hor_r2 = FloatField()
+    r2_s_hor_sum = FloatField()
+    # data
+    time = ListField(FloatField())
+    F = ListField(FloatField())
+    N = ListField(IntField())
+    s_hor_1 = ListField(FloatField())
+    s_hor_2 = ListField(FloatField())

src/pytestpavement/models/data.py

@@ -31,15 +31,3 @@ class DataSheartest(RawData):
     s_vert_2 = ListField(FloatField())
     s_vert_sum = ListField(FloatField())
     s_piston = ListField(FloatField())
-
-
-class CITTSiffness(RawData):
-
-    # data
-    time = ListField(FloatField())
-    F = ListField(FloatField())
-    N = ListField(IntField())
-    s_hor_1 = ListField(FloatField())
-    s_hor_2 = ListField(FloatField())
-    s_hor_sum = ListField(FloatField())
-    s_piston = ListField(FloatField(), required=False)