修正

Toshihiro Shimizu · Toshihiro Shimizu · commit 5c72556806b8 · 2023-02-20T22:33:28.000+09:00
diff --git a/atcodertools/codegen/code_generators/universal_generator/cpp.toml b/atcodertools/codegen/code_generators/universal_generator/cpp.toml
@@ -3,6 +3,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = ""
+solve_function = "solve({actual_arguments});"
 
 # ループ
 [loop]
diff --git a/atcodertools/codegen/code_generators/universal_generator/cs.toml b/atcodertools/codegen/code_generators/universal_generator/cs.toml
@@ -4,6 +4,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = ""
+solve_function = "new Program().Solve({actual_arguments});"
 
 # ループ
 [loop]
diff --git a/atcodertools/codegen/code_generators/universal_generator/d.toml b/atcodertools/codegen/code_generators/universal_generator/d.toml
@@ -5,6 +5,7 @@ insert_space_around_operators = false
 global_prefix = ""
 input_part_prefix = "auto input = stdin.byLine.map!split.joiner;"
 newline_after_input = true
+solve_function = "solve({actual_arguments});"
 
 # ループ
 [loop]
diff --git a/atcodertools/codegen/code_generators/universal_generator/go.toml b/atcodertools/codegen/code_generators/universal_generator/go.toml
@@ -3,6 +3,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = ""
+solve_function = "solve({actual_arguments})"
 
 # ループ
 [loop]
diff --git a/atcodertools/codegen/code_generators/universal_generator/java.toml b/atcodertools/codegen/code_generators/universal_generator/java.toml
@@ -4,6 +4,7 @@ insert_space_around_operators = false
 # global変数宣言時の接頭辞
 global_prefix = "static "
 input_part_prefix = "final Scanner sc = new Scanner(System.in);"
+solve_function = "solve({actual_arguments});"
 
 # ループ
 [loop]
diff --git a/atcodertools/codegen/code_generators/universal_generator/julia.toml b/atcodertools/codegen/code_generators/universal_generator/julia.toml
@@ -3,6 +3,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = ""
+solve_function = "solve({actual_arguments})"
 
 # インデックス
 [index]
diff --git a/atcodertools/codegen/code_generators/universal_generator/nim.toml b/atcodertools/codegen/code_generators/universal_generator/nim.toml
@@ -3,6 +3,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = ""
+solve_function = "solve({actual_arguments})"
 
 # ループ
 [loop]
diff --git a/atcodertools/fmtprediction/predict_format.py b/atcodertools/fmtprediction/predict_format.py
@@ -41,11 +41,9 @@ def suspect_single_string(input_format: list[str], samples):
 
 def predict_format(content: ProblemContent) -> list[FormatPredictionResult]:
     input_format = content.get_input_format()
-    print("input_format.loop_length_var: ", input_format.loop_length_var)
     samples = content.get_samples()
     # TODO: primeの置換、ここでいいのか？
     input_format_str_list = list(map(lambda x: x.replace('\'', 'prime'), input_format.input_format))
-    print("input_format_str_list: ", input_format_str_list)
     if len(samples) == 0:
         raise NoPredictionResultError
 
@@ -126,7 +124,7 @@ def predict_format(content: ProblemContent) -> list[FormatPredictionResult]:
             continue
 
         return output_cands[0]
-
+    raise NoPredictionResultError
 
     #    if len(output_cands) == 1:
     #        return output_cands[0]
diff --git a/atcodertools/fmtprediction/predict_types.py b/atcodertools/fmtprediction/predict_types.py
@@ -143,13 +143,9 @@ def merge_type_dicts(to_dict: Dict[str, Type], src_dict: Dict[str, Type]):
 
 def predict_types(simple_format: list[Format[SimpleVariable]], samples: List[Sample], loop_length_var: str) -> Dict[str, Type]:
     res_type_dict = {}
-    print(simple_format)
     if len(simple_format) == 1:
-        print("SINGLE")
         for sample in samples:
             token_manager = TokenManager(sample.get_input().split())
-            print("simple_format[0]: ")
-            print(simple_format[0])
             predictor = TypePredictor(simple_format[0])
             try:
                 while not token_manager.is_terminal():
@@ -163,7 +159,6 @@ def predict_types(simple_format: list[Format[SimpleVariable]], samples: List[Sam
                     InvalidLoopIndexError, EvaluateError):
                 raise TypePredictionFailedError
     else:
-        print("MULTI!!")
         for sample in samples:
             token_manager = TokenManager(sample.get_input().split())
             predictor = TypePredictor(simple_format[0])
diff --git a/atcodertools/fmtprediction/tokenize_format.py b/atcodertools/fmtprediction/tokenize_format.py
@@ -163,9 +163,7 @@ def search_formats_with_minimum_vars(input_format: list[str]) -> List[TokenizedF
     Fast enough for realistic instances.
     This method returns possible formats with the smallest number of variables.
     """
-    print("search format with minimum vars: ",input_format)
     tokens = list(map(_sanitized_tokens, input_format))
-    print("tokens: ", tokens)
     a = []
     for token in tokens:
         searcher = FormatSearcher(token)
