From 6568b37aa57568c2ddae9493682a19f0da2b2f98 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 02 Jun 2016 21:00:55 +0000
Subject: [PATCH] questionable commit -- the ETA is calculated using only last two entries in statistics. That solves the problem of restarting; however, it can happen that the precision of ETA is bad

---
 python/trisurf/trisurf.py |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 46a3624..3a1689e 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -212,8 +212,40 @@
 			lines=0
 			f.close()
 		return lines
-		
+
+	def tail(self,filename,n=2):
+		with open(filename,'r') as myfile:
+			lines=myfile.readlines()
+		return [lines[len(lines)-2].replace('\n',''),lines[len(lines)-1].replace('\n','')]
+
 	def read(self):
+		try:
+			lines=self.tail(self.fullname)
+		except:
+			return(False)
+		if len(lines)<2:
+			return(False)
+		#print (line)
+		fields=shlex.split(lines[0])
+		epoch1=fields[0]
+		n1=fields[1]
+		
+		fields=shlex.split(lines[1])
+		epoch2=fields[0]
+		n2=fields[1]
+		try:
+			self.dT=int(epoch2)-int(epoch1)
+			self.last=n2
+			print(epoch1)
+			print(epoch2)
+			print(self.dT)
+			print(self.last)
+			self.startDate=os.path.getmtime(os.path.join(self.path,'.lock'))
+		except:
+			return(False)
+		return(True)
+
+	def read_old(self):
 		'''
 		Method read() reads the statistics if it exists. It sets local variable dT storing the time differential between two intervals of simulation (outer loops). It also stores last simulation loop and the start of the run.
 		'''

--
Gitblit v1.9.3