Skip to content

Commit dcc24d4

Browse files
sorensenjsagutkin
sorensenjs
authored and
agutkin
committed
Convert uses of Weight(0) to Weight::One() for idiomatic consistency.
PiperOrigin-RevId: 879065761
1 parent e120728 commit dcc24d4

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

‎openfst/extensions/compress/compress.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ void Compressor<Arc>::DecodeProcessedFst(const std::vector<StateId>& input,
644644
++main_it;
645645
for (StateId temp_int = 0; temp_int < number_of_final_states; ++temp_int) {
646646
if (unweighted) {
647-
fst->SetFinal(*main_it, Weight(0));
647+
fst->SetFinal(*main_it, Weight::One());
648648
} else {
649649
fst->SetFinal(*main_it, final_weight_[temp_int]);
650650
}

‎openfst/test/cache_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CacheTest : public testing::Test {
5656
}
5757

5858
// Adds arcs.
59-
Arc arc(0, 0, Weight(0.0), 0);
59+
Arc arc(0, 0, Weight::One(), 0);
6060
store.AddArc(state4, arc);
6161
store.AddArc(state4, arc);
6262
ASSERT_EQ(state4->NumArcs(), 2);
@@ -158,7 +158,7 @@ class CacheTest : public testing::Test {
158158
ASSERT_TRUE(store.GetState(0) != nullptr);
159159
ASSERT_TRUE(store.GetState(2) != nullptr);
160160

161-
Arc arc(0, 0, Weight(0.0), 0);
161+
Arc arc(0, 0, Weight::One(), 0);
162162
for (auto i = 0; i < kMinCacheSize / sizeof(Arc); ++i) state4->PushArc(arc);
163163
store.SetArcs(state4);
164164

‎openfst/test/equal_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ TEST_F(EqualTest, MismatchedStart_WeightEqual) {
8181

8282
TEST_F(EqualTest, MismatchedFinal) {
8383
VectorFst<Arc> fst(*fst_);
84-
fst.SetFinal(1, Weight(0.0F));
84+
fst.SetFinal(1, Weight::One());
8585
ASSERT_FALSE(Equal(*fst_, fst));
8686
ASSERT_FALSE(Equal(*fst_, fst, kDelta, kEqualAll));
8787
ASSERT_TRUE(Equal(*fst_, fst, kDelta, kEqualAll & ~kEqualFsts));
8888
}
8989

9090
TEST_F(EqualTest, MismatchedArc) {
9191
VectorFst<Arc> fst(*fst_);
92-
fst.AddArc(1, Arc(0, 0, Weight(0.0F), 3));
92+
fst.AddArc(1, Arc(0, 0, Weight::One(), 3));
9393
ASSERT_FALSE(Equal(*fst_, fst));
9494
ASSERT_FALSE(Equal(*fst_, fst, kDelta, kEqualAll));
9595
ASSERT_TRUE(Equal(*fst_, fst, kDelta, kEqualAll & ~kEqualFsts));

‎openfst/test/equivalent_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class EquivTest : public testing::Test {
9494
empty_fa = std::make_unique<VectorFst<Arc>>();
9595
empty_fa->SetStart(empty_fa->AddState());
9696
empty_fa->AddState();
97-
empty_fa->AddArc(0, Arc(1, 1, Weight(0), 1));
97+
empty_fa->AddArc(0, Arc(1, 1, Weight::One(), 1));
9898
equiv_fsts_.back()["empty2"] = std::move(empty_fa);
9999

100100
// FA containing a start and a final state connected by a zero-weight

‎openfst/test/expander-fst_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ class TestExpand {
4646
template <class State>
4747
void Expand(StateId state_id, State* state) {
4848
if (state_id < 9) {
49-
state->AddArc(StdArc(0, 0, StdArc::Weight(0.0f), state_id + 1));
49+
state->AddArc(StdArc(0, 0, StdArc::Weight::One(), state_id + 1));
5050
}
5151
if (state_id < 10) {
52-
state->AddArc(StdArc(0, 0, StdArc::Weight(0.0f), state_id + 2));
52+
state->AddArc(StdArc(0, 0, StdArc::Weight::One(), state_id + 2));
5353
}
5454
if (state_id == 10) {
5555
state->SetFinal(StdArc::Weight(1.0f));

‎openfst/test/matcher_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ TEST_F(MatcherTest, PhiMatcherFinal) {
368368
EXPECT_EQ(matcher2.Final(1), Weight(1.0));
369369
EXPECT_EQ(matcher2.Final(2), Weight(5.85650349));
370370
EXPECT_EQ(matcher2.Final(3), Weight(1.356674969));
371-
EXPECT_EQ(matcher2.Final(4), Weight(0.0));
371+
EXPECT_EQ(matcher2.Final(4), Weight::One());
372372

373373
fst.SetFinal(1, Arc::Weight::Zero());
374374
fst.AddArc(1, Arc(0, 0, Weight(0.5), 1));

‎openfst/test/queue_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,10 @@ TEST(QueueTester, TopOrderTest) {
302302
fst.AddState();
303303
fst.AddState();
304304
fst.SetStart(2);
305-
fst.SetFinal(0, StdArc::Weight(0.0));
306-
fst.AddArc(1, StdArc(1, 1, StdArc::Weight(0.0), 0));
307-
fst.AddArc(2, StdArc(1, 1, StdArc::Weight(0.0), 1));
308-
fst.AddArc(2, StdArc(1, 1, StdArc::Weight(0.0), 0));
305+
fst.SetFinal(0, StdArc::Weight::One());
306+
fst.AddArc(1, StdArc(1, 1, StdArc::Weight::One(), 0));
307+
fst.AddArc(2, StdArc(1, 1, StdArc::Weight::One(), 1));
308+
fst.AddArc(2, StdArc(1, 1, StdArc::Weight::One(), 0));
309309

310310
TopOrderQueue<int> queue(fst, AnyArcFilter<StdArc>());
311311
queue.Enqueue(0);

‎openfst/test/shortest-distance_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TEST_F(ShortestDistanceTest, ShortestDistance) {
7272
// Tests forward.
7373
ShortestDistance(*sdfst1_, &distance);
7474
ASSERT_EQ(distance.size(), 4);
75-
ASSERT_EQ(distance[0], Weight(0.0));
75+
ASSERT_EQ(distance[0], Weight::One());
7676
ASSERT_EQ(distance[1], Weight(3.0));
7777
ASSERT_EQ(distance[2], Weight(5.0));
7878
ASSERT_EQ(distance[3], Weight(7.0));
@@ -88,7 +88,7 @@ TEST_F(ShortestDistanceTest, ShortestDistance) {
8888
// Tests forward.
8989
ShortestDistance(*sdfst2_, &distance);
9090
ASSERT_EQ(distance.size(), 4);
91-
ASSERT_EQ(distance[0], Weight(0.0));
91+
ASSERT_EQ(distance[0], Weight::One());
9292
ASSERT_EQ(distance[1], Weight(3.0));
9393
ASSERT_EQ(distance[2], Weight(5.0));
9494
ASSERT_EQ(distance[3], Weight(7.0));
@@ -160,7 +160,7 @@ TEST_F(ShortestDistanceTest, ShortestDistanceWithOptions) {
160160
ShortestDistance(*sdfst1_, &distance, opts);
161161

162162
ASSERT_EQ(distance.size(), 4);
163-
ASSERT_EQ(distance[0], Weight(0.0));
163+
ASSERT_EQ(distance[0], Weight::One());
164164
ASSERT_EQ(distance[1], Weight(3.0));
165165
ASSERT_EQ(distance[2], Weight(5.0));
166166
ASSERT_EQ(distance[3], Weight(7.0));
@@ -183,7 +183,7 @@ TEST_F(ShortestDistanceTest, ShortestDistanceWithOptions) {
183183
ShortestDistance(*sdfst2_, &distance, opts);
184184

185185
ASSERT_EQ(distance.size(), 4);
186-
ASSERT_EQ(distance[0], Weight(0.0));
186+
ASSERT_EQ(distance[0], Weight::One());
187187
ASSERT_EQ(distance[1], Weight(3.0));
188188
ASSERT_EQ(distance[2], Weight(5.0));
189189
ASSERT_EQ(distance[3], Weight(7.0));

‎openfst/test/shortest-path_test.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ TEST_F(ShortestPathTest, ShortestPathWithOptions) {
198198
ASSERT_TRUE(Equal(*spfst2_, paths));
199199

200200
ASSERT_EQ(distance.size(), 5);
201-
ASSERT_EQ(distance[0], Weight(0.0));
201+
ASSERT_EQ(distance[0], Weight::One());
202202
ASSERT_EQ(distance[1], Weight(3.0));
203203
ASSERT_EQ(distance[2], Weight(5.0));
204204
ASSERT_EQ(distance[3], Weight(7.0));
@@ -210,7 +210,7 @@ TEST_F(ShortestPathTest, ShortestPathWithOptions) {
210210
ASSERT_TRUE(Equal(*spfst3_, paths));
211211

212212
ASSERT_EQ(distance.size(), 5);
213-
ASSERT_EQ(distance[0], Weight(0.0));
213+
ASSERT_EQ(distance[0], Weight::One());
214214
ASSERT_EQ(distance[1], Weight(3.0));
215215
ASSERT_EQ(distance[2], Weight(5.0));
216216
ASSERT_EQ(distance[3], Weight(7.0));
@@ -222,7 +222,7 @@ TEST_F(ShortestPathTest, ShortestPathWithOptions) {
222222
ASSERT_TRUE(Equal(*spfst4_, paths));
223223

224224
ASSERT_EQ(distance.size(), 5);
225-
ASSERT_EQ(distance[0], Weight(0.0));
225+
ASSERT_EQ(distance[0], Weight::One());
226226
ASSERT_EQ(distance[1], Weight(3.0));
227227
ASSERT_EQ(distance[2], Weight(5.0));
228228
ASSERT_EQ(distance[3], Weight(7.0));
@@ -248,7 +248,7 @@ TEST_F(ShortestPathTest, ShortestPathWithOptions) {
248248
ASSERT_TRUE(Equal(*spfst6_, paths));
249249

250250
ASSERT_EQ(distance.size(), 5);
251-
ASSERT_EQ(distance[0], Weight(0.0));
251+
ASSERT_EQ(distance[0], Weight::One());
252252
ASSERT_EQ(distance[1], Weight(3.0));
253253
ASSERT_EQ(distance[2], Weight(5.0));
254254
ASSERT_EQ(distance[3], Weight(7.0));
@@ -260,7 +260,7 @@ TEST_F(ShortestPathTest, ShortestPathWithOptions) {
260260
ASSERT_TRUE(Equal(*spfst7_, paths));
261261

262262
ASSERT_EQ(distance.size(), 5);
263-
ASSERT_EQ(distance[0], Weight(0.0));
263+
ASSERT_EQ(distance[0], Weight::One());
264264
ASSERT_EQ(distance[1], Weight(3.0));
265265
ASSERT_EQ(distance[2], Weight(5.0));
266266
ASSERT_EQ(distance[3], Weight(7.0));
@@ -272,7 +272,7 @@ TEST_F(ShortestPathTest, ShortestPathWithOptions) {
272272
ASSERT_TRUE(Equal(*spfst8_, paths));
273273

274274
ASSERT_EQ(distance.size(), 5);
275-
ASSERT_EQ(distance[0], Weight(0.0));
275+
ASSERT_EQ(distance[0], Weight::One());
276276
ASSERT_EQ(distance[1], Weight(3.0));
277277
ASSERT_EQ(distance[2], Weight(5.0));
278278
ASSERT_EQ(distance[3], Weight(7.0));

0 commit comments

Comments
 (0)