Move multiple test cases config as separated config

CMakeLists.txt

@@ -82,7 +82,7 @@ set(SOURCES
     include/tcframe/spec/core/DefaultValues.hpp
     include/tcframe/spec/core/GradingConfig.hpp
     include/tcframe/spec/core/Magic.hpp
-    include/tcframe/spec/core/ProblemConfig.hpp
+    include/tcframe/spec/core/MultipleTestCasesConfig.hpp
     include/tcframe/spec/io.hpp
     include/tcframe/spec/io/GridIOSegment.hpp
     include/tcframe/spec/io/IOFormat.hpp

ete-test/resources/multi/multi.cpp

@@ -21,8 +21,8 @@ class ProblemSpec : public BaseProblemSpec {
         LINE(res);
     }
 
-    void Config() {
-        MultipleTestCasesCount(T);
+    void MultipleTestCasesConfig() {
+        Counter(T);
     }
 
     void MultipleTestCasesConstraints() {

include/tcframe/generator/GeneratorConfig.hpp

@@ -17,15 +17,15 @@ struct GeneratorConfig {
     friend class GeneratorConfigBuilder;
 
 private:
-    int* multipleTestCasesCount_;
+    int* multipleTestCasesCounter_;
     unsigned seed_;
     string slug_;
     string solutionCommand_;
     string outputDir_;
 
 public:
     int* multipleTestCasesCount() const {
-        return multipleTestCasesCount_;
+        return multipleTestCasesCounter_;
     }
 
     unsigned int seed() const {
@@ -45,8 +45,8 @@ struct GeneratorConfig {
     }
 
     bool operator==(const GeneratorConfig& o) const {
-        return tie(multipleTestCasesCount_, seed_, slug_, solutionCommand_, outputDir_) ==
-                tie(o.multipleTestCasesCount_, o.seed_, o.slug_, o.solutionCommand_, o.outputDir_);
+        return tie(multipleTestCasesCounter_, seed_, slug_, solutionCommand_, outputDir_) ==
+                tie(o.multipleTestCasesCounter_, o.seed_, o.slug_, o.solutionCommand_, o.outputDir_);
     }
 };
 
@@ -59,14 +59,14 @@ class GeneratorConfigBuilder {
             : subject_(from) {}
 
     GeneratorConfigBuilder() {
-        subject_.multipleTestCasesCount_ = nullptr;
+        subject_.multipleTestCasesCounter_ = nullptr;
         subject_.seed_ = DefaultValues::seed();
         subject_.solutionCommand_ = DefaultValues::solutionCommand();
         subject_.outputDir_ = DefaultValues::outputDir();
     }
 
-    GeneratorConfigBuilder& setMultipleTestCasesCount(int* var) {
-        subject_.multipleTestCasesCount_ = var;
+    GeneratorConfigBuilder& setMultipleTestCasesCounter(int* var) {
+        subject_.multipleTestCasesCounter_ = var;
         return *this;
     }
 

include/tcframe/runner/Runner.hpp

@@ -95,10 +95,10 @@ class Runner {
     }
 
     int generate(const string& slug, const Args& args, const Spec& spec) {
-        const ProblemConfig& problemConfig = spec.problemConfig();
+        const MultipleTestCasesConfig& multipleTestCasesConfig = spec.multipleTestCasesConfig();
 
         GeneratorConfig generatorConfig = GeneratorConfigBuilder()
-                .setMultipleTestCasesCount(problemConfig.multipleTestCasesCount().value_or(nullptr))
+                .setMultipleTestCasesCounter(multipleTestCasesConfig.counter().value_or(nullptr))
                 .setSeed(args.seed().value_or(DefaultValues::seed()))
                 .setSlug(slug)
                 .setSolutionCommand(args.solution().value_or(DefaultValues::solutionCommand()))
@@ -115,11 +115,11 @@ class Runner {
     }
 
     int submit(const string& slug, const Args& args, const Spec& spec) {
+        const MultipleTestCasesConfig& multipleTestCasesConfig = spec.multipleTestCasesConfig();
         const GradingConfig& gradingConfig = spec.gradingConfig();
-        const ProblemConfig& problemConfig = spec.problemConfig();
 
         SubmitterConfigBuilder configBuilder = SubmitterConfigBuilder()
-                .setHasMultipleTestCasesCount(problemConfig.multipleTestCasesCount())
+                .setHasMultipleTestCases(multipleTestCasesConfig.counter())
                 .setSlug(slug)
                 .setSolutionCommand(args.solution().value_or(DefaultValues::solutionCommand()))
                 .setTestCasesDir(args.output().value_or(DefaultValues::outputDir()));

include/tcframe/spec/Spec.hpp

@@ -9,27 +9,27 @@ namespace tcframe {
 
 struct Spec {
 private:
-    ProblemConfig problemConfig_;
+    MultipleTestCasesConfig multipleTestCasesConfig_;
     GradingConfig gradingConfig_;
     IOFormat ioFormat_;
     ConstraintSuite constraintSuite_;
     TestSuite testSuite_;
 
 public:
     Spec(
-            const ProblemConfig& problemConfig,
+            const MultipleTestCasesConfig& multipleTestCasesConfig,
             const GradingConfig& gradingConfig,
             const IOFormat& ioFormat,
             const ConstraintSuite& constraintSuite,
             const TestSuite& testSuite)
-            : problemConfig_(problemConfig)
+            : multipleTestCasesConfig_(multipleTestCasesConfig)
             , gradingConfig_(gradingConfig)
             , ioFormat_(ioFormat)
             , constraintSuite_(constraintSuite)
             , testSuite_(testSuite) {}
 
-    const ProblemConfig& problemConfig() const {
-        return problemConfig_;
+    const MultipleTestCasesConfig& multipleTestCasesConfig() const {
+        return multipleTestCasesConfig_;
     }
 
     const GradingConfig& gradingConfig() const {

include/tcframe/spec/core.hpp

@@ -5,4 +5,4 @@
 #include "tcframe/spec/core/DefaultValues.hpp"
 #include "tcframe/spec/core/GradingConfig.hpp"
 #include "tcframe/spec/core/Magic.hpp"
-#include "tcframe/spec/core/ProblemConfig.hpp"
+#include "tcframe/spec/core/MultipleTestCasesConfig.hpp"

include/tcframe/spec/core/BaseProblemSpec.hpp

@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "GradingConfig.hpp"
-#include "ProblemConfig.hpp"
+#include "MultipleTestCasesConfig.hpp"
 #include "tcframe/spec/constraint.hpp"
 #include "tcframe/spec/io.hpp"
 #include "tcframe/util.hpp"
@@ -13,7 +13,7 @@ using std::vector;
 namespace tcframe {
 
 class BaseProblemSpec
-        : protected ProblemConfigBuilder,
+        : protected MultipleTestCasesConfigBuilder,
           protected GradingConfigBuilder,
           protected IOFormatBuilder,
           protected ConstraintSuiteBuilder {
@@ -48,9 +48,9 @@ class BaseProblemSpec
 public:
     virtual ~BaseProblemSpec() {}
 
-    ProblemConfig buildProblemConfig() {
-        Config();
-        return ProblemConfigBuilder::build();
+    tcframe::MultipleTestCasesConfig buildMultipleTestCasesConfig() {
+        MultipleTestCasesConfig();
+        return MultipleTestCasesConfigBuilder::build();
     }
 
     tcframe::GradingConfig buildGradingConfig() {
@@ -86,7 +86,7 @@ class BaseProblemSpec
     }
 
 protected:
-    virtual void Config() {}
+    virtual void MultipleTestCasesConfig() {}
     virtual void GradingConfig() {}
     virtual void InputFormat() = 0;
     virtual void OutputFormat() {}

include/tcframe/spec/core/BaseTestSpec.hpp

@@ -107,12 +107,12 @@ class BaseTestSpec : public TProblemSpec, protected TestSuiteBuilder {
     }
 
     virtual Spec buildSpec(const string& slug) {
-        ProblemConfig problemConfig = TProblemSpec::buildProblemConfig();
+        MultipleTestCasesConfig multipleTestCasesConfig = TProblemSpec::buildMultipleTestCasesConfig();
         GradingConfig gradingConfig = TProblemSpec::buildGradingConfig();
         IOFormat ioFormat = TProblemSpec::buildIOFormat();
         ConstraintSuite constraintSuite = TProblemSpec::buildConstraintSuite();
         TestSuite testSuite = buildTestSuite(slug);
-        return Spec(problemConfig, gradingConfig, ioFormat, constraintSuite, testSuite);
+        return Spec(multipleTestCasesConfig, gradingConfig, ioFormat, constraintSuite, testSuite);
     }
 
 protected:

include/tcframe/spec/core/MultipleTestCasesConfig.hpp

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <tuple>
+#include <utility>
+
+#include "tcframe/util.hpp"
+
+using std::move;
+using std::tie;
+
+namespace tcframe {
+
+struct MultipleTestCasesConfig {
+    friend class MultipleTestCasesConfigBuilder;
+
+private:
+    optional<int*> counter_;
+
+public:
+    const optional<int*>& counter() const {
+        return counter_;
+    }
+
+    bool operator==(const MultipleTestCasesConfig& o) const {
+        return tie(counter_) == tie(o.counter_);
+    }
+};
+
+class MultipleTestCasesConfigBuilder {
+private:
+    MultipleTestCasesConfig subject_;
+
+public:
+    virtual ~MultipleTestCasesConfigBuilder() {}
+
+    MultipleTestCasesConfigBuilder& Counter(int& var) {
+        subject_.counter_ = optional<int*>(&var);
+        return *this;
+    }
+
+    MultipleTestCasesConfig build() {
+        return move(subject_);
+    }
+};
+
+}

include/tcframe/submitter/Submitter.hpp

@@ -56,7 +56,7 @@ class Submitter {
 
         logger_->logTestGroupIntroduction(testGroup.id());
 
-        if (config.hasMultipleTestCasesCount()) {
+        if (config.hasMultipleTestCases()) {
             TestCase testCase = TestCaseBuilder()
                     .setId(TestCaseIdCreator::createBaseId(config.slug(), testGroup.id()))
                     .setSubtaskIds(testGroup.testCases()[0].subtaskIds())

include/tcframe/submitter/SubmitterConfig.hpp

@@ -15,16 +15,16 @@ class SubmitterConfig {
     friend class SubmitterConfigBuilder;
 
 private:
-    bool hasMultipleTestCasesCount_;
+    bool hasMultipleTestCases_;
     string slug_;
     string solutionCommand_;
     string testCasesDir_;
     optional<int> timeLimit_;
     optional<int> memoryLimit_;
 
 public:
-    bool hasMultipleTestCasesCount() const {
-        return hasMultipleTestCasesCount_;
+    bool hasMultipleTestCases() const {
+        return hasMultipleTestCases_;
     }
 
     const string& slug() const {
@@ -48,8 +48,8 @@ class SubmitterConfig {
     }
 
     bool operator==(const SubmitterConfig& o) const {
-        return tie(hasMultipleTestCasesCount_, slug_, solutionCommand_, testCasesDir_, timeLimit_, memoryLimit_) ==
-                tie(o.hasMultipleTestCasesCount_,o.slug_, o.solutionCommand_, o.testCasesDir_, o.timeLimit_,
+        return tie(hasMultipleTestCases_, slug_, solutionCommand_, testCasesDir_, timeLimit_, memoryLimit_) ==
+                tie(o.hasMultipleTestCases_,o.slug_, o.solutionCommand_, o.testCasesDir_, o.timeLimit_,
                     o.memoryLimit_);
     }
 };
@@ -63,13 +63,13 @@ class SubmitterConfigBuilder {
             : subject_(from) {}
 
     SubmitterConfigBuilder() {
-        subject_.hasMultipleTestCasesCount_ = false;
+        subject_.hasMultipleTestCases_ = false;
         subject_.solutionCommand_ = DefaultValues::solutionCommand();
         subject_.testCasesDir_ = DefaultValues::outputDir();
     }
 
-    SubmitterConfigBuilder& setHasMultipleTestCasesCount(bool hasMultipleTestCasesCount) {
-        subject_.hasMultipleTestCasesCount_ = hasMultipleTestCasesCount;
+    SubmitterConfigBuilder& setHasMultipleTestCases(bool hasMultipleTestCases) {
+        subject_.hasMultipleTestCases_ = hasMultipleTestCases;
         return *this;
     }
 

test/tcframe/generator/GeneratorTests.cpp

@@ -47,7 +47,7 @@ class GeneratorTests : public Test {
             .build();
 
     GeneratorConfig multipleTestCasesConfig = GeneratorConfigBuilder(config)
-            .setMultipleTestCasesCount(&T)
+            .setMultipleTestCasesCounter(&T)
             .build();
 
     Generator generator = Generator(&testCaseGenerator, &verifier, &os, &logger);