From f039f4c3e44d77456521013030fb3e955e7d9a61 Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 25 Mar 2019 09:04:14 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-manager

---
 networkedExample.py |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/networkedExample.py b/networkedExample.py
index 1464aff..3e958bb 100755
--- a/networkedExample.py
+++ b/networkedExample.py
@@ -2,7 +2,7 @@
 from trisurf import trisurf
 from trisurf import tsmgr
 
-from trisurf import analyses
+from trisurf.analyses import analysis
 
 
 #Ok... Configure your keys:
@@ -22,6 +22,7 @@
 Runs=[run2, run3]
 
 #this is how analyses are defined
+@analysis('analyze')
 def analyze(run, **kwargs):
 	host=kwargs.get('host', None)
 	print("Demo analysis")
@@ -40,8 +41,11 @@
 	print("\n\nStatistics file:")
 	print(run.Statistics.readText())
 
-hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo', 'remotebasepath':'simulations-test/subdir/subdir'},
-	{'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
-analyses={'analysis1':analyze,'webReport':testWebAnalysis,'runningavg':analyses.plotrunningavginteractive}
+hosts=({'name':'altea','address':'localhost', 'runs':Runs, 'username':'samo', 'remotebasepath':'simulations-test/subdir/subdir'},)
+#hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo', 'remotebasepath':'simulations-test/subdir/subdir'},
+#	{'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
+#analyses={'analysis1':analyze,'webReport':testWebAnalysis,'runningavg':analyses.plotrunningavginteractive}
 
-tsmgr.start(hosts, analyses=analyses)
+
+print(trisurf._analysis_list)
+tsmgr.start(hosts)

--
Gitblit v1.9.3