Datenstrukturen und Auswertung angepasst
This commit is contained in:
Markus Clauß
204
src/paveit/datamodels/sheartest.py
Normal file → Executable file
204
src/paveit/datamodels/sheartest.py
Normal file → Executable file
@@ -2,10 +2,7 @@ import datetime
|
||||
|
||||
from mongoengine import *
|
||||
|
||||
from .material import Material
|
||||
from .project import Project
|
||||
from .usermanagement import Organisation, User
|
||||
from .workpackage import Workpackage
|
||||
from .taskmanager import TaskManagerBase
|
||||
|
||||
|
||||
class DynamicShearTest(Document):
|
||||
@@ -14,26 +11,14 @@ class DynamicShearTest(Document):
|
||||
wtf_options={"render_kw": {
|
||||
"step": "60"
|
||||
}})
|
||||
|
||||
org_id = LazyReferenceField(Organisation, required=True)
|
||||
project_id = LazyReferenceField(Project, required=True)
|
||||
workpackage_id = LazyReferenceField(Workpackage, required=False)
|
||||
|
||||
user_id = LazyReferenceField(User,
|
||||
required=True,
|
||||
reverse_delete_rule=DO_NOTHING)
|
||||
|
||||
material1 = LazyReferenceField(Material, required=True)
|
||||
material2 = LazyReferenceField(Material, required=True)
|
||||
bounding = LazyReferenceField(Material, required=True)
|
||||
|
||||
task_id = LazyReferenceField(TaskManagerBase, required=True)
|
||||
|
||||
gap_width = FloatField(default=1.0)
|
||||
|
||||
tags = ListField(StringField())
|
||||
|
||||
standard = StringField(default='TP Asphalt Teil 24')
|
||||
|
||||
machine = StringField(default=None)
|
||||
standard = StringField(default='TP Asphalt Teil 48 C')
|
||||
|
||||
filehash = StringField(required=True)
|
||||
speciment_name = StringField()
|
||||
@@ -79,6 +64,8 @@ class DynamicShearTestExtension(DynamicShearTest):
|
||||
|
||||
G = FloatField(required=True)
|
||||
broken = BooleanField(required=True)
|
||||
phase = FloatField()
|
||||
|
||||
#fit parameter
|
||||
## required parameters
|
||||
|
||||
@@ -89,55 +76,117 @@ class DynamicShearTestExtension(DynamicShearTest):
|
||||
F_offset = FloatField(required=True)
|
||||
F_slope = FloatField(required=True)
|
||||
F_r2 = FloatField(required=True)
|
||||
F_max = FloatField(required=True)
|
||||
F_min = FloatField(required=True)
|
||||
F_cycle_min = ListField(FloatField())
|
||||
F_min = FloatField()
|
||||
F_min_std = FloatField()
|
||||
F_min_diff_rel = FloatField()
|
||||
F_cycle_max = ListField(FloatField())
|
||||
F_max = FloatField()
|
||||
F_max_std = FloatField()
|
||||
F_max_diff_rel = FloatField()
|
||||
F_cycle_mean = ListField(FloatField())
|
||||
F_mean = FloatField()
|
||||
F_mean_std = FloatField()
|
||||
F_mean_diff_rel = FloatField()
|
||||
F_cycle_diff = ListField(FloatField())
|
||||
F_diff = FloatField()
|
||||
F_diff_std = FloatField()
|
||||
F_diff_diff_rel= FloatField()
|
||||
|
||||
## S1
|
||||
s_vert_1_amp = FloatField(required=True)
|
||||
s_vert_1_freq = FloatField(required=True)
|
||||
s_vert_1_phase = FloatField(required=True)
|
||||
s_vert_1_offset = FloatField(required=True)
|
||||
s_vert_1_slope = FloatField(required=True)
|
||||
s_vert_1_r2 = FloatField(required=True)
|
||||
s_vert_1_max = FloatField(required=True)
|
||||
s_vert_1_min = FloatField(required=True)
|
||||
s_vert_1_amp = FloatField()
|
||||
s_vert_1_freq = FloatField()
|
||||
s_vert_1_phase = FloatField()
|
||||
s_vert_1_offset = FloatField()
|
||||
s_vert_1_slope = FloatField()
|
||||
s_vert_1_r2 = FloatField()
|
||||
s_vert_1_cycle_min = ListField(FloatField())
|
||||
s_vert_1_min = FloatField()
|
||||
s_vert_1_min_std = FloatField()
|
||||
s_vert_1_min_diff_rel = FloatField()
|
||||
s_vert_1_cycle_max = ListField(FloatField())
|
||||
s_vert_1_max = FloatField()
|
||||
s_vert_1_max_std = FloatField()
|
||||
s_vert_1_max_diff_rel = FloatField()
|
||||
s_vert_1_cycle_mean = ListField(FloatField())
|
||||
s_vert_1_mean = FloatField()
|
||||
s_vert_1_mean_std = FloatField()
|
||||
s_vert_1_mean_diff_rel = FloatField()
|
||||
s_vert_1_cycle_diff = ListField(FloatField())
|
||||
s_vert_1_diff = FloatField()
|
||||
s_vert_1_diff_std = FloatField()
|
||||
s_vert_1_diff_diff_rel = FloatField()
|
||||
## S2
|
||||
s_vert_2_amp = FloatField(required=True)
|
||||
s_vert_2_freq = FloatField(required=True)
|
||||
s_vert_2_phase = FloatField(required=True)
|
||||
s_vert_2_offset = FloatField(required=True)
|
||||
s_vert_2_slope = FloatField(required=True)
|
||||
s_vert_2_r2 = FloatField(required=True)
|
||||
s_vert_2_max = FloatField(required=True)
|
||||
s_vert_2_min = FloatField(required=True)
|
||||
|
||||
s_vert_2_amp = FloatField()
|
||||
s_vert_2_freq = FloatField()
|
||||
s_vert_2_phase = FloatField()
|
||||
s_vert_2_offset = FloatField()
|
||||
s_vert_2_slope = FloatField()
|
||||
s_vert_2_r2 = FloatField()
|
||||
s_vert_2_cycle_min = ListField(FloatField())
|
||||
s_vert_2_min = FloatField()
|
||||
s_vert_2_min_std = FloatField()
|
||||
s_vert_2_min_diff_rel = FloatField()
|
||||
s_vert_2_cycle_max = ListField(FloatField())
|
||||
s_vert_2_max = FloatField()
|
||||
s_vert_2_max_std = FloatField()
|
||||
s_vert_2_max_diff_rel = FloatField()
|
||||
s_vert_2_cycle_mean = ListField(FloatField())
|
||||
s_vert_2_mean = FloatField()
|
||||
s_vert_2_mean_std = FloatField()
|
||||
s_vert_2_mean_diff_rel = FloatField()
|
||||
s_vert_2_cycle_diff = ListField(FloatField())
|
||||
s_vert_2_diff = FloatField()
|
||||
s_vert_2_diff_std = FloatField()
|
||||
s_vert_2_diff_diff_rel = FloatField()
|
||||
## S-Sum
|
||||
s_vert_sum_amp = FloatField()
|
||||
s_vert_sum_freq = FloatField()
|
||||
s_vert_sum_phase = FloatField()
|
||||
s_vert_sum_offset = FloatField()
|
||||
s_vert_sum_slope = FloatField()
|
||||
s_vert_sum_r2 = FloatField()
|
||||
s_vert_sum_cycle_min = ListField(FloatField())
|
||||
s_vert_sum_min = FloatField()
|
||||
s_vert_sum_min_std = FloatField()
|
||||
s_vert_sum_min_diff_rel = FloatField()
|
||||
s_vert_sum_cycle_max = ListField(FloatField())
|
||||
s_vert_sum_max = FloatField()
|
||||
s_vert_sum_max_std = FloatField()
|
||||
s_vert_sum_max_diff_rel = FloatField()
|
||||
s_vert_sum_cycle_mean = ListField(FloatField())
|
||||
s_vert_sum_mean = FloatField()
|
||||
s_vert_sum_mean_std = FloatField()
|
||||
s_vert_sum_mean_diff_rel = FloatField()
|
||||
s_vert_sum_cycle_diff = ListField(FloatField())
|
||||
s_vert_sum_diff = FloatField()
|
||||
s_vert_sum_diff_std = FloatField()
|
||||
s_vert_sum_diff_diff_rel = FloatField()
|
||||
|
||||
## optional parameters
|
||||
|
||||
s_vert_sum_amp = FloatField(required=False)
|
||||
s_vert_sum_freq = FloatField(required=False)
|
||||
s_vert_sum_phase = FloatField(required=False)
|
||||
s_vert_sum_offset = FloatField(required=False)
|
||||
s_vert_sum_slope = FloatField(required=False)
|
||||
s_vert_sum_r2 = FloatField(required=False)
|
||||
s_vert_sum_max = FloatField(required=False)
|
||||
s_vert_sum_min = FloatField(required=False)
|
||||
|
||||
s_hor_sum_amp = FloatField(required=False)
|
||||
s_hor_sum_freq = FloatField(required=False)
|
||||
s_hor_sum_phase = FloatField(required=False)
|
||||
s_hor_sum_offset = FloatField(required=False)
|
||||
s_hor_sum_slope = FloatField(required=False)
|
||||
s_hor_sum_r2 = FloatField(required=False)
|
||||
s_hor_sum_max = FloatField(required=False)
|
||||
s_hor_sum_min = FloatField(required=False)
|
||||
|
||||
## S1
|
||||
s_hor_1_amp = FloatField(required=False)
|
||||
s_hor_1_freq = FloatField(required=False)
|
||||
s_hor_1_phase = FloatField(required=False)
|
||||
s_hor_1_offset = FloatField(required=False)
|
||||
s_hor_1_slope = FloatField(required=False)
|
||||
s_hor_1_r2 = FloatField(required=False)
|
||||
s_hor_1_max = FloatField(required=False)
|
||||
s_hor_1_cycle_min = ListField(FloatField(),required=False)
|
||||
s_hor_1_min = FloatField(required=False)
|
||||
s_hor_1_min_std = FloatField(required=False)
|
||||
s_hor_1_min_diff_rel = FloatField(required=False)
|
||||
s_hor_1_cycle_max = ListField(FloatField(),required=False)
|
||||
s_hor_1_max = FloatField(required=False)
|
||||
s_hor_1_max_std = FloatField(required=False)
|
||||
s_hor_1_max_diff_rel = FloatField(required=False)
|
||||
s_hor_1_cycle_mean = ListField(FloatField(),required=False)
|
||||
s_hor_1_mean = FloatField(required=False)
|
||||
s_hor_1_mean_std = FloatField(required=False)
|
||||
s_hor_1_mean_diff_rel = FloatField(required=False)
|
||||
s_hor_1_cycle_diff = ListField(FloatField(),required=False)
|
||||
s_hor_1_diff = FloatField(required=False)
|
||||
s_hor_1_diff_std = FloatField(required=False)
|
||||
s_hor_1_diff_diff_rel = FloatField(required=False)
|
||||
## S2
|
||||
s_hor_2_amp = FloatField(required=False)
|
||||
s_hor_2_freq = FloatField(required=False)
|
||||
@@ -145,5 +194,42 @@ class DynamicShearTestExtension(DynamicShearTest):
|
||||
s_hor_2_offset = FloatField(required=False)
|
||||
s_hor_2_slope = FloatField(required=False)
|
||||
s_hor_2_r2 = FloatField(required=False)
|
||||
s_hor_2_cycle_min = ListField(FloatField(),required=False)
|
||||
s_hor_2_min = FloatField(required=False)
|
||||
s_hor_2_min_std = FloatField(required=False)
|
||||
s_hor_2_min_diff_rel = FloatField(required=False)
|
||||
s_hor_2_cycle_max = ListField(FloatField(),required=False)
|
||||
s_hor_2_max = FloatField(required=False)
|
||||
s_hor_2_min = FloatField(required=False)
|
||||
s_hor_2_max_std = FloatField(required=False)
|
||||
s_hor_2_max_diff_rel = FloatField(required=False)
|
||||
s_hor_2_cycle_mean = ListField(FloatField(), required=False)
|
||||
s_hor_2_mean = FloatField(required=False)
|
||||
s_hor_2_mean_std = FloatField(required=False)
|
||||
s_hor_2_mean_diff_rel = FloatField(required=False)
|
||||
s_hor_2_cycle_diff = ListField(FloatField(), required=False)
|
||||
s_hor_2_diff = FloatField(required=False)
|
||||
s_hor_2_diff_std = FloatField(required=False)
|
||||
s_hor_2_diff_diff_rel = FloatField(required=False)
|
||||
## Piston
|
||||
s_hor_piston_amp = FloatField(required=False)
|
||||
s_hor_piston_freq = FloatField(required=False)
|
||||
s_hor_piston_phase = FloatField(required=False)
|
||||
s_hor_piston_offset = FloatField(required=False)
|
||||
s_hor_piston_slope = FloatField(required=False)
|
||||
s_hor_piston_r2 = FloatField(required=False)
|
||||
s_hor_piston_cycle_min = ListField(FloatField(),required=False)
|
||||
s_hor_piston_min = FloatField(required=False)
|
||||
s_hor_piston_min_std = FloatField(required=False)
|
||||
s_hor_piston_min_diff_rel = FloatField(required=False)
|
||||
s_hor_piston_cycle_max = ListField(FloatField(),required=False)
|
||||
s_hor_piston_max = FloatField(required=False)
|
||||
s_hor_piston_max_std = FloatField(required=False)
|
||||
s_hor_piston_max_dif_rel = FloatField(required=False)
|
||||
s_hor_piston_cycle_mean = ListField(FloatField(),required=False)
|
||||
s_hor_piston_mean = FloatField(required=False)
|
||||
s_hor_piston_mean_std = FloatField(required=False)
|
||||
s_hor_piston_mean_diff_rel = FloatField(required=False)
|
||||
s_hor_piston_cycle_diff = ListField(FloatField(),required=False)
|
||||
s_hor_piston_diff = FloatField(required=False)
|
||||
s_hor_piston_diff_std = FloatField(required=False)
|
||||
s_hor_piston_diff_diff_rel = FloatField(required=False)
|
||||
Reference in New Issue
Block a user