Code cleanup

CMakeLists.txt

@@ -96,7 +96,6 @@ set(INCLUDE
         include/tcframe/runner/ArgsParser.hpp
         include/tcframe/runner/Runner.hpp
         include/tcframe/runner/RunnerLogger.hpp
-        include/tcframe/runner/RunnerLoggerFactory.hpp
         include/tcframe/runner/SlugParser.hpp
         include/tcframe/spec.hpp
         include/tcframe/spec/constraint.hpp
@@ -172,6 +171,12 @@ set(TEST_UNIT
         test/unit/tcframe/generator/MockGeneratorLogger.hpp
         test/unit/tcframe/generator/MockTestCaseGenerator.hpp
         test/unit/tcframe/generator/TestCaseGeneratorTests.cpp
+        test/unit/tcframe/grader/GraderTests.cpp
+        test/unit/tcframe/grader/GraderLoggerTests.cpp
+        test/unit/tcframe/grader/MockGrader.hpp
+        test/unit/tcframe/grader/MockGraderLogger.hpp
+        test/unit/tcframe/grader/MockTestCaseGrader.hpp
+        test/unit/tcframe/grader/TestCaseGraderTests.cpp
         test/unit/tcframe/io_manipulator/GridIOSegmentManipulatorTests.cpp
         test/unit/tcframe/io_manipulator/IOManipulatorTests.cpp
         test/unit/tcframe/io_manipulator/LineIOSegmentManipulatorTests.cpp
@@ -188,7 +193,6 @@ set(TEST_UNIT
         test/unit/tcframe/runner/BaseRunnerTests.hpp
         test/unit/tcframe/runner/InteractiveRunnerTests.cpp
         test/unit/tcframe/runner/MockRunnerLogger.hpp
-        test/unit/tcframe/runner/MockRunnerLoggerFactory.hpp
         test/unit/tcframe/runner/RunnerTests.cpp
         test/unit/tcframe/runner/RunnerLoggerTests.cpp
         test/unit/tcframe/runner/SlugParserTests.cpp
@@ -214,12 +218,6 @@ set(TEST_UNIT
         test/unit/tcframe/spec/variable/VariableTests.cpp
         test/unit/tcframe/spec/variable/VectorTests.cpp
         test/unit/tcframe/spec/variable/WhitespaceManipulatorTests.cpp
-        test/unit/tcframe/grader/GraderTests.cpp
-        test/unit/tcframe/grader/GraderLoggerTests.cpp
-        test/unit/tcframe/grader/MockGrader.hpp
-        test/unit/tcframe/grader/MockGraderLogger.hpp
-        test/unit/tcframe/grader/MockTestCaseGrader.hpp
-        test/unit/tcframe/grader/TestCaseGraderTests.cpp
         test/unit/tcframe/util/OptionalTests.cpp
         test/unit/tcframe/util/StringUtilsTests.cpp
         test/unit/tcframe/util/TestUtils.hpp

include/tcframe/aggregator/AggregatorRegistry.hpp

@@ -1,13 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include "tcframe/aggregator/Aggregator.hpp"
 #include "tcframe/aggregator/MinAggregator.hpp"
 #include "tcframe/aggregator/SumAggregator.hpp"
 
-using std::string;
-
 namespace tcframe {
 
 class AggregatorRegistry {

include/tcframe/evaluator/EvaluationOptions.hpp

@@ -1,14 +1,12 @@
 #pragma once
 
-#include <map>
 #include <string>
 #include <tuple>
 #include <utility>
 
 #include "tcframe/spec/core.hpp"
 #include "tcframe/util.hpp"
 
-using std::map;
 using std::move;
 using std::string;
 using std::tie;

include/tcframe/evaluator/communicator/Communicator.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <stdexcept>
 #include <string>
 #include <sys/signal.h>
 
@@ -9,6 +10,7 @@
 #include "tcframe/util.hpp"
 #include "tcframe/verdict.hpp"
 
+using std::runtime_error;
 using std::string;
 
 namespace tcframe {

include/tcframe/evaluator/scorer/CustomScorer.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <istream>
 #include <stdexcept>
 #include <streambuf>
 #include <string>
@@ -9,6 +10,7 @@
 #include "tcframe/os.hpp"
 #include "tcframe/verdict.hpp"
 
+using std::istream;
 using std::runtime_error;
 using std::string;
 

include/tcframe/evaluator/scorer/DiffScorer.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <istream>
 #include <string>
 
 #include "Scorer.hpp"
@@ -8,6 +9,7 @@
 #include "tcframe/util.hpp"
 #include "tcframe/verdict.hpp"
 
+using std::istream;
 using std::string;
 
 namespace tcframe {

include/tcframe/grader/Grader.hpp

@@ -2,7 +2,6 @@
 
 #include <algorithm>
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 
@@ -17,7 +16,6 @@
 
 using std::map;
 using std::max;
-using std::set;
 using std::string;
 using std::vector;
 

include/tcframe/io_manipulator/GridIOSegmentManipulator.hpp

@@ -21,9 +21,10 @@ class GridIOSegmentManipulator {
         variable->clear();
         variable->parseFrom(in, segment->rows()(), segment->columns()());
 
-        return TokenFormatter::formatMatrixElement(variable->name(),
-                                                   variable->rows() - 1,
-                                                   variable->columns(variable->rows() - 1) - 1);
+        return TokenFormatter::formatMatrixElement(
+                variable->name(),
+                variable->rows() - 1,
+                variable->columns(variable->rows() - 1) - 1);
     }
 
     static void print(GridIOSegment* segment, ostream* out) {

include/tcframe/io_manipulator/IOManipulator.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <iostream>
 #include <vector>
 
 #include "GridIOSegmentManipulator.hpp"
@@ -11,7 +10,6 @@
 #include "tcframe/spec/io.hpp"
 #include "tcframe/spec/variable.hpp"
 
-using std::endl;
 using std::istream;
 using std::ostream;
 using std::vector;

include/tcframe/io_manipulator/LinesIOSegmentManipulator.hpp

@@ -47,9 +47,10 @@ class LinesIOSegmentManipulator {
                     }
                     Matrix* matrixVariable = (Matrix*) variable;
                     matrixVariable->parseAndAddRowFrom(in, j);
-                    lastVariableName = TokenFormatter::formatMatrixElement(variable->name(),
-                                                                           j,
-                                                                           matrixVariable->columns(j) - 1);
+                    lastVariableName = TokenFormatter::formatMatrixElement(
+                            variable->name(),
+                            j,
+                            matrixVariable->columns(j) - 1);
                 }
                 isFirstColumn = false;
             }

include/tcframe/logger/BaseLogger.hpp

@@ -34,7 +34,7 @@ class BaseLogger {
         }
     }
 
-    virtual void logTestCaseIntroduction(string testCaseName) {
+    virtual void logTestCaseIntroduction(const string& testCaseName) {
         engine_->logHangingParagraph(1, testCaseName + ": ");
     }
 

include/tcframe/runner.hpp

@@ -4,4 +4,3 @@
 #include "tcframe/runner/ArgsParser.hpp"
 #include "tcframe/runner/Runner.hpp"
 #include "tcframe/runner/RunnerLogger.hpp"
-#include "tcframe/runner/RunnerLoggerFactory.hpp"

include/tcframe/runner/Runner.hpp

@@ -5,7 +5,6 @@
 #include "Args.hpp"
 #include "ArgsParser.hpp"
 #include "RunnerLogger.hpp"
-#include "RunnerLoggerFactory.hpp"
 #include "SlugParser.hpp"
 #include "tcframe/aggregator.hpp"
 #include "tcframe/evaluator.hpp"

include/tcframe/runner/RunnerLogger.hpp

@@ -26,4 +26,13 @@ class RunnerLogger : public BaseLogger {
     }
 };
 
+class RunnerLoggerFactory {
+public:
+    virtual ~RunnerLoggerFactory() {}
+
+    virtual RunnerLogger* create(LoggerEngine* engine) {
+        return new RunnerLogger(engine);
+    }
+};
+
 }

include/tcframe/spec/core/GradingConfig.hpp

@@ -34,8 +34,6 @@ class GradingConfigBuilder {
     GradingConfig subject_;
 
 public:
-    virtual ~GradingConfigBuilder() {}
-
     GradingConfigBuilder() {
         subject_.timeLimit_ = 2;
         subject_.memoryLimit_ = 64;

include/tcframe/spec/core/MultipleTestCasesConfig.hpp

@@ -38,8 +38,6 @@ class MultipleTestCasesConfigBuilder {
     MultipleTestCasesConfig subject_;
 
 public:
-    virtual ~MultipleTestCasesConfigBuilder() {}
-
     MultipleTestCasesConfigBuilder& Counter(int& var) {
         subject_.counter_ = optional<int*>(&var);
         return *this;

include/tcframe/spec/core/SeedSetter.hpp

@@ -13,7 +13,7 @@ class SeedSetter {
 public:
     virtual ~SeedSetter() {}
 
-    SeedSetter(function<void(unsigned)> setter)
+    SeedSetter(const function<void(unsigned)>& setter)
             : setter_(setter) {}
 
     virtual void setSeed(unsigned seed) {

include/tcframe/spec/core/StyleConfig.hpp

@@ -47,8 +47,6 @@ class StyleConfigBuilder {
     StyleConfig subject_;
 
 public:
-    virtual ~StyleConfigBuilder() {}
-
     StyleConfigBuilder() {
         subject_.evaluationStyle_ = EvaluationStyle::BATCH;
         subject_.needsOutput_ = true;

include/tcframe/spec/io/LineIOSegment.hpp

@@ -50,6 +50,8 @@ struct LineIOSegment : public IOSegment {
     vector<LineIOSegmentVariable> variables_;
 
 public:
+    virtual ~LineIOSegment() {}
+
     IOSegmentType type() const {
         return IOSegmentType::LINE;
     }

include/tcframe/spec/io/LinesIOSegment.hpp

@@ -23,6 +23,8 @@ struct LinesIOSegment : public IOSegment {
     function<int()> size_;
 
 public:
+    virtual ~LinesIOSegment() {}
+
     IOSegmentType type() const {
         return IOSegmentType::LINES;
     }

include/tcframe/spec/io/RawLineIOSegment.hpp

@@ -20,6 +20,8 @@ struct RawLineIOSegment : public IOSegment {
     Scalar* variable_;
 
 public:
+    virtual ~RawLineIOSegment() {}
+
     IOSegmentType type() const {
         return IOSegmentType::RAW_LINE;
     }

include/tcframe/spec/io/RawLinesIOSegment.hpp

@@ -23,6 +23,8 @@ struct RawLinesIOSegment : public IOSegment {
     function<int()> size_;
 
 public:
+    virtual ~RawLinesIOSegment() {}
+
     IOSegmentType type() const {
         return IOSegmentType::RAW_LINES;
     }

include/tcframe/spec/testcase/OfficialTestCaseData.hpp

@@ -13,6 +13,8 @@ struct OfficialTestCaseData : public TestCaseData {
     function<void()> closure_;
 
 public:
+    virtual ~OfficialTestCaseData() {}
+
     OfficialTestCaseData(const function<void()>& closure)
             : closure_(closure) {}
 

include/tcframe/spec/testcase/SampleTestCaseData.hpp

@@ -17,6 +17,8 @@ struct SampleTestCaseData : public TestCaseData {
     optional<string> output_;
 
 public:
+    virtual ~SampleTestCaseData() {}
+
     SampleTestCaseData(const string& input)
             : input_(input) {}
 

include/tcframe/spec/variable/Matrix.hpp

@@ -43,6 +43,8 @@ class MatrixImpl : public Matrix {
     bool hasSpaces_;
 
 public:
+    virtual ~MatrixImpl() {}
+
     MatrixImpl(vector<vector<T>>& var, const string& name)
             : Matrix(name)
             , var_(&var)

include/tcframe/spec/variable/Scalar.hpp

@@ -37,6 +37,8 @@ class ScalarImpl : public Scalar {
     T* var_;
 
 public:
+    virtual ~ScalarImpl() {}
+
     ScalarImpl(T& var, const string& name)
             : Scalar(name)
             , var_(&var) {}
@@ -55,6 +57,8 @@ class RawScalarImpl : public ScalarImpl<string> {
     string* var_;
 
 public:
+    virtual ~RawScalarImpl() {}
+
     RawScalarImpl(string& var, const string& name)
             : ScalarImpl(var, name)
             , var_(&var) {}

include/tcframe/spec/variable/Vector.hpp

@@ -42,6 +42,8 @@ class VectorImpl : public Vector {
     vector<T>* var_;
 
 public:
+    virtual ~VectorImpl() {}
+
     VectorImpl(vector<T>& var, const string& name)
             : Vector(name)
             , var_(&var) {}
@@ -105,6 +107,8 @@ class RawVectorImpl : public VectorImpl<string> {
     vector<string>* var_;
 
 public:
+    virtual ~RawVectorImpl() {}
+
     RawVectorImpl(vector<string>& var, const string& name)
             : VectorImpl(var, name)
             , var_(&var) {}

include/tcframe/verifier/Verifier.hpp

@@ -23,7 +23,7 @@ class Verifier {
 public:
     virtual ~Verifier() {}
 
-    Verifier(ConstraintSuite constraintSuite)
+    Verifier(const ConstraintSuite& constraintSuite)
             : constraintSuite_(move(constraintSuite)) {}
 
     virtual ConstraintsVerificationResult verifyConstraints(const set<int>& subtaskIds) {

test/unit/tcframe/aggregator/MinAggregatorTests.cpp

@@ -1,5 +1,4 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
 
 #include "tcframe/aggregator/MinAggregator.hpp"
 

test/unit/tcframe/aggregator/SumAggregatorTests.cpp

@@ -1,5 +1,4 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
 
 #include "tcframe/aggregator/SumAggregator.hpp"
 

test/unit/tcframe/generator/MockGeneratorLogger.hpp

@@ -12,7 +12,7 @@ class MockGeneratorLogger : public GeneratorLogger {
             : GeneratorLogger(nullptr) {}
 
     MOCK_METHOD1(logTestGroupIntroduction, void(int));
-    MOCK_METHOD1(logTestCaseIntroduction, void(string));
+    MOCK_METHOD1(logTestCaseIntroduction, void(const string&));
     MOCK_METHOD1(logExecutionResults, void(const map<string, ExecutionResult>&));
 
     MOCK_METHOD0(logIntroduction, void());