Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
measprocess
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lukas Eller
measprocess
Commits
59379300
Commit
59379300
authored
Mar 26, 2021
by
Lukas Eller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new version
parent
2f55345d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
preprocess.py
measprocess/preprocess.py
+1
-1
setup.py
setup.py
+1
-1
No files found.
measprocess/preprocess.py
View file @
59379300
...
...
@@ -3,7 +3,7 @@ import itertools
import
numpy
as
np
from
tqdm
import
tqdm
def
link_dataframes
(
A
:
pd
.
DataFrame
,
B
:
pd
.
DataFrame
,
ref_col
:
str
,
metric
=
None
,
verbose
=
True
)
->
(
pd
.
DataFrame
,
np
.
array
):
def
link_dataframes
(
A
:
pd
.
DataFrame
,
B
:
pd
.
DataFrame
,
ref_col
:
str
,
metric
=
None
,
verbose
=
True
)
->
(
pd
.
DataFrame
,
np
.
nd
array
):
'''
Merge two DataFrames A and B according to the reference colum based on minimum metric.
...
...
setup.py
View file @
59379300
...
...
@@ -10,7 +10,7 @@ README = (HERE / "README.md").read_text()
# This call to setup() does all the work
setup
(
name
=
"measprocess"
,
version
=
"0.5.
6
"
,
version
=
"0.5.
9
"
,
description
=
"Collection of measurement processing tools"
,
long_description
=
README
,
long_description_content_type
=
"text/markdown"
,
...
...
Write
Preview
Markdown
is supported
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