Browse Source

Fix code style

luozhouyang 5 years ago
parent
commit
2624ac19f1

+ 2 - 4
strsimpy/cosine.py

@@ -45,12 +45,10 @@ class Cosine(ShingleBased, NormalizedStringDistance,
             return 0.0
         profile0 = self.get_profile(s0)
         profile1 = self.get_profile(s1)
-        return self._dot_product(profile0, profile1) / (
-                self._norm(profile0) * self._norm(profile1))
+        return self._dot_product(profile0, profile1) / (self._norm(profile0) * self._norm(profile1))
 
     def similarity_profiles(self, profile0, profile1):
-        return self._dot_product(profile0, profile1) / (
-                self._norm(profile0) * self._norm(profile1))
+        return self._dot_product(profile0, profile1) / (self._norm(profile0) * self._norm(profile1))
 
     @staticmethod
     def _dot_product(profile0, profile1):

+ 1 - 1
strsimpy/longest_common_subsequence.py

@@ -39,7 +39,7 @@ class LongestCommonSubsequence(StringDistance):
             raise TypeError("Argument s1 is NoneType.")
         s0_len, s1_len = len(s0), len(s1)
         x, y = s0[:], s1[:]
-        matrix = [[0] * (s1_len+1) for _ in range(s0_len + 1)]
+        matrix = [[0] * (s1_len + 1) for _ in range(s0_len + 1)]
         for i in range(1, s0_len + 1):
             for j in range(1, s1_len + 1):
                 if x[i - 1] == y[j - 1]:

+ 1 - 1
strsimpy/optimal_string_alignment.py

@@ -38,7 +38,7 @@ class OptimalStringAlignment(StringDistance):
         if m == 0:
             return 1.0 * m
 
-        d = [[0] * (m+2) for _ in range(n+2)]
+        d = [[0] * (m + 2) for _ in range(n + 2)]
         for i in range(n + 1):
             d[i][0] = i
         for j in range(m + 1):

+ 1 - 1
strsimpy/overlap_coefficient.py

@@ -25,4 +25,4 @@ class OverlapCoefficient(ShingleBased, NormalizedStringDistance, NormalizedStrin
         for k in profile1.keys():
             union.add(k)
         inter = int(len(profile0.keys()) + len(profile1.keys()) - len(union))
-        return inter / min(len(profile0),len(profile1))
+        return inter / min(len(profile0), len(profile1))

+ 17 - 15
strsimpy/overlap_coefficient_test.py

@@ -2,34 +2,36 @@ import unittest
 
 from strsimpy.overlap_coefficient import OverlapCoefficient
 
+
 class TestOverlapCoefficient(unittest.TestCase):
 
     def test_overlap_coefficient_onestringissubsetofother_return0(self):
         sim = OverlapCoefficient(3)
-        s1,s2 = "eat","eating"
-        actual = sim.distance(s1,s2)
-        print("distance: {:.4}\t between '{}' and '{}'".format(str(actual), s1,s2))
-        self.assertEqual(0,actual)
+        s1, s2 = "eat", "eating"
+        actual = sim.distance(s1, s2)
+        print("distance: {:.4}\t between '{}' and '{}'".format(str(actual), s1, s2))
+        self.assertEqual(0, actual)
 
     def test_overlap_coefficient_onestringissubset_return1(self):
         sim = OverlapCoefficient(3)
-        s1,s2 = "eat","eating"
-        actual = sim.similarity(s1,s2)
-        print("strsim: {:.4}\t between '{}' and '{}'".format(str(actual), s1,s2))
-        self.assertEqual(1,actual)
+        s1, s2 = "eat", "eating"
+        actual = sim.similarity(s1, s2)
+        print("strsim: {:.4}\t between '{}' and '{}'".format(str(actual), s1, s2))
+        self.assertEqual(1, actual)
 
     def test_overlap_coefficient_onestringissubsetofother_return1(self):
         sim = OverlapCoefficient(3)
-        s1,s2 = "eat","eating"
-        actual = sim.similarity(s1,s2)
-        print("strsim: {:.4}\t between '{}' and '{}'".format(str(actual), s1,s2))
-        self.assertEqual(1,actual)
+        s1, s2 = "eat", "eating"
+        actual = sim.similarity(s1, s2)
+        print("strsim: {:.4}\t between '{}' and '{}'".format(str(actual), s1, s2))
+        self.assertEqual(1, actual)
 
     def test_overlap_coefficient_halfsimilar_return1(self):
         sim = OverlapCoefficient(2)
-        s1,s2 = "car","bar"
-        self.assertEqual(1/2,sim.similarity(s1,s2))
-        self.assertEqual(1/2,sim.distance(s1,s2))
+        s1, s2 = "car", "bar"
+        self.assertEqual(1 / 2, sim.similarity(s1, s2))
+        self.assertEqual(1 / 2, sim.distance(s1, s2))
+
 
 if __name__ == "__main__":
     unittest.main()