better parsing

Busquedas/Derrame de Petroleo/tests/invalid-cases/invalid-length.expected-failure

@@ -0,0 +1 @@
+expected 'line length to be 3, got 4' at 1:0

Busquedas/Derrame de Petroleo/tests/invalid-cases/invalid-length.in

@@ -0,0 +1,4 @@
+3 3 300
+.#$.
+#..
+.$.

Busquedas/Derrame de Petroleo/tests/invalid-cases/two-dollars-same-row.expected-failure

@@ -0,0 +1 @@
+expected 'eol' at 1:2

Busquedas/Derrame de Petroleo/tests/invalid-cases/two-dollars-same-row.in

@@ -0,0 +1,2 @@
+1 5 1
+.$$..

Busquedas/Derrame de Petroleo/tests/invalid-cases/two-dollars.expected-failure

@@ -0,0 +1 @@
+expected 'eol' at 3:1

Busquedas/Derrame de Petroleo/tests/invalid-cases/two-dollars.in

@@ -0,0 +1,4 @@
+3 3 300
+.#$
+#..
+.$.

Busquedas/Derrame de Petroleo/tests/test-validator.py

@@ -7,41 +7,44 @@
 import sys
 import re
 import unittest
+import parsy as p
 
 from omegaup.validator import validatortest
+import omegaup.validator.parsing as oup
 
 
-class Test(unittest.TestCase):
+@p.generate
+def inputParser():
+    R = yield oup.boundedInteger(1, 2000, 'R')
+    yield oup.space
+    C = yield oup.boundedInteger(1, 2000, 'C')
+    yield oup.space
+    K = yield oup.boundedInteger(1, 10**7, 'K')
+    yield oup.eol
 
-    def test(self):
-        with open('data.in', 'r') as handle:
-            lines = handle.read().split('\n')
+    def evalLineLength(line):
+        if len(line) != C:
+            return f'line length {C}, got {len(line)}'
+        return None
 
-        self.assertEqual(lines[-1], '', "file doesn't end with EOL")
-        lines.pop()
+    lineWithoutDollar = oup.label('line w/o $', p.regex(r'[.#]*') << oup.eol)
+    lineWithDollar = oup.label('line', p.regex(r'[.#]*\$?[.#]*') << oup.eol)
 
-        first_line_reg = re.compile(r'^(\d+) (\d+) (\d+)$')
-        self.assertTrue(first_line_reg.match(lines[0]),
-                        "first line incorrectly formatted")
-        R, C, K = map(int, lines[0].split(' '))
+    saw_dollar = False
+    for r in range(R):
+        parser = lineWithoutDollar if saw_dollar else lineWithDollar
+        line = yield oup.guard(parser, evalLineLength)
+        saw_dollar |= '$' in line
 
-        # Validar R, C, K
-        self.assertTrue(1 <= R <= 2000, "R out of bounds")
-        self.assertTrue(1 <= C <= 2000, "C out of bounds")
-        self.assertTrue(0 <= K <= 10**7, "K out of bounds")
+    if not saw_dollar:
+        return p.fail('$ to be present in map')
 
-        # Validar número de lineas
-        self.assertEqual(len(lines), 1 + R, "line count mismatch")
 
-        saw_dollar = False
-        map_reg = re.compile(r'^[.#$]+$')
-        for line in lines[1:]:
-            self.assertTrue(map_reg.match(line), "invalid character in map")
-            self.assertEqual(len(line), C, "line width mismatch")
-            if '$' in line:
-                self.assertFalse(saw_dollar, "too many $ in map")
+class Test(unittest.TestCase):
 
-        self.assertFalse(saw_dollar, "no $ in map")
+    def test(self):
+        with open('data.in', 'r') as handle:
+            inputParser.parse(handle.read())
 
 
 if __name__ == '__main__':

Programacion Basica/A+B/.gitignore

@@ -0,0 +1,2 @@
+**/*.out
+!tests/invalid-cases/*.out

Programacion Basica/A+B/cases/1.in

@@ -1 +1 @@
-1 1
+23 45

Programacion Basica/A+B/examples/sample.in

@@ -0,0 +1 @@
+../cases/0.in

Programacion Basica/A+B/examples/sample1.in

@@ -0,0 +1 @@
+../cases/1.in

Programacion Basica/A+B/settings.json

@@ -0,0 +1,28 @@
+{
+  "title": "A + B",
+  "source": "Curso OMI (Orac)",
+
+  "limits": {
+    "TimeLimit": 1000,
+    "MemoryLimit": 134217728,
+    "InputLimit": 134217728,
+    "OutputLimit": 134217728,
+    "ExtraWallTime": 3000,
+    "OverallWallTimeLimit": 60000
+  },
+
+  "validator": {
+    "name": "token-caseless",
+    "limits": {
+      "TimeLimit": 1000
+    }
+  },
+
+  "misc": {
+    "alias": "COMI-a-b",
+    "visibility": 1,
+    "languages": "all",
+    "email_clarifications": 0,
+    "admin-groups": ["workshop-2017"]
+  }
+}

Programacion Basica/A+B/statements/es.markdown

@@ -1,14 +1,14 @@
 Deberás escribir un programa que tome dos números y los sume.
 
-#Entrada
+# Entrada
 
 La entrada consiste en dos enteros, $a$ y $b$, separados por un espacio en blanco.
 
-#Salida
+# Salida
 
-Tu salida debe ser un solo número entero, la suma de $a$ y $b$.  
+Tu salida debe ser un solo número entero, la suma de $a$ y $b$.
 
-#Ejemplo
+# Ejemplo
 ||input
 5 5
 ||output
@@ -23,6 +23,6 @@ Tu salida debe ser un solo número entero, la suma de $a$ y $b$.
 23 + 45 = 68
 ||end
 
-#Límites
+# Límites
 
  * $a$ y $b$ pueden ser enteros desde $1$ hasta $1,000$

Programacion Basica/A+B/testplan

@@ -0,0 +1,11 @@
+0 9
+1 9
+2 9
+3 9
+4 9
+5 9
+6 9
+7 9
+8 9
+9 9
+10 10

Programacion Basica/A+B/tests/data.in

@@ -0,0 +1 @@
+4  2

Programacion Basica/A+B/tests/invalid-cases/invalid-char.expected-failure

@@ -0,0 +1 @@
+expected 'eol' at 0:3

Programacion Basica/A+B/tests/invalid-cases/invalid-char.in

@@ -0,0 +1 @@
+4 5.3

Programacion Basica/A+B/tests/invalid-cases/out-of-bounds.expected-failure

@@ -0,0 +1 @@
+expected 'integer between 1 and 1000'

Programacion Basica/A+B/tests/invalid-cases/out-of-bounds.in

@@ -0,0 +1 @@
+4 0

Programacion Basica/A+B/tests/test-validator.py

@@ -0,0 +1,33 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# no-self-use
+# pylint: disable=R0201
+
+import sys
+import re
+import unittest
+import parsy as p
+
+from omegaup.validator import validatortest
+import omegaup.validator.parsing as oup
+
+
+@p.generate
+def inputParser():
+    a = yield oup.boundedInteger(1, 1000, 'a')
+    yield oup.space
+    b = yield oup.boundedInteger(1, 1000, 'b')
+    yield oup.eol
+    return (a, b)
+
+
+class Test(unittest.TestCase):
+
+    def test(self):
+        with open('data.in', 'r') as handle:
+            (a, b) = inputParser.parse(handle.read())
+
+
+if __name__ == '__main__':
+    validatortest.main()

Programacion Basica/A+B/tests/tests.json

@@ -0,0 +1,16 @@
+{
+  "solutions": [
+    {
+      "filename": "../solutions/solution.cpp",
+      "verdict": "AC"
+    },
+    {
+      "filename": "../solutions/solution2.cpp",
+      "verdict": "AC"
+    }
+  ],
+  "inputs": {
+    "filename": "test-validator.py"
+  },
+  "max_score": 100
+}

problems.json

@@ -8,6 +8,9 @@
     },
     {
       "path": "Programacion Basica/Palindromos"
+    },
+    {
+      "path": "Programacion Basica/A+B"
     }
   ]
 }