Resolve review comments

Author: minhitbk

src/defences/local_spatial_smoothing.py renamed to src/defences/spatial_smoothing.py

@@ -1,12 +1,11 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import numpy as np
 from scipy import ndimage
 
 from src.defences.preprocessor import Preprocessor
 
 
-class LocalSpatialSmoothing(Preprocessor):
+class SpatialSmoothing(Preprocessor):
     """
     Implement the local spatial smoothing defence approach.
     Defence method from https://arxiv.org/abs/1704.01155.
@@ -50,7 +49,7 @@ def set_params(self, **kwargs):
         :param window_size: (int) The size of the sliding window.
         """
         # Save attack-specific parameters
-        super(LocalSpatialSmoothing, self).set_params(**kwargs)
+        super(SpatialSmoothing, self).set_params(**kwargs)
 
         if type(self.window_size) is not int or self.window_size <= 0:
             raise ValueError("Sliding window size must be a positive integer")

src/defences/local_spatial_smoothing_unittest.py renamed to src/defences/spatial_smoothing_unittest.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from src.defences.local_spatial_smoothing import LocalSpatialSmoothing
+from src.defences.spatial_smoothing import SpatialSmoothing
 
 
 class TestLocalSpatialSmoothing(unittest.TestCase):
@@ -15,29 +15,30 @@ def test_ones(self):
         # Start to test
         for window_size in range(1, 20):
             with self.subTest("Sliding window size = {}".format(window_size)):
-                preprocess = LocalSpatialSmoothing()
+                preprocess = SpatialSmoothing()
                 smoothed_x = preprocess(x, window_size)
                 self.assertTrue((smoothed_x == 1).all())
 
     def test_fix(self):
-        x = np.array([[[[1],[2],[3]],[[7],[8],[9]],[[4],[5],[6]]]])
+        x = np.array([[[[1], [2], [3]], [[7], [8], [9]], [[4], [5], [6]]]])
 
         # Start to test
-        preprocess = LocalSpatialSmoothing()
+        preprocess = SpatialSmoothing()
         smoothed_x = preprocess(x, 3)
         self.assertTrue((smoothed_x==np.array(
-            [[[[2],[3],[3]],[[4],[5],[6]],[[5],[6],[6]]]])).all())
+            [[[[2], [3], [3]], [[4], [5], [6]], [[5], [6], [6]]]])).all())
 
         smoothed_x = preprocess(x, 1)
         self.assertTrue((smoothed_x==x).all())
 
         smoothed_x = preprocess(x, 2)
         self.assertTrue((smoothed_x==np.array(
-            [[[[1],[2],[3]],[[7],[7],[8]],[[7],[7],[8]]]])).all())
+            [[[[1], [2], [3]], [[7], [7], [8]], [[7], [7], [8]]]])).all())
 
 
 if __name__ == '__main__':
     unittest.main()
 
 
 
+