From 158201fce4bc84680f979e8353ccb98225befc34 Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 25 Mar 2019 09:04:05 +0000
Subject: [PATCH] analysis.py updejtan

---
 networkedExample.py |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/networkedExample.py b/networkedExample.py
index 00bb8d9..3e958bb 100755
--- a/networkedExample.py
+++ b/networkedExample.py
@@ -2,7 +2,7 @@
 from trisurf import trisurf
 from trisurf import tsmgr
 
-
+from trisurf.analyses import analysis
 
 
 #Ok... Configure your keys:
@@ -22,15 +22,30 @@
 Runs=[run2, run3]
 
 #this is how analyses are defined
+@analysis('analyze')
 def analyze(run, **kwargs):
 	host=kwargs.get('host', None)
+	print("Demo analysis")
 	print("Analysis on host "+host['name']+" for run "+run.Dir.fullpath()+" completed")
+	print("here comes info on the run variable:")
+	print(run)
+	print("here comes info on the host variable:")
+	print(host)
+	print("here comes info on the hosts variable:")
+	print(kwargs.get('hosts',None))
+	print("here comes info on the args variable:")
+	print(kwargs.get('args',None))
+
+def testWebAnalysis(run, **kwargs):
+	print("Simulations are located in "+run.Dir.fullpath())
+	print("\n\nStatistics file:")
+	print(run.Statistics.readText())
+
+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}
 
 
-
-
-hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo'},
-	{'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
-
-analyses={'analysis1':analyze,}
-tsmgr.start(hosts, analyses=analyses)
+print(trisurf._analysis_list)
+tsmgr.start(hosts)

--
Gitblit v1.9.3