Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aliby-mirror
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Swain Lab
aliby
aliby-mirror
Commits
ca7159a1
Commit
ca7159a1
authored
3 years ago
by
Alán Muñoz
Browse files
Options
Downloads
Patches
Plain Diff
add dynamic class loading
Former-commit-id: 8bd73bbdbc1a7c09a4d3ee6fdd4a33d018dbd700
parent
20677193
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
core/processes/merger.py
+2
-2
2 additions, 2 deletions
core/processes/merger.py
core/processes/picker.py
+3
-3
3 additions, 3 deletions
core/processes/picker.py
core/processes/savgol.py
+4
-3
4 additions, 3 deletions
core/processes/savgol.py
core/processor.py
+25
-18
25 additions, 18 deletions
core/processor.py
with
34 additions
and
26 deletions
core/processes/merger.py
+
2
−
2
View file @
ca7159a1
...
@@ -2,7 +2,7 @@ from postprocessor.core.processes.base import ParametersABC, ProcessABC
...
@@ -2,7 +2,7 @@ from postprocessor.core.processes.base import ParametersABC, ProcessABC
from
postprocessor.core.functions.tracks
import
clean_tracks
,
merge_tracks
,
join_tracks
from
postprocessor.core.functions.tracks
import
clean_tracks
,
merge_tracks
,
join_tracks
class
M
ergerParameters
(
ParametersABC
):
class
m
ergerParameters
(
ParametersABC
):
"""
"""
:param tol: float or int threshold of average (prediction error/std) necessary
:param tol: float or int threshold of average (prediction error/std) necessary
to consider two tracks the same. If float is fraction of first track,
to consider two tracks the same. If float is fraction of first track,
...
@@ -43,7 +43,7 @@ class MergerParameters(ParametersABC):
...
@@ -43,7 +43,7 @@ class MergerParameters(ParametersABC):
)
)
class
M
erger
(
ProcessABC
):
class
m
erger
(
ProcessABC
):
"""
"""
TODO Integrate functions/tracks.py inside this class?
TODO Integrate functions/tracks.py inside this class?
"""
"""
...
...
This diff is collapsed.
Click to expand it.
core/processes/picker.py
+
3
−
3
View file @
ca7159a1
...
@@ -10,7 +10,7 @@ from postprocessor.core.processes.base import ParametersABC, ProcessABC
...
@@ -10,7 +10,7 @@ from postprocessor.core.processes.base import ParametersABC, ProcessABC
from
postprocessor.core.functions.tracks
import
max_ntps
,
max_nonstop_ntps
from
postprocessor.core.functions.tracks
import
max_ntps
,
max_nonstop_ntps
class
P
ickerParameters
(
ParametersABC
):
class
p
ickerParameters
(
ParametersABC
):
def
__init__
(
def
__init__
(
self
,
self
,
condition
:
Tuple
[
str
,
Union
[
float
,
int
]]
=
None
,
condition
:
Tuple
[
str
,
Union
[
float
,
int
]]
=
None
,
...
@@ -32,7 +32,7 @@ class PickerParameters(ParametersABC):
...
@@ -32,7 +32,7 @@ class PickerParameters(ParametersABC):
)
)
class
P
icker
(
ProcessABC
):
class
p
icker
(
ProcessABC
):
"""
"""
:cells: Cell object passed to the constructor
:cells: Cell object passed to the constructor
:condition: Tuple with condition and associated parameter(s), conditions can be
:condition: Tuple with condition and associated parameter(s), conditions can be
...
@@ -43,7 +43,7 @@ class Picker(ProcessABC):
...
@@ -43,7 +43,7 @@ class Picker(ProcessABC):
def
__init__
(
def
__init__
(
self
,
self
,
parameters
:
P
ickerParameters
,
parameters
:
p
ickerParameters
,
cells
:
CellsHDF
,
cells
:
CellsHDF
,
):
):
super
().
__init__
(
parameters
=
parameters
)
super
().
__init__
(
parameters
=
parameters
)
...
...
This diff is collapsed.
Click to expand it.
core/processes/savgol.py
+
4
−
3
View file @
ca7159a1
import
pandas
as
pd
from
postprocessor.core.processes.base
import
ParametersABC
,
ProcessABC
from
postprocessor.core.processes.base
import
ParametersABC
,
ProcessABC
class
S
avgolParameters
(
ParametersABC
):
class
s
avgolParameters
(
ParametersABC
):
"""
"""
Parameters
Parameters
...
@@ -21,13 +22,13 @@ class SavgolParameters(ParametersABC):
...
@@ -21,13 +22,13 @@ class SavgolParameters(ParametersABC):
return
cls
.
from_dict
({
"
window
"
:
3
,
"
polynom
"
:
3
})
return
cls
.
from_dict
({
"
window
"
:
3
,
"
polynom
"
:
3
})
class
S
avgol
(
ProcessABC
):
class
s
avgol
(
ProcessABC
):
"""
"""
Apply Savitzky-Golay filter (works with NaNs, but it might return
Apply Savitzky-Golay filter (works with NaNs, but it might return
NaN regions).
NaN regions).
"""
"""
def
__init__
(
self
,
parameters
:
S
avgolParameters
):
def
__init__
(
self
,
parameters
:
s
avgolParameters
):
super
().
__init__
(
parameters
)
super
().
__init__
(
parameters
)
def
run
(
self
,
signal
:
pd
.
DataFrame
):
def
run
(
self
,
signal
:
pd
.
DataFrame
):
...
...
This diff is collapsed.
Click to expand it.
core/processor.py
+
25
−
18
View file @
ca7159a1
from
pydoc
import
locate
from
typing
import
List
,
Dict
,
Union
from
typing
import
List
,
Dict
,
Union
import
pandas
as
pd
import
pandas
as
pd
from
postprocessor.core.processes.base
import
ParametersABC
from
postprocessor.core.processes.base
import
ParametersABC
from
postprocessor.core.processes.merger
import
M
ergerParameters
,
M
erger
from
postprocessor.core.processes.merger
import
m
ergerParameters
,
m
erger
from
postprocessor.core.processes.picker
import
P
ickerParameters
,
P
icker
from
postprocessor.core.processes.picker
import
p
ickerParameters
,
p
icker
from
core.io.writer
import
Writer
from
core.io.writer
import
Writer
from
core.io.signal
import
Signal
from
core.io.signal
import
Signal
...
@@ -23,11 +24,9 @@ class PostProcessorParameters(ParametersABC):
...
@@ -23,11 +24,9 @@ class PostProcessorParameters(ParametersABC):
"""
"""
def
__init__
(
self
,
merger
=
None
,
picker
=
None
,
processes
=
[]):
def
__init__
(
self
,
merger
=
None
,
picker
=
None
,
processes
=
[]):
self
.
merger
:
MergerParameters
=
merger
self
.
merger
:
mergerParameters
=
merger
self
.
picker
:
PickerParameters
=
picker
self
.
picker
:
pickerParameters
=
picker
self
.
processes
:
List
=
processes
self
.
processes
:
Dict
=
processes
self
.
datasets
:
Dict
=
datasets
def
__getitem__
(
self
,
item
):
def
__getitem__
(
self
,
item
):
return
getattr
(
self
,
item
)
return
getattr
(
self
,
item
)
...
@@ -36,9 +35,9 @@ class PostProcessorParameters(ParametersABC):
...
@@ -36,9 +35,9 @@ class PostProcessorParameters(ParametersABC):
def
default
(
cls
,
kind
=
None
):
def
default
(
cls
,
kind
=
None
):
if
kind
==
"
defaults
"
or
kind
==
None
:
if
kind
==
"
defaults
"
or
kind
==
None
:
return
cls
(
return
cls
(
merger
=
M
ergerParameters
.
default
(),
merger
=
m
ergerParameters
.
default
(),
picker
=
P
ickerParameters
.
default
(),
picker
=
p
ickerParameters
.
default
(),
data
se
t
s
=
{
proces
ses
=
{
"
merger
"
:
"
/extraction/general/None/area
"
,
"
merger
"
:
"
/extraction/general/None/area
"
,
"
picker
"
:
"
/extraction/general/None/area
"
,
"
picker
"
:
"
/extraction/general/None/area
"
,
"
processes
"
:
{
"
dSignal
"
:
[
"
/general/None/area
"
]},
"
processes
"
:
{
"
dSignal
"
:
[
"
/general/None/area
"
]},
...
@@ -56,21 +55,29 @@ class PostProcessor:
...
@@ -56,21 +55,29 @@ class PostProcessor:
self
.
_writer
=
Writer
(
filename
)
self
.
_writer
=
Writer
(
filename
)
# self.outpaths = parameters["outpaths"]
# self.outpaths = parameters["outpaths"]
self
.
merger
=
M
erger
(
parameters
[
"
merger
"
])
self
.
merger
=
m
erger
(
parameters
[
"
merger
"
])
self
.
picker
=
P
icker
(
self
.
picker
=
p
icker
(
parameters
=
parameters
[
"
picker
"
],
cells
=
Cells
.
from_source
(
filename
)
parameters
=
parameters
[
"
picker
"
],
cells
=
Cells
.
from_source
(
filename
)
)
)
self
.
processes
=
[
self
.
process_dict
=
{
self
.
get_process
(
process
)
for
process
in
parameters
[
"
processes
"
]
process
:
locate
(
process
)
for
process
in
parameters
[
"
processes
"
].
keys
()
]
}
self
.
processes
=
parameters
[
"
processes
"
]
@staticmethod
def
get_process
(
process
):
"""
Get process from folder ./processes
"""
print
(
__file__
)
return
locate
(
"
postprocessor.core.processes.
"
+
process
+
"
.
"
+
process
)
def
run
(
self
):
def
run
(
self
):
new_ids
=
self
.
merger
.
run
(
self
.
_signal
[
self
.
data
se
t
s
[
"
merger
"
]])
new_ids
=
self
.
merger
.
run
(
self
.
_signal
[
self
.
proces
ses
[
"
merger
"
]])
for
name
,
ids
in
new_ids
.
items
():
for
name
,
ids
in
new_ids
.
items
():
self
.
_writer
.
write
(
ids
,
"
/postprocessing/cell_info/
"
+
name
)
self
.
_writer
.
write
(
ids
,
"
/postprocessing/cell_info/
"
+
name
)
picks
=
self
.
picker
.
run
(
self
.
_signal
[
self
.
data
se
t
s
[
"
picker
"
]])
picks
=
self
.
picker
.
run
(
self
.
_signal
[
self
.
proces
ses
[
"
picker
"
]
[
0
]
])
return
picks
return
picks
# print(merge, picks)
# for process, dataset, outpath in zip(
# for process, dataset, outpath in zip(
# self.processes, self.datasets["processes"], self.outpaths
# self.processes, self.datasets["processes"], self.outpaths
# ):
# ):
...
...
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