git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfixes for EC serialization and plotting
[nepi.git]
/
src
/
nepi
/
execution
/
ec.py
diff --git
a/src/nepi/execution/ec.py
b/src/nepi/execution/ec.py
index
31e11ef
..
2c6557f
100644
(file)
--- a/
src/nepi/execution/ec.py
+++ b/
src/nepi/execution/ec.py
@@
-154,9
+154,9
@@
class ExperimentController(object):
"""
@classmethod
"""
@classmethod
- def load(cls, path, format = SFormats.XML):
+ def load(cls,
file
path, format = SFormats.XML):
serializer = ECSerializer()
serializer = ECSerializer()
- ec = serializer.load(path)
+ ec = serializer.load(
file
path)
return ec
def __init__(self, exp_id = None):
return ec
def __init__(self, exp_id = None):
@@
-382,10
+382,10
@@
class ExperimentController(object):
time.sleep(0.5)
time.sleep(0.5)
- def plot(self,
fpath = None, format= PFormats.FIGURE, persist
= False):
+ def plot(self,
dirpath = None, format= PFormats.FIGURE, show
= False):
plotter = ECPlotter()
plotter = ECPlotter()
- fpath = plotter.plot(self,
fpath = f
path, format= format,
-
persist = persist
)
+ fpath = plotter.plot(self,
dirpath = dir
path, format= format,
+
show = show
)
return fpath
def serialize(self, format = SFormats.XML):
return fpath
def serialize(self, format = SFormats.XML):
@@
-393,9
+393,9
@@
class ExperimentController(object):
sec = serializer.load(self, format = format)
return sec
sec = serializer.load(self, format = format)
return sec
- def save(self,
path
, format = SFormats.XML):
+ def save(self,
dirpath = None
, format = SFormats.XML):
serializer = ECSerializer()
serializer = ECSerializer()
- path = serializer.save(self,
path
, format = format)
+ path = serializer.save(self,
dirpath = None
, format = format)
return path
def get_task(self, tid):
return path
def get_task(self, tid):