Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
data_progs
Manage
Activity
Members
Labels
Plan
Issues
4
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CHS
data_progs
Commits
5cc1320f
Commit
5cc1320f
authored
1 year ago
by
David Schäfer
Browse files
Options
Downloads
Plain Diff
Merge branch 'dendro' into 'meteo'
Dendro See merge request
!35
parents
4ca2b3fa
319f2926
No related branches found
No related tags found
2 merge requests
!35
Dendro
,
!23
Major rework of the entire pipeline
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
level1/do_dendro_calculation.py
+5
-1
5 additions, 1 deletion
level1/do_dendro_calculation.py
with
5 additions
and
1 deletion
level1/do_dendro_calculation.py
+
5
−
1
View file @
5cc1320f
...
...
@@ -104,7 +104,7 @@ def dendroProcess(data, manflags):
concat_df
=
pd
.
concat
([
values
,
dropped_manflags
],
axis
=
1
)
concat_df
=
concat_df
.
loc
[
start_date
:
end_date
]
first_value
=
values
.
iloc
[
0
]
first_value
=
values
.
iloc
[
0
]
start_idx
=
concat_df
[
'
d_ini
'
].
dropna
().
index
stop_idx
=
start_idx
[
1
:].
tolist
()
+
[
pd
.
Timestamp
.
today
()]
# some old data doesn't have useable manflags, this should be filtered here
...
...
@@ -118,6 +118,10 @@ def dendroProcess(data, manflags):
continue
calc
=
dendroCalculation
(
chunk
,
key
,
first_value
)
temporary
.
append
(
calc
)
# some old data has values, but manflags starts, when tree is fallen, all chunks are empty and the temporary
# list is also empty
if
not
temporary
:
continue
name
=
f
"
{
int
(
key
.
split
(
'
_
'
)[
1
])
}
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment