Reformat with default CLion (as testlib.h), removed `return 0;` in main functions, fixed some typos in comments, removed redundant includes

checkers/acmp.cpp

@@ -3,15 +3,15 @@
 
 const double EPS = 1.5E-6;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two doubles, maximal absolute error = %.10f", EPS);
     registerTestlibCmd(argc, argv);
-    
+
     double ja = ans.readDouble();
     double pa = ouf.readDouble();
 
     if (fabs(ja - pa) > EPS + 1E-15)
         quitf(_wa, "expected %.10f, found %.10f", ja, pa);
-    
+
     quitf(_ok, "answer is %.10f", ja);
 }

checkers/caseicmp.cpp

@@ -14,8 +14,7 @@
 
 using namespace std;
 
-vector<long long> readStream(InStream& in)
-{
+vector<long long> readStream(InStream &in) {
     vector<long long> result;
 
     for (int testCase = 1; !in.seekEof(); testCase++) {
@@ -23,10 +22,11 @@ vector<long long> readStream(InStream& in)
         if (caseStr != "Case")
             in.quitf(_pe, "Expected 'Case' but found '%s' [test case %d]", compress(caseStr).c_str(), testCase);
 
-		string numExpStr = to_string(testCase) + ":";
+        string numExpStr = to_string(testCase) + ":";
         string numStr = in.readToken();
         if (numExpStr != numStr)
-            in.quitf(_pe, "Expected '%s' but found '%s' [test case %d]", compress(numExpStr).c_str(), compress(numStr).c_str(), testCase);
+            in.quitf(_pe, "Expected '%s' but found '%s' [test case %d]", compress(numExpStr).c_str(),
+                     compress(numStr).c_str(), testCase);
 
         result.push_back(in.readLong());
     }
@@ -34,7 +34,7 @@ vector<long long> readStream(InStream& in)
     return result;
 }
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     setName("Single int64 checker with testcase-support");
     registerTestlibCmd(argc, argv);
 
@@ -46,15 +46,13 @@ int main(int argc, char* argv[]) {
             quitf(_wa, "Expected %s found %s [test case %d]", vtos(ja[i]).c_str(), vtos(pa[i]).c_str(), i + 1);
 
     if (ja.size() != pa.size())
-        quitf(_pe, "Expected %u test case(s) but found %u", (unsigned int)(ja.size()), (unsigned int)(pa.size()));
+        quitf(_pe, "Expected %u test case(s) but found %u", (unsigned int) (ja.size()), (unsigned int) (pa.size()));
 
-    string message = format("%u case(s):", (unsigned int)(ja.size()));
+    string message = format("%u case(s):", (unsigned int) (ja.size()));
     if (ja.size() <= 5) {
-        for (auto elem : ja)
+        for (auto elem: ja)
             message += " " + vtos(elem);
-    }
-    else
-    {
+    } else {
         for (int i = 0; i < 3; i++)
             message += " " + vtos(ja[i]);
         message += " ...";

checkers/casencmp.cpp

@@ -14,9 +14,7 @@
 
 using namespace std;
 
-string token;
-
-vector<long long> readStreamCase(InStream& in, int testCase, bool& prereadCase) {
+vector<long long> readStreamCase(InStream &in, int testCase, bool &prereadCase) {
     if (!prereadCase) {
         string caseStr = in.readToken();
         if (caseStr != "Case")
@@ -26,12 +24,14 @@ vector<long long> readStreamCase(InStream& in, int testCase, bool& prereadCase)
     string numExpStr = to_string(testCase) + ":";
     string numStr = in.readToken();
     if (numExpStr != numStr)
-        in.quitf(_pe, "Expected '%s' but found '%s' [test case %d]", compress(numExpStr).c_str(), compress(numStr).c_str(), testCase);
+        in.quitf(_pe, "Expected '%s' but found '%s' [test case %d]", compress(numExpStr).c_str(),
+                 compress(numStr).c_str(), testCase);
 
     vector<long long> result;
     while (!in.seekEof()) {
-        in.readTokenTo(token);
-		string token = in.readToken();
+        string dummy;
+        in.readTokenTo(dummy);
+        string token = in.readToken();
         if (token == "Case") {
             prereadCase = true;
             break;
@@ -43,16 +43,15 @@ vector<long long> readStreamCase(InStream& in, int testCase, bool& prereadCase)
     return result;
 }
 
-string longLongsToString(const vector<long long>& a) {
+string longLongsToString(const vector<long long> &a) {
     if (a.empty())
         return "\"\" [size=0]";
-    
+
     string elems;
     if (a.size() <= 5) {
-        for (auto elem : a)
+        for (auto elem: a)
             elems += vtos(elem) + " ";
-    }
-    else {
+    } else {
         for (int i = 0; i < 3; i++)
             elems += vtos(a[i]) + " ";
         elems += "... ";
@@ -60,10 +59,10 @@ string longLongsToString(const vector<long long>& a) {
             elems += vtos(a[a.size() - 2 + i]) + " ";
     }
 
-    return format("\"%s\" [size=%u]", trim(elems).c_str(), (unsigned int)(a.size()));
+    return format("\"%s\" [size=%u]", trim(elems).c_str(), (unsigned int) (a.size()));
 }
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     setName("Many int64s checker with testcase-support");
     registerTestlibCmd(argc, argv);
 
@@ -81,7 +80,8 @@ int main(int argc, char* argv[]) {
         if (ja != pa) {
             string js = longLongsToString(ja);
             string ps = longLongsToString(pa);
-            quitf(_wa, "Sequences differ: jury has %s, but participant has %s [test case %d]", js.c_str(), ps.c_str(), testCase);
+            quitf(_wa, "Sequences differ: jury has %s, but participant has %s [test case %d]", js.c_str(), ps.c_str(),
+                  testCase);
         }
     }
 

checkers/casewcmp.cpp

@@ -15,7 +15,7 @@
 
 using namespace std;
 
-vector<string> readStreamCase(InStream& in, int testCase, bool& prereadCase) {
+vector<string> readStreamCase(InStream &in, int testCase, bool &prereadCase) {
     if (!prereadCase) {
         string caseStr = in.readToken();
         if (caseStr != "Case")
@@ -25,11 +25,12 @@ vector<string> readStreamCase(InStream& in, int testCase, bool& prereadCase) {
     string numExpStr = to_string(testCase) + ":";
     string numStr = in.readToken();
     if (numExpStr != numStr)
-        in.quitf(_pe, "Expected '%s' but found '%s' [test case %d]", compress(numExpStr).c_str(), compress(numStr).c_str(), testCase);
+        in.quitf(_pe, "Expected '%s' but found '%s' [test case %d]", compress(numExpStr).c_str(),
+                 compress(numStr).c_str(), testCase);
 
     vector<string> result;
     while (!in.seekEof()) {
-		string token = in.readToken();
+        string token = in.readToken();
         if (token == "Case") {
             prereadCase = true;
             break;
@@ -41,18 +42,18 @@ vector<string> readStreamCase(InStream& in, int testCase, bool& prereadCase) {
     return result;
 }
 
-string stringsToString(const vector<string>& a) {
+string stringsToString(const vector<string> &a) {
     if (a.empty())
         return "\"\" [size=0]";
-    
+
     string elems;
-    for (auto token : a)
+    for (const auto& token: a)
         elems += token + " ";
 
-    return format("\"%s\" [size=%u]", compress(trim(elems)).c_str(), (unsigned int)(a.size()));
+    return format("\"%s\" [size=%u]", compress(trim(elems)).c_str(), (unsigned int) (a.size()));
 }
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     setName("Tokens checker with testcase-support");
     registerTestlibCmd(argc, argv);
 
@@ -70,7 +71,8 @@ int main(int argc, char* argv[]) {
         if (ja != pa) {
             string js = stringsToString(ja);
             string ps = stringsToString(pa);
-            quitf(_wa, "Sequences differ: jury has %s, but participant has %s [test case %d]", js.c_str(), ps.c_str(), testCase);
+            quitf(_wa, "Sequences differ: jury has %s, but participant has %s [test case %d]", js.c_str(), ps.c_str(),
+                  testCase);
         }
     }
 

checkers/dcmp.cpp

@@ -2,15 +2,15 @@
 
 const double EPS = 1E-6;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two doubles, maximal absolute or relative error = %.10f", EPS);
     registerTestlibCmd(argc, argv);
-    
+
     double ja = ans.readDouble();
     double pa = ouf.readDouble();
-    
+
     if (!doubleCompare(ja, pa, EPS))
         quitf(_wa, "expected %.10f, found %.10f", ja, pa);
-    
+
     quitf(_ok, "answer is %.10f", ja);
 }

checkers/fcmp.cpp

@@ -3,19 +3,18 @@
 
 using namespace std;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare files as sequence of lines");
     registerTestlibCmd(argc, argv);
 
     std::string strAnswer;
 
     int n = 0;
-    while (!ans.eof()) 
-    {
+    while (!ans.eof()) {
         std::string j = ans.readString();
 
-        if (j == "" && ans.eof())
-          break;
+        if (j.empty() && ans.eof())
+            break;
 
         strAnswer = j;
         std::string p = ouf.readString();
@@ -23,11 +22,12 @@ int main(int argc, char * argv[]) {
         n++;
 
         if (j != p)
-            quitf(_wa, "%d%s lines differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(), compress(j).c_str(), compress(p).c_str());
+            quitf(_wa, "%d%s lines differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(),
+                  compress(j).c_str(), compress(p).c_str());
     }
-    
+
     if (n == 1)
         quitf(_ok, "single line: '%s'", compress(strAnswer).c_str());
-    
+
     quitf(_ok, "%d lines", n);
 }

checkers/hcmp.cpp

@@ -5,14 +5,14 @@ using namespace std;
 
 pattern pnum("0|-?[1-9][0-9]*");
 
-bool isNumeric(const string& p) {
+bool isNumeric(const string &p) {
     return pnum.matches(p);
 }
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two signed huge integers");
     registerTestlibCmd(argc, argv);
-    
+
     string ja = ans.readWord();
     string pa = ouf.readWord();
 
@@ -21,12 +21,12 @@ int main(int argc, char * argv[]) {
 
     if (!ans.seekEof())
         quitf(_fail, "expected exactly one token in the answer file");
-    
+
     if (!isNumeric(pa))
         quitf(_pe, "%s is not a valid integer", compress(pa).c_str());
 
     if (ja != pa)
         quitf(_wa, "expected '%s', found '%s'", compress(ja).c_str(), compress(pa).c_str());
-    
+
     quitf(_ok, "answer is '%s'", compress(ja).c_str());
 }

checkers/icmp.cpp

@@ -1,14 +1,14 @@
 #include "testlib.h"
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two signed int%d's", 8 * int(sizeof(int)));
     registerTestlibCmd(argc, argv);
-    
+
     int ja = ans.readInt();
     int pa = ouf.readInt();
-    
+
     if (ja != pa)
         quitf(_wa, "expected %d, found %d", ja, pa);
-    
+
     quitf(_ok, "answer is %d", ja);
 }

checkers/lcmp.cpp

@@ -5,10 +5,10 @@
 
 using namespace std;
 
-bool compareWords(string a, string b) {
+bool compareWords(const string& a, const string& b) {
     vector<string> va, vb;
     stringstream sa;
-    
+
     sa << a;
     string cur;
     while (sa >> cur)
@@ -22,7 +22,7 @@ bool compareWords(string a, string b) {
     return (va == vb);
 }
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare files as sequence of tokens in lines");
     registerTestlibCmd(argc, argv);
 
@@ -32,20 +32,21 @@ int main(int argc, char * argv[]) {
     while (!ans.eof()) {
         std::string j = ans.readString();
 
-        if (j == "" && ans.eof())
-          break;
-        
+        if (j.empty() && ans.eof())
+            break;
+
         string p = ouf.readString();
         strAnswer = p;
 
         n++;
 
         if (!compareWords(j, p))
-            quitf(_wa, "%d%s lines differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(), compress(j).c_str(), compress(p).c_str());
+            quitf(_wa, "%d%s lines differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(),
+                  compress(j).c_str(), compress(p).c_str());
     }
-    
+
     if (n == 1)
         quitf(_ok, "single line: '%s'", compress(strAnswer).c_str());
-    
+
     quitf(_ok, "%d lines", n);
 }

checkers/ncmp.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare ordered sequences of signed int%d numbers", 8 * int(sizeof(long long)));
 
     registerTestlibCmd(argc, argv);
@@ -15,13 +15,13 @@ int main(int argc, char * argv[]) {
         long long j = ans.readLong();
         long long p = ouf.readLong();
         if (j != p)
-            quitf(_wa, "%d%s numbers differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(), vtos(j).c_str(), vtos(p).c_str());
-        else
-            if (n <= 5) {
-                if (firstElems.length() > 0)
-                    firstElems += " ";
-                firstElems += vtos(j);
-            }
+            quitf(_wa, "%d%s numbers differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(),
+                  vtos(j).c_str(), vtos(p).c_str());
+        else if (n <= 5) {
+            if (firstElems.length() > 0)
+                firstElems += " ";
+            firstElems += vtos(j);
+        }
     }
 
     int extraInAnsCount = 0;
@@ -30,7 +30,7 @@ int main(int argc, char * argv[]) {
         ans.readLong();
         extraInAnsCount++;
     }
-    
+
     int extraInOufCount = 0;
 
     while (!ouf.seekEof()) {
@@ -39,11 +39,13 @@ int main(int argc, char * argv[]) {
     }
 
     if (extraInAnsCount > 0)
-        quitf(_wa, "Answer contains longer sequence [length = %d], but output contains %d elements", n + extraInAnsCount, n);
-    
+        quitf(_wa, "Answer contains longer sequence [length = %d], but output contains %d elements",
+              n + extraInAnsCount, n);
+
     if (extraInOufCount > 0)
-        quitf(_wa, "Output contains longer sequence [length = %d], but answer contains %d elements", n + extraInOufCount, n);
-    
+        quitf(_wa, "Output contains longer sequence [length = %d], but answer contains %d elements",
+              n + extraInOufCount, n);
+
     if (n <= 5)
         quitf(_ok, "%d number(s): \"%s\"", n, compress(firstElems).c_str());
     else

checkers/nyesno.cpp

@@ -6,7 +6,7 @@ using namespace std;
 const string YES = "YES";
 const string NO = "NO";
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("%s", ("multiple " + YES + "/" + NO + " (case insensetive)").c_str());
     registerTestlibCmd(argc, argv);
 
@@ -19,7 +19,7 @@ int main(int argc, char * argv[]) {
 
         if (ja != YES && ja != NO)
             quitf(_fail, "%s or %s expected in answer, but %s found [%d%s token]",
-                YES.c_str(), NO.c_str(), compress(ja).c_str(), index, englishEnding(index).c_str());
+                  YES.c_str(), NO.c_str(), compress(ja).c_str(), index, englishEnding(index).c_str());
 
         if (pa == YES)
             yesCount++;
@@ -27,11 +27,11 @@ int main(int argc, char * argv[]) {
             noCount++;
         else
             quitf(_pe, "%s or %s expected, but %s found [%d%s token]",
-                YES.c_str(), NO.c_str(), compress(pa).c_str(), index, englishEnding(index).c_str());
+                  YES.c_str(), NO.c_str(), compress(pa).c_str(), index, englishEnding(index).c_str());
 
         if (ja != pa)
             quitf(_wa, "expected %s, found %s [%d%s token]",
-                compress(ja).c_str(), compress(pa).c_str(), index, englishEnding(index).c_str());
+                  compress(ja).c_str(), compress(pa).c_str(), index, englishEnding(index).c_str());
     }
 
     int extraInAnsCount = 0;
@@ -39,7 +39,7 @@ int main(int argc, char * argv[]) {
         ans.readToken();
         extraInAnsCount++;
     }
-    
+
     int extraInOufCount = 0;
     while (!ouf.seekEof()) {
         ouf.readToken();
@@ -47,10 +47,12 @@ int main(int argc, char * argv[]) {
     }
 
     if (extraInAnsCount > 0)
-        quitf(_wa, "Answer contains longer sequence [length = %d], but output contains %d elements", index + extraInAnsCount, index);
-    
+        quitf(_wa, "Answer contains longer sequence [length = %d], but output contains %d elements",
+              index + extraInAnsCount, index);
+
     if (extraInOufCount > 0)
-        quitf(_wa, "Output contains longer sequence [length = %d], but answer contains %d elements", index + extraInOufCount, index);
+        quitf(_wa, "Output contains longer sequence [length = %d], but answer contains %d elements",
+              index + extraInOufCount, index);
 
     if (index == 0)
         quitf(_ok, "Empty output");

checkers/pointscmp.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("example of scored checker");
     registerTestlibCmd(argc, argv);
 

checkers/pointsinfo.cpp

@@ -2,13 +2,13 @@
 
 using namespace std;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("example of checker with points_info");
     registerTestlibCmd(argc, argv);
 
     double pa = ouf.readDouble();
     double ja = ans.readDouble();
-                           
+
     string points_info = "pa=" + to_string(pa) + ",ja=" + to_string(ja);
     quitpi(points_info, "d=" + to_string(abs(ja - pa)));
 }

checkers/rcmp.cpp

@@ -3,15 +3,15 @@
 
 const double EPS = 1.5E-6;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two doubles, maximal absolute error = %.10f", EPS);
     registerTestlibCmd(argc, argv);
-    
+
     double ja = ans.readDouble();
     double pa = ouf.readDouble();
 
     if (fabs(ja - pa) > EPS + 1E-15)
         quitf(_wa, "expected %.10f, found %.10f", ja, pa);
-    
+
     quitf(_ok, "answer is %.10f", ja);
 }

checkers/rcmp4.cpp

@@ -4,25 +4,25 @@ using namespace std;
 
 const double EPS = 1E-4;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two sequences of doubles, max absolute or relative error = %.5f", EPS);
     registerTestlibCmd(argc, argv);
 
     int n = 0;
     double j = 0, p = 0;
 
-    while (!ans.seekEof())  {
+    while (!ans.seekEof()) {
         n++;
         j = ans.readDouble();
         p = ouf.readDouble();
         if (!doubleCompare(j, p, EPS)) {
             quitf(_wa, "%d%s numbers differ - expected: '%.5f', found: '%.5f', error = '%.5f'",
-                n, englishEnding(n).c_str(), j, p, doubleDelta(j, p));
+                  n, englishEnding(n).c_str(), j, p, doubleDelta(j, p));
         }
     }
 
     if (n == 1)
         quitf(_ok, "found '%.5f', expected '%.5f', error '%.5f'", p, j, doubleDelta(j, p));
-    
+
     quitf(_ok, "%d numbers", n);
 }

checkers/rcmp6.cpp

@@ -4,7 +4,7 @@ using namespace std;
 
 const double EPS = 1E-6;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two sequences of doubles, max absolute or relative  error = %.7f", EPS);
     registerTestlibCmd(argc, argv);
 
@@ -17,7 +17,7 @@ int main(int argc, char * argv[]) {
         p = ouf.readDouble();
         if (!doubleCompare(j, p, EPS)) {
             quitf(_wa, "%d%s numbers differ - expected: '%.7f', found: '%.7f', error = '%.7f'",
-                n, englishEnding(n).c_str(), j, p, doubleDelta(j, p));
+                  n, englishEnding(n).c_str(), j, p, doubleDelta(j, p));
         }
     }
 

checkers/rcmp9.cpp

@@ -4,7 +4,7 @@ using namespace std;
 
 const double EPS = 1E-9;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two sequences of doubles, max absolute or relative error = %.10f", EPS);
     registerTestlibCmd(argc, argv);
 
@@ -17,7 +17,7 @@ int main(int argc, char * argv[]) {
         p = ouf.readDouble();
         if (!doubleCompare(j, p, EPS)) {
             quitf(_wa, "%d%s numbers differ - expected: '%.10f', found: '%.10f', error = '%.10f'",
-                n, englishEnding(n).c_str(), j, p, doubleDelta(j, p));
+                  n, englishEnding(n).c_str(), j, p, doubleDelta(j, p));
         }
     }
 

checkers/rncmp.cpp

@@ -5,7 +5,7 @@ using namespace std;
 
 const double EPS = 1.5E-5;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare two sequences of doubles, maximal absolute error = %.10f", EPS);
     registerTestlibCmd(argc, argv);
 

checkers/uncmp.cpp

@@ -3,7 +3,7 @@
 
 using namespace std;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare unordered sequences of signed int%u numbers", int(8 * sizeof(long long)));
 
     registerTestlibCmd(argc, argv);
@@ -17,16 +17,17 @@ int main(int argc, char * argv[]) {
         pa.push_back(ouf.readLong());
 
     if (ja.size() != pa.size())
-        quitf(_wa, "Expected %u elements, but %u found", (unsigned int)(ja.size()), (unsigned int)(pa.size()));
+        quitf(_wa, "Expected %u elements, but %u found", (unsigned int) (ja.size()), (unsigned int) (pa.size()));
 
     sort(ja.begin(), ja.end());
     sort(pa.begin(), pa.end());
 
     if (ja != pa)
-        quitf(_wa, "Expected sequence and output are different (as unordered sequences) [size=%u]", (unsigned int)(ja.size()));
+        quitf(_wa, "Expected sequence and output are different (as unordered sequences) [size=%u]",
+              (unsigned int) (ja.size()));
 
     string message;
-    
+
     if (ja.size() != 1)
         if (ja.empty())
             message = "empty sequence";
@@ -34,7 +35,7 @@ int main(int argc, char * argv[]) {
             message = vtos(ja.size()) + " numbers (in increasing order):";
     else
         message = vtos(ja.size()) + " number:";
-    
+
     if (ja.size() <= 5)
         for (int i = 0; i < min(int(ja.size()), 5); i++)
             message += " " + vtos(ja[i]);
@@ -45,6 +46,6 @@ int main(int argc, char * argv[]) {
         for (int i = 0; i < 2; i++)
             message += " " + vtos(ja[ja.size() - 2 + i]);
     }
-        
+
     quitf(_ok, "%s", message.c_str());
 }

checkers/wcmp.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
     setName("compare sequences of tokens");
     registerTestlibCmd(argc, argv);
 
@@ -14,9 +14,10 @@ int main(int argc, char * argv[]) {
 
         ans.readWordTo(j);
         ouf.readWordTo(p);
-        
+
         if (j != p)
-            quitf(_wa, "%d%s words differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(), compress(j).c_str(), compress(p).c_str());
+            quitf(_wa, "%d%s words differ - expected: '%s', found: '%s'", n, englishEnding(n).c_str(),
+                  compress(j).c_str(), compress(p).c_str());
     }
 
     if (ans.seekEof() && ouf.seekEof()) {
@@ -24,8 +25,7 @@ int main(int argc, char * argv[]) {
             quitf(_ok, "\"%s\"", compress(j).c_str());
         else
             quitf(_ok, "%d tokens", n);
-    }
-    else {
+    } else {
         if (ans.seekEof())
             quitf(_wa, "Participant output contains extra tokens");
         else

checkers/yesno.cpp

@@ -6,8 +6,8 @@ using namespace std;
 const string YES = "YES";
 const string NO = "NO";
 
-int main(int argc, char * argv[]) {
-    setName("%s", (YES + " or " + NO + " (case insensetive)").c_str());
+int main(int argc, char *argv[]) {
+    setName("%s", (YES + " or " + NO + " (case insensitive)").c_str());
     registerTestlibCmd(argc, argv);
 
     std::string ja = upperCase(ans.readWord());

generators/bgen.cpp

@@ -1,6 +1,6 @@
 /*
  * Outputs random 100-digits binary string mostly containing 0's. 
- * In average it contrains only 10% of 1's.
+ * In average, it contains only 10% of 1's.
  *
  * To generate different values, call "bgen.exe" with different parameters.
  * 
@@ -8,12 +8,10 @@
  */
 
 #include "testlib.h"
-#include <iostream>
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
     println(rnd.next("[0000000001]{100}"));
-    return 0;
 }

generators/gen-bipartite-graph.cpp

@@ -5,7 +5,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     int n = opt<int>(1);
@@ -14,7 +14,7 @@ int main(int argc, char* argv[]) {
 
     int t = rnd.next(-2, 2);
 
-    set<pair<int,int> > edges;
+    set<pair<int, int>> edges;
 
     while (edges.size() < k) {
         int a = rnd.wnext(n, t);
@@ -22,15 +22,13 @@ int main(int argc, char* argv[]) {
         edges.insert(make_pair(a, b));
     }
 
-    vector<pair<int,int> > e(edges.begin(), edges.end());
+    vector<pair<int, int>> e(edges.begin(), edges.end());
     shuffle(e.begin(), e.end());
 
     vector<int> pa = rnd.perm(n, 1);
     vector<int> pb = rnd.perm(m, 1);
 
     println(n, m, e.size());
-    for (auto edge : e)
+    for (auto edge: e)
         println(pa[edge.first], pb[edge.second]);
-
-    return 0;
 }

generators/gen-rooted-tree-graph.cpp

@@ -4,7 +4,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     int n = opt<int>(1);
@@ -24,9 +24,7 @@ int main(int argc, char* argv[]) {
     // pp[i] is the parent of (i+2)-nd vertex in 1-numeration after shuffling
     for (int i = 1; i < n; i++)
         pp[perm[i] - 1] = perm[p[i]] + 1;
-    
+
     println(n);
     println(pp);
-
-    return 0;
 }

generators/gen-tree-graph.cpp

@@ -4,7 +4,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     int n = opt<int>(1);
@@ -16,7 +16,7 @@ int main(int argc, char* argv[]) {
 
     vector<int> perm = rnd.perm(n);
 
-    vector<pair<int,int>> edges;
+    vector<pair<int, int>> edges;
     for (int i = 1; i < n; i++)
         if (rnd.next(2))
             edges.push_back(make_pair(perm[i], perm[p[i]]));
@@ -26,8 +26,6 @@ int main(int argc, char* argv[]) {
     shuffle(edges.begin(), edges.end());
 
     println(n);
-    for (auto edge : edges)
+    for (auto edge: edges)
         println(edge.first + 1, edge.second + 1);
-
-    return 0;
 }

generators/gs.cpp

@@ -15,7 +15,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
     string t;
     int n = opt<int>(1);

generators/igen.cpp

@@ -10,10 +10,8 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     println(rnd.next(1, 1000000));
-
-    return 0;
 }

generators/iwgen.cpp

@@ -27,10 +27,8 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     println(rnd.wnext(1, 1000000, opt<int>(1)));
-
-    return 0;
 }

generators/multigen.cpp

@@ -16,17 +16,15 @@ using namespace std;
 
 void writeTest(int test) {
     startTest(test);
-    
+
     int a = rnd.next(1, test * test);
     int b = rnd.next(1, test * test);
     println(a, b);
 }
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     for (int i = 1; i <= 10; i++)
         writeTest(i);
-    
-    return 0;
 }

generators/sgen.cpp

@@ -13,10 +13,8 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     println(rnd.next("[a-zA-Z0-9]{1,1000}"));
-
-    return 0;
 }

generators/swgen.cpp

@@ -16,11 +16,9 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerGen(argc, argv, 1);
 
     int length = rnd.wnext(1, 1000, opt<int>(1));
     println(rnd.next("[a-zA-Z0-9]{1,%d}", length));
-
-    return 0;
 }

interactors/interactor-a-plus-b.cpp

@@ -3,10 +3,10 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     setName("Interactor A+B");
     registerInteraction(argc, argv);
-    
+
     // reads number of queries from test (input) file
     int n = inf.readInt();
     for (int i = 0; i < n; i++) {

tests/test-001_run-sval/src/sval.cpp

@@ -15,6 +15,4 @@ int main(int argc, char* argv[])
     inf.readToken("[a-z]{1,100}", "s");
     inf.readEoln();
     inf.readEof();
-
-    return 0;
 }

validators/bipartite-graph-validator.cpp

@@ -4,7 +4,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
 
     int n = inf.readInt(1, 400, "n");
@@ -14,7 +14,7 @@ int main(int argc, char* argv[]) {
     int k = inf.readInt(0, n * m, "k");
     inf.readEoln();
 
-    set<pair<int,int> > edges;
+    set<pair<int, int>> edges;
 
     for (int i = 0; i < k; i++) {
         int a = inf.readInt(1, n, "a_i");
@@ -22,10 +22,10 @@ int main(int argc, char* argv[]) {
         int b = inf.readInt(1, m, "b_i");
         inf.readEoln();
 
-        ensuref(edges.count(make_pair(a, b)) == 0, "Graph can't contain multiple edges between a pair of vertices");
+        ensuref(edges.count(make_pair(a, b)) == 0,
+                "Graph can't contain multiple edges between a pair of vertices");
         edges.insert(make_pair(a, b));
     }
 
     inf.readEof();
-    return 0;
 }

validators/case-nval.cpp

@@ -9,7 +9,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
 
     int testCaseCount = inf.readInt(1, 10, "t");
@@ -22,6 +22,6 @@ int main(int argc, char* argv[]) {
         inf.readInts(n, -1000, 1000, "a");
         inf.readEoln();
     }
-    
+
     inf.readEof();
 }

validators/ival.cpp

@@ -7,12 +7,10 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
 
     inf.readInt(1, 100, "n");
     inf.readEoln();
     inf.readEof();
-
-    return 0;
 }

validators/nval.cpp

@@ -8,15 +8,14 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
-    
+
     int n = inf.readInt(1, 100000, "n");
     inf.readEoln();
 
-	inf.readLongs(n, -1000000000LL * 1000000LL, 1000000000LL * 1000000LL, "a");
+    inf.readLongs(n, -1000000000LL * 1000000LL, 1000000000LL * 1000000LL, "a");
     inf.readEoln();
 
     inf.readEof();
-    return 0;
 }

validators/sval.cpp

@@ -8,12 +8,10 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
-    
+
     inf.readToken("[a-z]{1,100}", "s");
     inf.readEoln();
     inf.readEof();
-
-    return 0;
 }

validators/undirected-graph-validator.cpp

@@ -4,7 +4,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
 
     int n = inf.readInt(1, 1000, "n");
@@ -12,7 +12,7 @@ int main(int argc, char* argv[]) {
     int m = inf.readInt(0, 100000, "m");
     inf.readEoln();
 
-    set<pair<int,int> > edges;
+    set<pair<int, int>> edges;
 
     for (int i = 0; i < m; i++) {
         int a = inf.readInt(1, n, "a_i");
@@ -21,12 +21,12 @@ int main(int argc, char* argv[]) {
         inf.readEoln();
 
         ensuref(a != b, "Graph can't contain loops");
-        ensuref(edges.count(make_pair(a, b)) == 0, "Graph can't contain multiple edges between a pair of vertices");
+        ensuref(edges.count(make_pair(a, b)) == 0,
+                "Graph can't contain multiple edges between a pair of vertices");
 
         edges.insert(make_pair(a, b));
         edges.insert(make_pair(b, a));
     }
 
     inf.readEof();
-    return 0;
 }

validators/undirected-tree-validator.cpp

@@ -5,11 +5,11 @@
 
 using namespace std;
 
-int leader(vector<int>& dsu, int idx) {
+int leader(vector<int> &dsu, int idx) {
     return dsu[idx] == idx ? dsu[idx] : (dsu[idx] = leader(dsu, dsu[idx]));
 }
 
-bool merge(vector<int>& dsu, int a, int b) {
+bool merge(vector<int> &dsu, int a, int b) {
     a = leader(dsu, a);
     b = leader(dsu, b);
     if (a == b)
@@ -23,7 +23,7 @@ bool merge(vector<int>& dsu, int a, int b) {
     }
 }
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
 
     int n = inf.readInt(2, 100000, "n");
@@ -33,7 +33,7 @@ int main(int argc, char* argv[]) {
     for (int i = 0; i < n; i++)
         dsu[i] = i;
 
-    set<pair<int,int> > edges;
+    set<pair<int, int>> edges;
 
     for (int i = 0; i < n - 1; i++) {
         int x = inf.readInt(1, n, "x_i");
@@ -51,5 +51,4 @@ int main(int argc, char* argv[]) {
     }
 
     inf.readEof();
-    return 0;
 }

validators/validate-using-testset-and-group.cpp

@@ -6,7 +6,7 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
     registerValidation(argc, argv);
 
     int n, m;