diff options
| -rw-r--r-- | robot/problems/introduction/forward/common.py | 52 | ||||
| -rw-r--r-- | robot/problems/introduction/forward/en.py | 21 | ||||
| -rw-r--r-- | robot/problems/introduction/forward/sl.py | 31 |
3 files changed, 62 insertions, 42 deletions
diff --git a/robot/problems/introduction/forward/common.py b/robot/problems/introduction/forward/common.py index 5023d7f..d1e1193 100644 --- a/robot/problems/introduction/forward/common.py +++ b/robot/problems/introduction/forward/common.py @@ -1,6 +1,8 @@ # coding=utf-8 -from server.hints import Hint +from python.util import has_token_sequence, string_almost_equal, \ + string_contains_number, get_tokens, get_numbers, get_exception_desc +from server.hints import Hint, HintSequence id = 202 group = 'introduction' @@ -13,21 +15,47 @@ from ev3dev import * from mindstorms_widgets import mindstorms_widgets robot = mindstorms_widgets() -robot.connect_motor('left') -robot.connect_motor('right') +robot.connect_motor( 'left' ) +robot.connect_motor( 'right' ) -robot.move_steering('on', power=50) -time.sleep(3) -robot.move_steering('off', brake_at_end=True) +robot.move_steering( 'on_for_seconds', direction=0, seconds=3 ) ''' hint_type = { - 'ev3dev': Hint('ev3dev'), - 'mindWidgets': Hint('mindWidgets'), + 'mW_init': Hint('mW_init'), + 'connectMotorLeft': Hint('connectMotorLeft'), + 'connectMotorRight': Hint('connectMotorRight'), + 'moveSteering': Hint('moveSteering'), + 'onForSeconds': Hint('onForSeconds'), + 'direction': Hint('direction'), + 'seconds': Hint('seconds'), } -def test(program): - return False, [] +def hint( code): + tokens = get_tokens(code) -def hint(program): - return [] + # if code does not include mindstorms_widgets(), a student gets a hint that the robot should be somehow represented in the program + if not has_token_sequence(tokens, ['mindstorms_widgets', '(',')']): + return [{'id': 'mW_init'}] + + # if code does not include connect_motor statement, a student needs to learn about how to connect the motors + if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['left']): + return [{'id': 'connectMotorLeft'}] + + # if code does not include connect_motor statement, a student needs to learn about how to connect the motors + if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['right']): + return [{'id': 'connectMotorRight'}] + + if not has_token_sequence(tokens, ['move_steering']): + return [{'id': 'moveSteering'}] + + if not has_token_sequence(tokens, ['on_for_seconds']): + return [{'id': 'onForSeconds'}] + + if not has_token_sequence(tokens, ['direction']): + return [{'id': 'direction'}] + + if not has_token_sequence(tokens, ['seconds']): + return [{'id': 'seconds'}] + + return None diff --git a/robot/problems/introduction/forward/en.py b/robot/problems/introduction/forward/en.py index d943867..f8e1730 100644 --- a/robot/problems/introduction/forward/en.py +++ b/robot/problems/introduction/forward/en.py @@ -1,24 +1,15 @@ # coding=utf-8 +import server +mod = server.problems.load_language('python', 'en') id = 202 -name = 'Forward' -slug = 'Forward' +name = 'Forward 3s' +slug = 'Forward 3s' description = '''\ -<p>Robot should drive forward in a straight line and stop after three -seconds.</p> +<p>Write a program that would make the robot drive straight forward for 3 seconds and stop</p> ''' -plan = [] - hint = { - 'ev3dev': '''\ -<p>To work with the robot you should import the ev3dev module: -<code>from ev3dev import *</code>.</p> -''', - - 'mindWidgets': '''\ -<p>To work with the robot you should import the mindstorms_widgets module: -<code>from mindstorms_widgets import mindstorms_widgets</code>.</p> -''', + } diff --git a/robot/problems/introduction/forward/sl.py b/robot/problems/introduction/forward/sl.py index 98f3a8d..9a37b3c 100644 --- a/robot/problems/introduction/forward/sl.py +++ b/robot/problems/introduction/forward/sl.py @@ -1,23 +1,24 @@ # coding=utf-8 +import server +mod = server.problems.load_language('python', 'sl') id = 202 -name = 'Naprej' -slug = 'Naprej' +name = 'Naprej 3s' +slug = 'Naprej 3s' description = '''\ -<p>Robot naj pelje naravnost naprej in se po treh sekundah ustavi.</p> -''' - -plan = [] +<p>Napiši program, da bo robot peljal naravnost naprej 3 sekunde in se nato ustavil.</p>''' hint = { - 'ev3dev': '''\ -<p>Za delo z robotom moramo uvoziti modul ev3dev: -<code>from ev3dev import *</code>.</p> -''', - - 'mindWidgets': '''\ -<p>Za delo z robotom moramo uvoziti modul mindstorms_widgets: -<code>from mindstorms_widgets import mindstorms_widgets</code>.</p> -''', + 'mW_init':['''<p>Robota v programu predstavimo z mindstorms_widgets(): <code>robot = mindstorms_widgets()</code>.</p>'''], + 'connectMotorLeft':['''<p>Robotu moramo priključiti levi motor: <code>robot.connect_motor( 'left' )</code>.</p>'''], + 'connectMotorRight':['''<p>Robotu moramo priključiti desni motor: <code>robot.connect_motor( 'right' )</code>.</p>'''], + 'moveSteering':['''<p>Sinhroniziraj motorja in ju zaženi za 3 sekunde.</p>''', + '''<p>Za sinhronizirano vožnjo je najbolj primerna metoda <code>robot.move_steering( ... )</code>.</p>'''], + 'onForSeconds':['''<p>Prvi argument metode <code>robot.move_steering</code> naj pove, da bo delovanje motorjev časovno omejeno.</p>''', + '''<p><code>robot.move_steering('on_for_seconds', ... )</code>.</p>'''], + 'direction':['''<p>Navedi smer premikanja motorjev, naravnost = 0.</p>''', + '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, ... )</code>.</p>'''], + 'seconds':['''<p>Napiši časovno omejitev v sekundah.</p>''', + '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, seconds=3 )</code>.</p>'''], } |