Remove redundant -0 (kyuridenamida#210)

firewood · web-flow · commit 53398d44a9ca · 2021-04-21T22:54:40.000+09:00
diff --git a/atcodertools/fmtprediction/models/calculator.py b/atcodertools/fmtprediction/models/calculator.py
@@ -149,6 +149,7 @@ def simplify(self):
             next_formula = re.sub(r"-1\+1$", "", current_formula)
             next_formula = re.sub(r"\+0$", "", next_formula)
             next_formula = re.sub(r"-0$", "", next_formula)
+            next_formula = re.sub(r"[+-]0\+", "+", next_formula)
             if next_formula == current_formula:
                 break
             current_formula = next_formula
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/cpp/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/cpp/generated_code.txt
@@ -10,9 +10,9 @@ int main(){
     scanf("%lld",&H);
     long long W;
     scanf("%lld",&W);
-    std::vector<std::vector<long long>> c(9-0+1, std::vector<long long>(9-0+1));
-    for(int i = 0 ; i < 9-0+1 ; i++){
-        for(int j = 0 ; j < 9-0+1 ; j++){
+    std::vector<std::vector<long long>> c(9+1, std::vector<long long>(9+1));
+    for(int i = 0 ; i < 9+1 ; i++){
+        for(int j = 0 ; j < 9+1 ; j++){
             scanf("%lld",&c[i][j]);
         }
     }
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/cs/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/cs/generated_code.txt
@@ -13,9 +13,9 @@ public class Program{
         H = cin.ReadLong;
         long W;
         W = cin.ReadLong;
-        long[,] c = new long[9-0+1,9-0+1];
-        for(int i = 0;i < 9-0+1;i++){
-            for(int j = 0;j < 9-0+1;j++){
+        long[,] c = new long[9+1,9+1];
+        for(int i = 0;i < 9+1;i++){
+            for(int j = 0;j < 9+1;j++){
                 c[i,j] = cin.ReadLong;
             }
         }
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/d/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/d/generated_code.txt
@@ -18,9 +18,9 @@ int main(){
     W = input.front.to!long;
     input.popFront;
 
-    long[][] c = new long[][](cast(size_t) (9-0+1), cast(size_t) (9-0+1));
-    foreach (i; 0 .. cast(size_t) (9-0+1)) {
-        foreach (j; 0 .. cast(size_t) (9-0+1)) {
+    long[][] c = new long[][](cast(size_t) (9+1), cast(size_t) (9+1));
+    foreach (i; 0 .. cast(size_t) (9+1)) {
+        foreach (j; 0 .. cast(size_t) (9+1)) {
             c[i][j] = input.front.to!long;
             input.popFront;
         }
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/java/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/java/generated_code.txt
@@ -8,9 +8,9 @@ class Main {
         H = sc.nextLong();
         long W;
         W = sc.nextLong();
-        long[][] c = new long[(int)(9-0+1)][(int)(9-0+1)];
-        for(int i = 0 ; i < 9-0+1 ; i++){
-                for(int j = 0 ; j < 9-0+1 ; j++){
+        long[][] c = new long[(int)(9+1)][(int)(9+1)];
+        for(int i = 0 ; i < 9+1 ; i++){
+                for(int j = 0 ; j < 9+1 ; j++){
                     c[i][j] = sc.nextLong();
                 }
         }
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/nim/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/nim/generated_code.txt
@@ -22,9 +22,9 @@ proc main():void =
   H = nextInt()
   var W = 0
   W = nextInt()
-  var c = newSeqWith(9-0+1, newSeqWith(9-0+1, 0))
-  for i in 0..<9-0+1:
-    for j in 0..<9-0+1:
+  var c = newSeqWith(9+1, newSeqWith(9+1, 0))
+  for i in 0..<9+1:
+    for j in 0..<9+1:
       c[i][j] = nextInt()
   var A = newSeqWith(H, newSeqWith(W, 0))
   for i in 0..<H:
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/python/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/python/generated_code.txt
@@ -14,7 +14,7 @@ def main():
     tokens = iterate_tokens()
     H = int(next(tokens))  # type: int
     W = int(next(tokens))  # type: int
-    c = [[int(next(tokens)) for _ in range(9 - 0 + 1)] for _ in range(9 - 0 + 1)]  # type: "List[List[int]]"
+    c = [[int(next(tokens)) for _ in range(9 + 1)] for _ in range(9 + 1)]  # type: "List[List[int]]"
     A = [[int(next(tokens)) for _ in range(W)] for _ in range(H)]  # type: "List[List[int]]"
     solve(H, W, c, A)
 
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/rust/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/rust/generated_code.txt
@@ -11,9 +11,9 @@ fn main() {
     H = scanner.next();
     let mut W: i64;
     W = scanner.next();
-    let mut c: Vec<Vec<i64>> = vec![vec![0i64; (9-0+1) as usize]; (9-0+1) as usize];
-    for i in 0..(9-0+1) as usize {
-        for j in 0..(9-0+1) as usize {
+    let mut c: Vec<Vec<i64>> = vec![vec![0i64; (9+1) as usize]; (9+1) as usize];
+    for i in 0..(9+1) as usize {
+        for j in 0..(9+1) as usize {
             c[i][j] = scanner.next();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ int main(){`
`10`	`10`	`scanf("%lld",&H);`
`11`	`11`	`long long W;`
`12`	`12`	`scanf("%lld",&W);`
`13`		`- std::vector<std::vector<long long>> c(9-0+1, std::vector<long long>(9-0+1));`
`14`		`- for(int i = 0 ; i < 9-0+1 ; i++){`
`15`		`- for(int j = 0 ; j < 9-0+1 ; j++){`
	`13`	`+ std::vector<std::vector<long long>> c(9+1, std::vector<long long>(9+1));`
	`14`	`+ for(int i = 0 ; i < 9+1 ; i++){`
	`15`	`+ for(int j = 0 ; j < 9+1 ; j++){`
`16`	`16`	`scanf("%lld",&c[i][j]);`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ public class Program{`
`13`	`13`	`H = cin.ReadLong;`
`14`	`14`	`long W;`
`15`	`15`	`W = cin.ReadLong;`
`16`		`- long[,] c = new long[9-0+1,9-0+1];`
`17`		`- for(int i = 0;i < 9-0+1;i++){`
`18`		`- for(int j = 0;j < 9-0+1;j++){`
	`16`	`+ long[,] c = new long[9+1,9+1];`
	`17`	`+ for(int i = 0;i < 9+1;i++){`
	`18`	`+ for(int j = 0;j < 9+1;j++){`
`19`	`19`	`c[i,j] = cin.ReadLong;`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ class Main {`
`8`	`8`	`H = sc.nextLong();`
`9`	`9`	`long W;`
`10`	`10`	`W = sc.nextLong();`
`11`		`- long[][] c = new long[(int)(9-0+1)][(int)(9-0+1)];`
`12`		`- for(int i = 0 ; i < 9-0+1 ; i++){`
`13`		`- for(int j = 0 ; j < 9-0+1 ; j++){`
	`11`	`+ long[][] c = new long[(int)(9+1)][(int)(9+1)];`
	`12`	`+ for(int i = 0 ; i < 9+1 ; i++){`
	`13`	`+ for(int j = 0 ; j < 9+1 ; j++){`
`14`	`14`	`c[i][j] = sc.nextLong();`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ fn main() {`
`11`	`11`	`H = scanner.next();`
`12`	`12`	`let mut W: i64;`
`13`	`13`	`W = scanner.next();`
`14`		`- let mut c: Vec<Vec<i64>> = vec![vec![0i64; (9-0+1) as usize]; (9-0+1) as usize];`
`15`		`- for i in 0..(9-0+1) as usize {`
`16`		`- for j in 0..(9-0+1) as usize {`
	`14`	`+ let mut c: Vec<Vec<i64>> = vec![vec![0i64; (9+1) as usize]; (9+1) as usize];`
	`15`	`+ for i in 0..(9+1) as usize {`
	`16`	`+ for j in 0..(9+1) as usize {`
`17`	`17`	`c[i][j] = scanner.next();`
`18`	`18`	`}`
`19`	`19`	`}`