Merge pull request numenta#2046 from oxtopus/issue-2045-cleanup-geosp…

…atial-unit-tests Cleanup geospatial coordinate encoder unit tests
chessweb01 · May 6, 2015 · ede6b1a · ede6b1a
2 parents aebde4d + 6880290
commit ede6b1a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/tests/unit/nupic/encoders/geospatial_coordinate_test.py b/tests/unit/nupic/encoders/geospatial_coordinate_test.py
@@ -134,7 +134,7 @@ def testEncodeIntoArrayAltitude(self):
     overlap1 = overlap(encoding1, encoding2)
     overlap2 = overlap(encoding1, encoding3)
 
-    self.assertTrue(overlap1 > overlap2)
+    self.assertGreater(overlap1, overlap2)
 
 
   def testEncodeIntoArray3D(self):
@@ -151,16 +151,16 @@ def testEncodeIntoArray3D(self):
     overlap1 = overlap(encoding1, encoding2)
     overlap2 = overlap(encoding1, encoding3)
 
-    self.assertTrue(overlap1 > overlap2)
+    self.assertGreater(overlap1, overlap2)
 
 
   def testReadWrite(self):
     scale = 30 # meters
     timestep = 60 # seconds
     speed = 2.5 # meters per second
     original = GeospatialCoordinateEncoder(scale, timestep, n=999, w=25)
-    encoding1 = encode(original, speed, -122.229194, 37.486782, 0)
-    encoding2 = encode(original, speed, -122.229294, 37.486882, 100)
+    encode(original, speed, -122.229194, 37.486782, 0)
+    encode(original, speed, -122.229294, 37.486882, 100)
 
     proto1 = GeospatialCoordinateEncoderProto.new_message()
     original.write(proto1)
@@ -190,6 +190,7 @@ def encode(encoder, speed, longitude, latitude, altitude=None):
   encoder.encodeIntoArray((speed, longitude, latitude, altitude), output)
   return output
 
+
 def overlap(sdr1, sdr2):
   assert sdr1.size == sdr2.size
   return float((sdr1 & sdr2).sum()) / sdr1.sum()