From 269a246d62e2655978536675c5fcccacb3bfc264 Mon Sep 17 00:00:00 2001
From: Taku Kudo <taku@google.com>
Date: Wed, 2 Oct 2024 03:35:37 +0000
Subject: [PATCH] Remove typing_correction_enable_number_decoder flag. This
 flag is set true by default.

PiperOrigin-RevId: 681269488
---
 src/prediction/dictionary_prediction_aggregator.cc |  7 -------
 .../dictionary_prediction_aggregator_test.cc       | 14 --------------
 src/protocol/commands.proto                        |  3 ---
 3 files changed, 24 deletions(-)

diff --git a/src/prediction/dictionary_prediction_aggregator.cc b/src/prediction/dictionary_prediction_aggregator.cc
index f91691044..316334f5a 100644
--- a/src/prediction/dictionary_prediction_aggregator.cc
+++ b/src/prediction/dictionary_prediction_aggregator.cc
@@ -1713,13 +1713,6 @@ void DictionaryPredictionAggregator::AggregateTypingCorrectedPrediction(
 
   // Populates number when number candidate is not added.
   bool number_added = base_selected_types & NUMBER;
-  if (!request.request()
-           .decoder_experiment_params()
-           .typing_correction_enable_number_decoder()) {
-    // disables number decoder by assuming that number candidate
-    // is already added.
-    number_added = true;
-  }
 
   for (const auto &query : queries) {
     absl::string_view key = query.correction;
diff --git a/src/prediction/dictionary_prediction_aggregator_test.cc b/src/prediction/dictionary_prediction_aggregator_test.cc
index ad8fa64d8..6853e1280 100644
--- a/src/prediction/dictionary_prediction_aggregator_test.cc
+++ b/src/prediction/dictionary_prediction_aggregator_test.cc
@@ -2200,9 +2200,6 @@ TEST_F(DictionaryPredictionAggregatorTest,
 
   config_->set_use_typing_correction(true);
 
-  request_->mutable_decoder_experiment_params()
-      ->set_typing_correction_enable_number_decoder(true);
-
   Segments segments;
   SetUpInputForSuggestionWithHistory("にしゆうこ", "", "", composer_.get(),
                                      &segments);
@@ -2216,23 +2213,12 @@ TEST_F(DictionaryPredictionAggregatorTest,
 
   data_and_aggregator->set_supplemental_model(mock.get());
 
-  request_->mutable_decoder_experiment_params()
-      ->set_typing_correction_enable_number_decoder(false);
   std::vector<Result> results;
-  aggregator.AggregateTypingCorrectedPrediction(*prediction_convreq_, segments,
-                                                &results);
-  EXPECT_EQ(results.size(), 1);
-
-  request_->mutable_decoder_experiment_params()
-      ->set_typing_correction_enable_number_decoder(true);
-  results.clear();
   aggregator.AggregateTypingCorrectedPrediction(*prediction_convreq_, segments,
                                                 &results);
   EXPECT_EQ(results.size(), 2);
   EXPECT_EQ(results[1].value, "２５");  // default is full width.
 
-  request_->mutable_decoder_experiment_params()
-      ->set_typing_correction_enable_number_decoder(false);
   data_and_aggregator->set_supplemental_model(nullptr);
 }
 
diff --git a/src/protocol/commands.proto b/src/protocol/commands.proto
index f50cb3951..1e2ad97d9 100644
--- a/src/protocol/commands.proto
+++ b/src/protocol/commands.proto
@@ -593,9 +593,6 @@ message DecoderExperimentParams {
   // Bitmap of enabled variation character types.
   optional uint32 variation_character_types = 8 [default = 0];
 
-  // Applies the number decoder to the output of typing corrector
-  optional bool typing_correction_enable_number_decoder = 89 [default = false];
-
   // Enables final results reranking against literal results.
   // If zero, the previous implementation is used.
   optional int32 typing_correction_result_reranker_mode = 95 [default = 0];