Updates for python 3 compatability

Rhoana · Feb 9, 2021 · 6f9adb4 · 6f9adb4
1 parent b0072c7
commit 6f9adb4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/algorithms/util.py b/algorithms/util.py
@@ -113,8 +113,8 @@ def CollapseGraph(prefix, segmentation, vertex_ones, vertex_twos, maintained_edg
         rand_error, vi = comparestacks.VariationOfInformation(new_prefix, segmentation, gold)
 
         print ('Rand Error Full: {}'.format(rand_error[0] + rand_error[1]))
-        print ('Rand Error Merge: {}'.format(rand_error[0])
-        print ('Rand Error Split: {}'.format(rand_error[1])
+        print ('Rand Error Merge: {}'.format(rand_error[0]))
+        print ('Rand Error Split: {}'.format(rand_error[1]))
 
         print ('Variation of Information Full: {}'.format(vi[0] + vi[1]))
         print ('Variation of Information Merge: {}'.format(vi[0]))

diff --git a/cnns/biological/edges/__init__.py b/cnns/biological/edges/__init__.py
@@ -1,2 +1,2 @@
-from train import Train
-from forward import Forward
+from .train import Train
+from .forward import Forward
diff --git a/cnns/biological/nodes/__init__.py b/cnns/biological/nodes/__init__.py
@@ -1,2 +1,2 @@
-from train import Train
-from forward import Forward
+from .train import Train
+from .forward import Forward
diff --git a/cnns/biological/nodes/forward.py b/cnns/biological/nodes/forward.py
@@ -23,10 +23,16 @@
 def NodeGenerator(examples, width):
     index = 0
 
+    import time 
+    start_time = time.time()
+
     while True:
         # prevent overflow of the queue (these examples will not go through)
         if index == examples.shape[0]: index = 0
 
+        if not index % 1000:
+            print ('Completed {}/{} in {:0.2f} seconds'.format(index, len(examples), time.time() - start_time))
+
         # augment the feature
         example = AugmentFeature(examples[index], width)