Split points evenly when scores not defined in config.yml (#48)

* Split points evenly when they are not defined in config

* Add tests for set_scores function

* Refactor print message

Co-authored-by: Tomasz Nowak <[email protected]>

* Print scores only if they are not found in config

* Move warning about points not summing to 100

* Remove unnecessary new line

* Bump version for release

---------

Co-authored-by: Tomasz Nowak <[email protected]>

Author: MasloMaslane

src/sinol_make/__init__.py

@@ -3,7 +3,7 @@
 
 from sinol_make import util
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 def configure_parsers():
     parser = argparse.ArgumentParser(

src/sinol_make/commands/run/__init__.py

@@ -451,10 +451,10 @@ def print_stream(*values, end='\n'):
     def calculate_points(self, results):
         points = 0
         for group, result in results.items():
-            if group != 0 and group not in self.config["scores"]:
+            if group != 0 and group not in self.scores:
                 util.exit_with_error(f'Group {group} doesn\'t have points specified in config file.')
             if result == "OK" and group != 0:
-                points += self.config["scores"][group]
+                points += self.scores[group]
         return points
 
 
@@ -647,6 +647,46 @@ def validate_arguments(self, args):
 
         return compilers, timetool_path
 
+    def set_scores(self):
+        self.tests = package_util.get_tests(self.args.tests)
+        self.groups = list(sorted(set([self.get_group(test) for test in self.tests])))
+        self.scores = collections.defaultdict(int)
+
+        if 'scores' not in self.config.keys():
+            print(util.warning('Scores are not defined in config.yml. Points will be assigned equally to all groups.'))
+            num_groups = len(self.groups)
+            self.scores = {}
+            if self.groups[0] == 0:
+                num_groups -= 1
+                self.scores[0] = 0
+
+            points_per_group = 100 // num_groups
+            for group in self.groups:
+                if group == 0:
+                    continue
+                self.scores[group] = points_per_group
+
+            if points_per_group * num_groups != 100:
+                self.scores[self.groups[-1]] += 100 - points_per_group * num_groups
+
+            print("Points will be assigned as follows:")
+            total_score = 0
+            for group in self.scores:
+                print("%2d: %3d" % (group, self.scores[group]))
+                total_score += self.scores[group]
+            print()
+        else:
+            total_score = 0
+            for group in self.config["scores"]:
+                self.scores[group] = self.config["scores"][group]
+                total_score += self.scores[group]
+
+            if total_score != 100:
+                print(util.warning("WARN: Scores sum up to %d instead of 100." % total_score))
+                print()
+
+        self.possible_score = self.get_possible_score(self.groups)
+
     def run(self, args):
         if not util.check_if_project():
             print(util.warning('You are not in a project directory (couldn\'t find config.yml in current directory).'))
@@ -665,8 +705,6 @@ def run(self, args):
             util.exit_with_error('Time limit was not defined in config.yml.')
         if not 'memory_limit' in self.config.keys():
             util.exit_with_error('Memory limit was not defined in config.yml.')
-        if not 'scores' in self.config.keys():
-            util.exit_with_error('Scores were not defined in config.yml.')
 
         self.compilers, self.timetool_path = self.validate_arguments(args)
 
@@ -687,18 +725,8 @@ def run(self, args):
         else:
             print(f'Memory limit: {self.memory_limit} kB',
                   util.warning(("[originally was %.1f kb]" % config_memory_limit)))
-        self.scores = collections.defaultdict(int)
-        print("Scores:")
-        total_score = 0
-        for group in self.config["scores"]:
-            self.scores[group] = self.config["scores"][group]
-            print("%2d: %3d" % (group, self.scores[group]))
-            total_score += self.scores[group]
-        if total_score != 100:
-            print(util.warning("WARN: Scores sum up to %d (instead of 100)." % total_score))
-        print()
 
-        self.tests = package_util.get_tests(args.tests)
+        self.set_scores()
 
         if len(self.tests) > 0:
             print(util.bold('Tests that will be run:'), ' '.join([self.extract_file_name(test) for test in self.tests]))
@@ -709,9 +737,6 @@ def run(self, args):
         else:
             print(util.warning('There are no tests to run.'))
 
-        self.groups = list(sorted(set([self.get_group(test) for test in self.tests])))
-        self.possible_score = self.get_possible_score(self.groups)
-
         solutions = self.get_solutions(self.args.solutions)
         results = self.compile_and_run(solutions)
         validation_results = self.validate_expected_scores(results)

tests/commands/run/test_integration.py

@@ -162,3 +162,26 @@ def test_weak_compilation_flags(create_package):
     args = parser.parse_args(["run", "--weak_compilation_flags", "--time_tool", "time"])
     command = Command()
     command.run(args)
+
+
+@pytest.mark.parametrize("create_package", [get_simple_package_path()], indirect=True)
+def test_no_scores(capsys, create_package, time_tool):
+    """
+    Test with no scores key in config.yml.
+    """
+    package_path = create_package
+    command = get_command()
+    create_ins_outs(package_path)
+
+    config_path = os.path.join(package_path, "config.yml")
+    config = yaml.load(open(config_path, "r"), Loader=yaml.SafeLoader)
+    del config["scores"]
+    open(config_path, "w").write(yaml.dump(config))
+
+    parser = configure_parsers()
+    args = parser.parse_args(["run", "--time_tool", time_tool])
+    command = Command()
+    command.run(args)
+
+    out = capsys.readouterr().out
+    assert "Scores are not defined in config.yml. Points will be assigned equally to all groups." in out

tests/commands/run/test_unit.py

@@ -60,6 +60,7 @@ def test_execution(create_package, time_tool):
 def test_calculate_points():
     os.chdir(get_simple_package_path())
     command = get_command()
+    command.scores = command.config["scores"]
 
     assert command.calculate_points({1: "OK", 2: "OK", 3: "OK", 4: "OK"}) == 100
     assert command.calculate_points({1: "OK", 2: "OK", 3: "OK", 4: "WA"}) == 75
@@ -394,3 +395,25 @@ def test_print_expected_scores_diff(capsys, create_package):
             "points": 75
         }
     }
+
+
+@pytest.mark.parametrize("create_package", [get_simple_package_path()], indirect=["create_package"])
+def test_set_scores(create_package):
+    """
+    Test set_scores function.
+    """
+    package_path = create_package
+    command = get_command(package_path)
+    command.args = argparse.Namespace(tests=["in/abc0a.in", "in/abc1a.in", "in/abc2a.in", "in/abc3a.in", "in/abc4a.in",
+                                             "in/abc5a.in", "in/abc6a.in"])
+    del command.config["scores"]
+    command.set_scores()
+    assert command.scores == {
+        0: 0,
+        1: 16,
+        2: 16,
+        3: 16,
+        4: 16,
+        5: 16,
+        6: 20
+    }