Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Code for Analabs
RST Evaluation
Commits
cc944a9d
Commit
cc944a9d
authored
May 18, 2020
by
Michael Rudolf
Browse files
Fixed a bug causing linear-regression to go wrong
parent
1cbb84db
Changes
1
Hide whitespace changes
Inline
Side-by-side
RSTpicking/RST_pick_GUI.py
View file @
cc944a9d
...
...
@@ -3,7 +3,7 @@
# @Author: M. Rudolf, M. Warsitzka
# @Date: 2019-02-20 12:00:00
# @Last Modified by: M. Rudolf
# @Last Modified time: 2020-05-1
6
1
6:04:24
# @Last Modified time: 2020-05-1
8
1
3:18:56
"""
RST_pick_GUI.py
...
...
@@ -286,7 +286,7 @@ class RST_pick_GUI(tk.Tk):
for
cur_dat
in
exp_data
]
# Create lists of parameters for analysis
normal_stress
=
[
int
(
ev
[
0
]
)
for
ev
in
eval_data
]
normal_stress
=
[
ev
[
0
]
for
ev
in
eval_data
]
peak_stress
=
[
ev
[
1
][
1
]
for
ev
in
eval_data
]
dyn_stress
=
[
ev
[
2
][
1
]
for
ev
in
eval_data
]
stat_stress
=
[
ev
[
3
][
1
]
for
ev
in
eval_data
]
...
...
@@ -331,7 +331,7 @@ class RST_pick_GUI(tk.Tk):
rfnc
.
plotts
(
path_out
,
projectname
,
exp_data
,
normal_stress
)
print
(
'>>> Time series data plotted'
)
# ====================Save DATA=====================================
=
# ====================Save DATA=====================================
if
self
.
rst
.
get
()
==
1
:
rfnc
.
saveStrength
(
path_out
,
projectname
,
strength
)
rfnc
.
saveFric
(
path_out
,
projectname
,
fric_mut
,
fric_std
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment