fixed some seed filename errors

leobrowning92 · May 4, 2018 · 407d67c · 407d67c
1 parent ea13636
commit 407d67c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/measure_perc.py b/measure_perc.py
@@ -5,7 +5,7 @@
 import numpy as np
 import networkx as nx
 from multiprocessing import Pool
-import uuid
+import uuid as id
 
 def checkdir(directoryname):
     if os.path.isdir(directoryname) == False:
@@ -76,7 +76,7 @@ def measure_fullnet(n,scaling, l='exp', save=False, seed=0, v=True ,remote=False
     return data
 
 def measure_async(cores,start,step,number,scaling,save=False):
-    uuid=uuid.uuid4()
+    uuid=id.uuid4()
     starttime = timer()
     nrange=[int(start+i*step) for i in range(number)]
     seeds=np.random.randint(low=0,high=2**32,size=number)

diff --git a/percolation.py b/percolation.py
@@ -177,7 +177,7 @@ def timestamp(self):
         return datetime.now().strftime('%y-%m-%d_%H%M%S_%f')
 
     def make_fname(self):
-        self.notes="{}_{}sticks_{}x{}um_{}L_{}".format( self.seed(),self.n,self.scaling,self.scaling,self.l,self.notes)
+        self.notes="{}_{}sticks_{}x{}um_{}L_{}".format( self.seed,self.n,self.scaling,self.scaling,self.l,self.notes)
         fname=os.path.join(self.directory,self.notes)
         return fname