git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into senslab2
[sfa.git]
/
sfa
/
generic
/
max.py
diff --git
a/sfa/generic/max.py
b/sfa/generic/max.py
index
8920ae7
..
d54afc5
100644
(file)
--- a/
sfa/generic/max.py
+++ b/
sfa/generic/max.py
@@
-3,13
+3,12
@@
#
from sfa.generic.pl import pl
#
from sfa.generic.pl import pl
-import sfa.managers.aggregate_manager_max
-
class max (pl):
# the max flavour behaves like pl, except for
# the aggregate
def aggregate_manager_class (self) :
class max (pl):
# the max flavour behaves like pl, except for
# the aggregate
def aggregate_manager_class (self) :
+ import sfa.managers.aggregate_manager_max
return sfa.managers.aggregate_manager_max.AggregateManagerMax
# I believe the component stuff is not implemented
return sfa.managers.aggregate_manager_max.AggregateManagerMax
# I believe the component stuff is not implemented