Merge branch 'master' into clear_softmax_warning_mnist

research/cognitive_mapping_and_planning/src/file_utils.py

@@ -16,6 +16,7 @@
 """Utilities for manipulating files.
 """
 import os
+import numpy as np
 import PIL
 from tensorflow.python.platform import gfile
 import cv2

research/cognitive_mapping_and_planning/src/graph_utils.py

@@ -19,6 +19,7 @@ import skimage.morphology
 import numpy as np
 import networkx as nx
 import itertools
+import logging
 import graph_tool as gt
 import graph_tool.topology
 import graph_tool.generation 

research/cognitive_mapping_and_planning/src/map_utils.py

@@ -17,6 +17,7 @@
 """
 import copy
 import skimage.morphology
+import logging
 import numpy as np
 import scipy.ndimage
 import matplotlib.pyplot as plt