fix style issues

k2-fsa · Apr 24, 2020 · 34e9088 · 34e9088
1 parent 0078010
commit 34e9088
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 31 deletions.
diff --git a/k2/csrc/fsa.h b/k2/csrc/fsa.h
@@ -13,7 +13,7 @@
 namespace k2 {
 
 using Label = int32_t;
-using StateId = int32_t;
+using StateId = std::size_t;
 using Weight = float;
 
 enum {

diff --git a/k2/csrc/properties.cc b/k2/csrc/properties.cc
@@ -5,39 +5,34 @@
 
 // See ../../LICENSE for clarification regarding multiple authors
 
+#include "k2/csrc/properties.h"
+
 #include <unordered_set>
 
-#include "k2/csrc/properties.h"
 #include "k2/csrc/fsa.h"
 
 namespace k2 {
 
 bool IsTopSorted(const Fsa &fsa) {
-  for (auto &arc : fsa.arcs) {
-    if (arc.dest_state < arc.src_state) {
-      return false;
-    }
+  for (const auto &arc : fsa.arcs) {
+    if (arc.dest_state < arc.src_state) return false;
   }
   return true;
 }
 
 bool HasSelfLoops(const Fsa &fsa) {
-  for (auto &arc : fsa.arcs) {
-    if (arc.dest_state == arc.src_state) {
-      return true;
-    }
+  for (const auto &arc : fsa.arcs) {
+    if (arc.dest_state == arc.src_state) return true;
   }
   return false;
 }
 
 bool IsDeterministic(const Fsa &fsa) {
   std::unordered_set<Label> labels;
   StateId state = 0;
-  for (auto &arc : fsa.arcs) {
+  for (const auto &arc : fsa.arcs) {
     if (arc.src_state == state) {
-      if (labels.find(arc.label) != labels.end()) {
-        return false;
-      }
+      if (labels.find(arc.label) != labels.end()) return false;
       labels.insert(arc.label);
     } else {
       state = arc.src_state;
@@ -49,10 +44,8 @@ bool IsDeterministic(const Fsa &fsa) {
 }
 
 bool IsEpsilonFree(const Fsa &fsa) {
-  for (auto &arc : fsa.arcs) {
-    if (arc.label == kEpsilon) {
-      return false;
-    }
+  for (const auto &arc : fsa.arcs) {
+    if (arc.label == kEpsilon) return false;
   }
   return true;
 }

diff --git a/k2/csrc/properties_test.cc b/k2/csrc/properties_test.cc
@@ -39,14 +39,14 @@ TEST(Properties, IsTopSorted) {
   EXPECT_TRUE(sorted);
 }
 
-TEST(Properties, HasNotSelfLoops) {
+TEST(Properties, HasNoSelfLoops) {
   std::vector<Arc> arcs = {{0, 1, 0}, {0, 2, 0}, {1, 2, 0}, };
   std::vector<Range> leaving_arcs = {{0, 2}, {2, 3}, };
   Fsa fsa;
   fsa.leaving_arcs = leaving_arcs;
   fsa.arcs = arcs;
-  bool hasSelfLoops = HasSelfLoops(fsa);
-  EXPECT_FALSE(hasSelfLoops);
+  bool has_self_loops = HasSelfLoops(fsa);
+  EXPECT_FALSE(has_self_loops);
 }
 
 TEST(Properties, HasSelfLoops) {
@@ -55,8 +55,8 @@ TEST(Properties, HasSelfLoops) {
   Fsa fsa;
   fsa.leaving_arcs = leaving_arcs;
   fsa.arcs = arcs;
-  bool hasSelfLoops = HasSelfLoops(fsa);
-  EXPECT_TRUE(hasSelfLoops);
+  bool has_self_loops = HasSelfLoops(fsa);
+  EXPECT_TRUE(has_self_loops);
 }
 
 TEST(Properties, IsNotDeterministic) {
@@ -65,8 +65,8 @@ TEST(Properties, IsNotDeterministic) {
   Fsa fsa;
   fsa.leaving_arcs = leaving_arcs;
   fsa.arcs = arcs;
-  bool isDeterministic = IsDeterministic(fsa);
-  EXPECT_FALSE(isDeterministic);
+  bool is_deterministic = IsDeterministic(fsa);
+  EXPECT_FALSE(is_deterministic);
 }
 
 TEST(Properties, IsDeterministic) {
@@ -75,8 +75,8 @@ TEST(Properties, IsDeterministic) {
   Fsa fsa;
   fsa.leaving_arcs = leaving_arcs;
   fsa.arcs = arcs;
-  bool isDeterministic = IsDeterministic(fsa);
-  EXPECT_TRUE(isDeterministic);
+  bool is_deterministic = IsDeterministic(fsa);
+  EXPECT_TRUE(is_deterministic);
 }
 
 TEST(Properties, IsNotEpsilonFree) {
@@ -85,8 +85,8 @@ TEST(Properties, IsNotEpsilonFree) {
   Fsa fsa;
   fsa.leaving_arcs = leaving_arcs;
   fsa.arcs = arcs;
-  bool isEpsilonFree = IsEpsilonFree(fsa);
-  EXPECT_FALSE(isEpsilonFree);
+  bool is_epsilon_free = IsEpsilonFree(fsa);
+  EXPECT_FALSE(is_epsilon_free);
 }
 
 TEST(Properties, IsEpsilonFree) {
@@ -95,6 +95,6 @@ TEST(Properties, IsEpsilonFree) {
   Fsa fsa;
   fsa.leaving_arcs = leaving_arcs;
   fsa.arcs = arcs;
-  bool isEpsilonFree = IsEpsilonFree(fsa);
-  EXPECT_TRUE(isEpsilonFree);
+  bool is_epsilon_free = IsEpsilonFree(fsa);
+  EXPECT_TRUE(is_epsilon_free);
 }